summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-01-08 15:59:30 +0100
committerBjørn Christian Seime <bjorncs@oath.com>2018-01-08 16:03:29 +0100
commit1765bb74bf71fd25b56d1f5d71eba64801a88ee4 (patch)
tree95bb05ef2639df00c473a4e4b9922d097fbe5a30 /controller-api
parent697a8dbca3d75ba0e3df558439afdd83aa3adad0 (diff)
Remove getNodeList from ConfigServerClient
The implementation is just a wrapper around node repository client.
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java8
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeList.java37
2 files changed, 0 insertions, 45 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java
index 8c8b5fdf22e..086696fc6a4 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java
@@ -67,12 +67,4 @@ public interface ConfigServerClient {
*/
EndpointStatus getGlobalRotationStatus(DeploymentId deployment, String endpoint) throws IOException;
- /**
- * The nodes allocated to the deployment
- *
- * @param deployment The application/zone pair
- * @return The nodes for this deployment
- * @throws IOException If unable to retrieve the node list
- */
- NodeList getNodeList(DeploymentId deployment) throws IOException;
}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeList.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeList.java
deleted file mode 100644
index 0169bfec5fe..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeList.java
+++ /dev/null
@@ -1,37 +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.configserver;// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-/**
- * @author smorgrav
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class NodeList {
-
- @JsonProperty("nodes")
- public List<Node> nodes;
-
- @JsonIgnoreProperties(ignoreUnknown = true)
- public static class Node {
- @JsonProperty("hostname")
- public String hostname;
- @JsonProperty("flavor")
- public String flavor;
- @JsonProperty("membership")
- public Membership membership;
- @JsonProperty("cost")
- public int cost;
-
- @JsonIgnoreProperties(ignoreUnknown = true)
- public static class Membership {
- @JsonProperty("clustertype")
- public String clusterType;
- @JsonProperty("clusterid")
- public String clusterId;
- }
- }
-}