Add getNodeList to configserverclient

2 files changed, 44 insertions, 1 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 a96f7637738..8c8b5fdf22e 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,5 +67,12 @@ public interface ConfigServerClient {
      */
     EndpointStatus getGlobalRotationStatus(DeploymentId deployment, String endpoint) throws IOException;
 
-    //JsonNode getClusterInfo(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
new file mode 100644
index 00000000000..755bec2fcec
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeList.java
@@ -0,0 +1,36 @@
+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;
+        }
+    }
+}
\ No newline at end of file