Remove Chef API

13 files changed, 0 insertions, 648 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/AttributeMapping.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/AttributeMapping.java
deleted file mode 100644
index 87970458855..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/AttributeMapping.java
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.chef;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author mortent
- */
-public class AttributeMapping {
-
-    private final String attribute;
-    private final List<String> chefPath;
-
-    private AttributeMapping(String attribute, List<String> chefPath) {
-        this.chefPath = chefPath;
-        this.attribute = attribute;
-    }
-
-    public static AttributeMapping simpleMapping(String attribute) {
-        return new AttributeMapping(attribute, Collections.singletonList(attribute));
-    }
-
-    public static AttributeMapping deepMapping(String attribute, List<String> chefPath) {
-        return new AttributeMapping(attribute, chefPath);
-    }
-
-    public String toString() {
-        return String.format("\"%s\": [%s]", attribute,
-                chefPath.stream().map(s -> String.format("\"%s\"", s))
-                .collect(Collectors.joining(","))
-        );
-    }
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/Chef.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/Chef.java
deleted file mode 100644
index 693947b6f61..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/Chef.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.chef;
-
-
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.ChefEnvironment;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.ChefNode;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.ChefResource;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.Client;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.CookBook;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.NodeResult;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.PartialNodeResult;
-
-import java.net.URL;
-import java.util.List;
-
-public interface Chef {
-
-    ChefResource getApi();
-
-    ChefNode getNode(String name);
-
-    Client getClient(String name);
-
-    ChefNode deleteNode(String name);
-
-    Client deleteClient(String name);
-
-    NodeResult searchNodeByFQDN(String fqdn);
-
-    NodeResult searchNodes(String query);
-
-    PartialNodeResult partialSearchNodes(String query, List<AttributeMapping> attributeMappings);
-
-    void copyChefEnvironment(String fromEnvironmentName, String toEnvironmentName);
-
-    ChefEnvironment getChefEnvironment(String environmentName);
-
-    CookBook getCookbook(String cookbookName, String cookbookVersion);
-
-    String downloadResource(URL resourceURL);
-
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/ChefMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/ChefMock.java
deleted file mode 100644
index bd19cfe6ce1..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/ChefMock.java
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.chef;
-
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.ChefEnvironment;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.ChefNode;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.ChefResource;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.Client;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.CookBook;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.NodeResult;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.PartialNode;
-import com.yahoo.vespa.hosted.controller.api.integration.chef.rest.PartialNodeResult;
-
-import javax.ws.rs.NotFoundException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author mpolden
- */
-public class ChefMock implements Chef {
-
-    private final NodeResult result;
-    private final PartialNodeResult partialResult;
-    private final List<String> chefEnvironments;
-
-    public ChefMock() {
-        result = new NodeResult();
-        result.rows = new ArrayList<>();
-        partialResult = new PartialNodeResult();
-        partialResult.rows = new ArrayList<>();
-        chefEnvironments = new ArrayList<>();
-        chefEnvironments.add("hosted-verified-prod");
-        chefEnvironments.add("hosted-infra-cd");
-    }
-
-    @Override
-    public ChefResource getApi() {
-        return null;
-    }
-
-    @Override
-    public ChefNode getNode(String name) {
-        return null;
-    }
-
-    @Override
-    public Client getClient(String name) {
-        return null;
-    }
-
-    @Override
-    public ChefNode deleteNode(String name) {
-        return null;
-    }
-
-    @Override
-    public Client deleteClient(String name) {
-        return null;
-    }
-
-    public ChefMock addSearchResult(ChefNode node) {
-        result.rows.add(node);
-        return this;
-    }
-
-    public ChefMock addPartialResult(List<PartialNode> partialNodes) {
-        partialResult.rows.addAll(partialNodes);
-        return this;
-    }
-
-    @Override
-    public NodeResult searchNodeByFQDN(String fqdn) {
-        return result;
-    }
-
-    @Override
-    public NodeResult searchNodes(String query) {
-        return result;
-    }
-
-    @Override
-    public PartialNodeResult partialSearchNodes(String query, List<AttributeMapping> returnAttributes) {
-        PartialNodeResult partialNodeResult = new PartialNodeResult();
-        partialNodeResult.rows = new ArrayList<>();
-        partialNodeResult.rows.addAll(partialResult.rows);
-        result.rows.stream()
-                   .map(chefNode -> {
-                       Map<String, String> data = new HashMap<>();
-                       data.put("fqdn", chefNode.name);
-                       return new PartialNode(data);
-                   })
-                   .forEach(node -> partialNodeResult.rows.add(node));
-        return partialNodeResult;
-    }
-
-    @Override
-    public void copyChefEnvironment(String fromEnvironmentName, String toEnvironmentName) {
-        if(!chefEnvironments.contains(fromEnvironmentName)) {
-            throw new NotFoundException(String.format("Source chef environment %s does not exist", fromEnvironmentName));
-        }
-        chefEnvironments.add(toEnvironmentName);
-    }
-
-    @Override
-    public ChefEnvironment getChefEnvironment(String environmentName) {
-        return null;
-    }
-
-    @Override
-    public CookBook getCookbook(String cookbookName, String cookbookVersion) {
-        return null;
-    }
-
-    @Override
-    public String downloadResource(URL resourceURL) {
-        return "";
-    }
-}
-
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/package-info.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/package-info.java
deleted file mode 100644
index 5d3d4b87b74..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.vespa.hosted.controller.api.integration.chef;
-
-import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/ChefEnvironment.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/ChefEnvironment.java
deleted file mode 100644
index 8576949280b..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/ChefEnvironment.java
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.chef.rest;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Map;
-
-/**
- * @author mortent
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class ChefEnvironment {
-
-    @JsonProperty("name")
-    private String name;
-
-    @JsonProperty("default_attributes")
-    private Map<String, Object> attributes;
-    @JsonProperty("override_attributes")
-    private Map<String, Object> overrideAttributes;
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("cookbook_versions")
-    private Map<String, String> cookbookVersions;
-
-    // internal
-    @JsonProperty("json_class")
-    private final String _jsonClass = "Chef::Environment";
-    @JsonProperty("chef_type")
-    private final String _chefType = "environment";
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Builder copy() {
-        return builder()
-                .name(name)
-                .attributes(attributes)
-                .overrideAttributes(overrideAttributes)
-                .cookbookVersions(cookbookVersions)
-                .description(description);
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Map<String, String> getCookbookVersions() {
-        return cookbookVersions;
-    }
-
-    public Map<String, Object> getAttributes() {
-        return attributes;
-    }
-
-    public Map<String, Object> getOverrideAttributes() {
-        return overrideAttributes;
-    }
-
-    public static class Builder {
-        private String name;
-        private Map<String, Object> attributes;
-        private String description;
-        private Map<String, Object> overrideAttributes;
-        private Map<String, String> cookbookVersions;
-
-        public Builder name(String name){
-            this.name = name;
-            return this;
-        }
-
-        public Builder attributes(Map<String, Object> defaultAttributes) {
-            this.attributes = defaultAttributes;
-            return this;
-        }
-
-        public Builder overrideAttributes(Map<String, Object> overrideAttributes) {
-            this.overrideAttributes = overrideAttributes;
-            return this;
-        }
-
-        public Builder cookbookVersions(Map<String, String> cookbookVersions) {
-            this.cookbookVersions = cookbookVersions;
-            return this;
-        }
-
-        public Builder description(String description) {
-            this.description = description;
-            return this;
-        }
-
-        public ChefEnvironment build() {
-            ChefEnvironment chefEnvironment = new ChefEnvironment();
-            chefEnvironment.name = name;
-            chefEnvironment.description = description;
-            chefEnvironment.cookbookVersions = cookbookVersions;
-            chefEnvironment.attributes = attributes;
-            chefEnvironment.overrideAttributes = overrideAttributes;
-
-            return chefEnvironment;
-        }
-    }
-
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/ChefNode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/ChefNode.java
deleted file mode 100644
index 08d9a1045e8..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/ChefNode.java
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.chef.rest;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author mortent
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class ChefNode {
-
-    @JsonProperty("name")
-    public String name;
-
-    @JsonProperty("chef_environment")
-    public String chefEnvironment;
-
-    @JsonProperty("run_list")
-    public List<String> runList;
-
-    @JsonProperty("json_class")
-    public String jsonClass;
-
-    @JsonProperty("chef_type")
-    public String chefType;
-
-    @JsonProperty("automatic")
-    public Map<String, Object> automaticAttributes;
-
-    @JsonProperty("normal")
-    public Map<String, Object> normalAttributes;
-
-    @JsonProperty("default")
-    public Map<String, Object> defaultAttributes;
-
-    @JsonProperty("override")
-    public Map<String, Object> overrideAttributes;
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static Builder builder(ChefNode src) {
-        return new Builder(src);
-    }
-
-    public static class Builder {
-        private String name;
-        private String chefEnvironment;
-        private List<String> runList;
-        private String jsonClass;
-        private String chefType;
-        private Map<String, Object> automaticAttributes;
-        private Map<String, Object> normalAttributes;
-        private Map<String, Object> defaultAttributes;
-        private Map<String, Object> overrideAttributes;
-
-        private Builder(){}
-
-        private Builder(ChefNode src){
-            this.name = src.name;
-            this.chefEnvironment = src.chefEnvironment;
-            this.runList = new ArrayList<>(src.runList);
-            this.jsonClass = src.jsonClass;
-            this.chefType = src.chefType;
-            this.automaticAttributes = new HashMap<>(src.automaticAttributes);
-            this.normalAttributes = new HashMap<>(src.normalAttributes);
-            this.defaultAttributes = new HashMap<>(src.defaultAttributes);
-            this.overrideAttributes = new HashMap<>(src.overrideAttributes);
-        }
-
-        public Builder name(String name) {
-            this.name = name;
-            return this;
-        }
-
-        public Builder chefEnvironment(String chefEnvironment) {
-            this.chefEnvironment = chefEnvironment;
-            return this;
-        }
-
-        public ChefNode build(){
-            ChefNode node = new ChefNode();
-            node.name = this.name;
-            node.chefEnvironment = this.chefEnvironment;
-            node.runList = this.runList;
-            node.jsonClass = this.jsonClass;
-            node.chefType = this.chefType;
-            node.automaticAttributes = this.automaticAttributes;
-            node.overrideAttributes = this.overrideAttributes;
-            node.defaultAttributes = this.defaultAttributes;
-            node.normalAttributes = this.normalAttributes;
-            return node;
-        }
-
-    }
-
-    @Override
-    public String toString() {
-        return "Node{" +
-                "name='" + name + '\'' +
-                ", chefEnvironment='" + chefEnvironment + '\'' +
-                ", runList=" + runList +
-                ", jsonClass='" + jsonClass + '\'' +
-                ", chefType='" + chefType + '\'' +
-                ", automaticAttributes=" + automaticAttributes +
-                ", normalAttributes=" + normalAttributes +
-                ", defaultAttributes=" + defaultAttributes +
-                ", overrideAttributes=" + overrideAttributes +
-                '}';
-    }
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/ChefResource.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/ChefResource.java
deleted file mode 100644
index 98eeb0770fc..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/ChefResource.java
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.chef.rest;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
-
-/**
- * @author mortent
- * @author mpolden
- */
-
-@Path("/")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public interface ChefResource {
-
-    @Path("/organizations/{organization}/environments/{environment}/nodes")
-    @Consumes("application/json")
-    @GET
-    List<String> getNodes(@PathParam("organization") String organization, @PathParam("environment") String environment);
-
-    @GET
-    @Path("/organizations/{organization}/nodes/{nodename}")
-    ChefNode getNode(@PathParam("organization") String organization, @PathParam("nodename") String nodename);
-
-    @PUT
-    @Path("/organizations/{organization}/nodes/{nodename}")
-    ChefNode updateNode(@PathParam("organization") String organization, @PathParam("nodename") String nodeName, String node);
-
-    @DELETE
-    @Path("/organizations/{organization}/nodes/{nodename}")
-    ChefNode deleteNode(@PathParam("organization") String organization, @PathParam("nodename") String nodeName);
-
-    @GET
-    @Path("/organizations/{organization}/clients/{name}")
-    Client getClient(@PathParam("organization") String organization, @PathParam("name") String name);
-
-    @DELETE
-    @Path("/organizations/{organization}/clients/{name}")
-    Client deleteClient(@PathParam("organization") String organization, @PathParam("name") String name);
-
-    @GET
-    @Path("/organizations/{organization}/environments/{environment}")
-    ChefEnvironment getEnvironment(@PathParam("organization") String organization, @PathParam("environment") String environment);
-
-    @PUT
-    @Path("/organizations/{organization}/environments/{name}")
-    String updateEnvironment(@PathParam("organization") String organization, @PathParam("name") String chefEnvironmentName, String contentAsString);
-
-    @POST
-    @Path("/organizations/{organization}/environments")
-    String createEnvironment(@PathParam("organization") String organization, String contentAsString);
-
-    @GET
-    @Path("/organizations/{organization}/search/node")
-    NodeResult searchNode(@PathParam("organization") String organization, @QueryParam("q") String query);
-
-    @POST
-    @Path("/organizations/{organization}/search/node")
-    PartialNodeResult partialSearchNode(@PathParam("organization") String organization, @QueryParam("q") String query, @QueryParam("rows") int rows, String keys);
-
-    @GET
-    @Path("/organizations/{organization}/cookbooks/{name}/{version}")
-    CookBook getCookBook(@PathParam("organization") String organization, @PathParam("name") String name, @PathParam("version") String version);
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/Client.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/Client.java
deleted file mode 100644
index 0ea9b0e9997..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/Client.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.chef.rest;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * @author mpolden
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class Client {
-
-    @JsonProperty("name")
-    public String name;
-    @JsonProperty("validator")
-    public boolean validator;
-
-    @Override
-    public String toString() {
-        return "Client{" +
-                "name='" + name + '\'' +
-                ", validator=" + validator +
-                '}';
-    }
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/CookBook.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/CookBook.java
deleted file mode 100644
index ab49ac9ff60..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/CookBook.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.chef.rest;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-/**
- * @author mortent
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class CookBook {
-    public final String name;
-    public final List<Attributes> attributes;
-
-    public CookBook(@JsonProperty("name") String name, @JsonProperty("attributes") List<Attributes> attributes) {
-        this.name = name;
-        this.attributes = attributes;
-    }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class Attributes {
-        public final String name;
-        public final String url;
-
-        public Attributes(@JsonProperty("name") String name, @JsonProperty("url") String url) {
-            this.name = name;
-            this.url = url;
-        }
-    }
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/NodeResult.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/NodeResult.java
deleted file mode 100644
index e3ab431473f..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/NodeResult.java
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.chef.rest;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-/**
- * @author mpolden
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class NodeResult {
-    @JsonProperty("total")
-    public int total;
-    @JsonProperty("start")
-    public int start;
-    @JsonProperty("rows")
-    public List<ChefNode> rows;
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/PartialNode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/PartialNode.java
deleted file mode 100644
index f4aa90021b1..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/PartialNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.chef.rest;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author mortent
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class PartialNode {
-
-    @JsonProperty("data")
-    private final Map<String, String> data;
-
-    @JsonCreator
-    public PartialNode(@JsonProperty("data") Map<String, String> data) {
-        this.data = data;
-    }
-
-    public Optional<String> getValue(String key) {
-        return Optional.ofNullable(data.get(key));
-    }
-
-    public String getFqdn() {
-        return getValue("fqdn").orElse("");
-    }
-
-    public String getName() {
-        return getValue("name").orElse("");
-    }
-
-    public Double getOhaiTime() {
-        return Double.parseDouble(getValue("ohai_time").orElse("0.0"));
-    }
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/PartialNodeResult.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/PartialNodeResult.java
deleted file mode 100644
index 9925237a193..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/PartialNodeResult.java
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.chef.rest;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-/**
- * @author mortent
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class PartialNodeResult {
-    @JsonProperty("total")
-    public int total;
-    @JsonProperty("start")
-    public int start;
-    @JsonProperty("rows")
-    public List<PartialNode> rows;
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/package-info.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/package-info.java
deleted file mode 100644
index 7d06571507e..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/chef/rest/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.vespa.hosted.controller.api.integration.chef.rest;
-
-import com.yahoo.osgi.annotation.ExportPackage;