Expose application nodes in application/v4

4 files changed, 73 insertions, 0 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
index 797ca10ed3d..8209e5d3568 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
@@ -57,6 +57,7 @@ public enum PathGroup {
                     Matcher.application,
                     "/application/v4/tenant/{tenant}/application/{application}/deploying/{*}",
                     "/application/v4/tenant/{tenant}/application/{application}/instance/{*}",
+                    "/application/v4/tenant/{tenant}/application/{application}/environment/{environment}/region/{region}/instance/{instance}/nodes",
                     "/application/v4/tenant/{tenant}/application/{application}/environment/{environment}/region/{region}/instance/{instance}/logs",
                     "/application/v4/tenant/{tenant}/application/{application}/environment/{environment}/region/{region}/instance/{instance}/suspended",
                     "/application/v4/tenant/{tenant}/application/{application}/environment/{environment}/region/{region}/instance/{instance}/service/{*}",
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 44794600551..1bfd75bae6e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -44,6 +44,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.TenantId;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.Log;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.Logs;
+import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationVersion;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId;
@@ -173,6 +174,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         if (path.matches("/application/v4/tenant/{tenant}/application/{application}")) return application(path.get("tenant"), path.get("application"), request);
         if (path.matches("/application/v4/tenant/{tenant}/application/{application}/deploying")) return deploying(path.get("tenant"), path.get("application"), request);
         if (path.matches("/application/v4/tenant/{tenant}/application/{application}/deploying/pin")) return deploying(path.get("tenant"), path.get("application"), request);
+        if (path.matches("/application/v4/tenant/{tenant}/application/{application}/environment/{environment}/region/{region}/instance/{instance}/nodes")) return nodes(path.get("tenant"), path.get("application"), path.get("instance"), path.get("environment"), path.get("region"));
         if (path.matches("/application/v4/tenant/{tenant}/application/{application}/environment/{environment}/region/{region}/instance/{instance}/logs")) return logs(path.get("tenant"), path.get("application"), path.get("instance"), path.get("environment"), path.get("region"), request.propertyMap());
         if (path.matches("/application/v4/tenant/{tenant}/application/{application}/instance/{instance}/job")) return JobControllerApiHandlerHelper.jobTypeResponse(controller, appIdFromPath(path), request.getUri());
         if (path.matches("/application/v4/tenant/{tenant}/application/{application}/instance/{instance}/job/{jobtype}")) return JobControllerApiHandlerHelper.runResponse(controller.jobController().runs(appIdFromPath(path), jobTypeFromPath(path)), request.getUri());
@@ -328,6 +330,58 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
                           .orElseThrow(() -> new NotExistsException(applicationId + " not found"));
     }
 
+    private HttpResponse nodes(String tenantName, String applicationName, String instanceName, String environment, String region) {
+        ApplicationId id = ApplicationId.from(tenantName, applicationName, instanceName);
+        ZoneId zone = ZoneId.from(environment, region);
+        List<Node> nodes = controller.configServer().nodeRepository().list(zone, id);
+
+        Slime slime = new Slime();
+        Cursor nodesArray = slime.setObject().setArray("nodes");
+        for (Node node : nodes) {
+            Cursor nodeObject = nodesArray.addObject();
+            nodeObject.setString("hostname", node.hostname().value());
+            nodeObject.setString("state", valueOf(node.state()));
+            nodeObject.setString("orchestration", valueOf(node.serviceState()));
+            nodeObject.setString("version", node.currentVersion().toString());
+            nodeObject.setString("flavor", node.canonicalFlavor());
+            nodeObject.setString("clusterId", node.clusterId());
+            nodeObject.setString("clusterType", valueOf(node.clusterType()));
+        }
+        return new SlimeJsonResponse(slime);
+    }
+
+    private static String valueOf(Node.State state) {
+        switch (state) {
+            case failed: return "failed";
+            case parked: return "parked";
+            case dirty: return "dirty";
+            case ready: return "ready";
+            case active: return "active";
+            case inactive: return "inactive";
+            case reserved: return "reserved";
+            case provisioned: return "provisioned";
+            default: throw new IllegalArgumentException("Unexpected node state '" + state + "'.");
+        }
+    }
+
+    private static String valueOf(Node.ServiceState state) {
+        switch (state) {
+            case expectedUp: return "expectedUp";
+            case allowedDown: return "allowedDown";
+            case unorchestrated: return "unorchestrated";
+            default: throw new IllegalArgumentException("Unexpected node state '" + state + "'.");
+        }
+    }
+
+    private static String valueOf(Node.ClusterType type) {
+        switch (type) {
+            case admin: return "admin";
+            case content: return "content";
+            case container: return "container";
+            default: throw new IllegalArgumentException("Unexpected node cluster type '" + type + "'.");
+        }
+    }
+
     private HttpResponse logs(String tenantName, String applicationName, String instanceName, String environment, String region, Map<String, String> queryParameters) {
         ApplicationId application = ApplicationId.from(tenantName, applicationName, instanceName);
         ZoneId zone = ZoneId.from(environment, region);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index ec17e26d867..e60bbdc4d84 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -380,6 +380,11 @@ public class ApplicationApiTest extends ControllerContainerTest {
                                       .recursive("true"),
                               new File("application1-recursive.json"));
 
+        // GET nodes
+        tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-central-1/instance/default/nodes", GET)
+                             .userIdentity(USER_ID),
+                              new File("application-nodes.json"));
+
         // GET logs
         tester.assertResponse(request("/application/v4/tenant/tenant2/application/application1/environment/prod/region/us-central-1/instance/default/logs?from=1233&to=3214", GET)
                                         .userIdentity(USER_ID),
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json
new file mode 100644
index 00000000000..eb53ff7161e
--- /dev/null
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json
@@ -0,0 +1,13 @@
+{
+  "nodes": [
+    {
+      "hostname": "host-tenant1:application1:default-prod.us-central-1",
+      "state": "active",
+      "orchestration": "unorchestrated",
+      "version": "6.1",
+      "flavor": "d-2-8-50",
+      "clusterId": "cluster",
+      "clusterType": "container"
+    }
+  ]
+}