Add stats to node repo client

3 files changed, 9 insertions, 18 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
index 8510cf86fef..750fe4f0538 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
@@ -462,13 +462,13 @@ public class NodesV2ApiHandler extends LoggingRequestHandler {
 
         toSlime(stats.load(), root.setObject("load"));
         toSlime(stats.load(), root.setObject("activeLoad"));
-        Cursor applicationsObject = root.setArray("applications");
+        Cursor applicationsObject = root.setArray("applicationStats");
         for (int i = 0; i <= 5; i++) {
             if (i >= stats.applicationStats().size()) break;
 
             var applicationStats = stats.applicationStats().get(i);
             Cursor applicationObject = applicationsObject.addObject();
-            applicationObject.setString("application", applicationStats.id().toFullString());
+            applicationObject.setString("id", applicationStats.id().toFullString());
             toSlime(applicationStats.load(), applicationObject.setObject("load"));
             applicationObject.setDouble("cost", applicationStats.cost());
             applicationObject.setDouble("unutilizedCost", applicationStats.unutilizedCost());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
index 69f1b72fe09..9ac85b9a99c 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
@@ -60,6 +60,8 @@ public class NodesV2ApiTest {
         assertFile(new Request("http://localhost:8080/nodes/v2/node/?recursive=true"), "nodes-recursive.json");
         assertFile(new Request("http://localhost:8080/nodes/v2/node/?recursive=true&includeDeprovisioned=true"), "nodes-recursive-include-deprovisioned.json");
         assertFile(new Request("http://localhost:8080/nodes/v2/node/host2.yahoo.com"), "node2.json");
+        assertFile(new Request("http://localhost:8080/nodes/v2/stats"), "stats.json");
+        assertFile(new Request("http://localhost:8080/nodes/v2/maintenance/"), "maintenance.json");
 
         // GET with filters
         assertFile(new Request("http://localhost:8080/nodes/v2/node/?recursive=true&hostname=host6.yahoo.com%20host2.yahoo.com"), "application2-nodes.json");
@@ -260,17 +262,6 @@ public class NodesV2ApiTest {
     }
 
     @Test
-    public void test_stats_request() throws Exception {
-        assertFile(new Request("http://localhost:8080/nodes/v2/stats"), "stats.json");
-    }
-
-    @Test
-    public void maintenance_requests() throws Exception {
-        // GET a list of all maintenance jobs
-        assertFile(new Request("http://localhost:8080/nodes/v2/maintenance/"), "maintenance.json");
-    }
-
-    @Test
     public void post_with_patch_method_override_in_header_is_handled_as_patch() throws Exception  {
         Request req = new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com",
                 Utf8.toBytes("{\"currentRestartGeneration\": 1}"), Request.Method.POST);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json
index 1613389796c..c8e41078a7a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json
@@ -9,9 +9,9 @@
     "memory": 0.0,
     "disk": 0.0
   },
-  "applications": [
+  "applicationStats": [
     {
-      "application": "tenant3.application3.instance3",
+      "id": "tenant3.application3.instance3",
       "load": {
         "cpu": 0.0,
         "memory": 0.0,
@@ -21,7 +21,7 @@
       "unutilizedCost": 0.0
     },
     {
-      "application": "tenant2.application2.instance2",
+      "id": "tenant2.application2.instance2",
       "load": {
         "cpu": 0.0,
         "memory": 0.0,
@@ -31,7 +31,7 @@
       "unutilizedCost": 0.0
     },
     {
-      "application": "tenant4.application4.instance4",
+      "id": "tenant4.application4.instance4",
       "load": {
         "cpu": 0.0,
         "memory": 0.0,
@@ -41,7 +41,7 @@
       "unutilizedCost": 0.0
     },
     {
-      "application": "tenant1.application1.instance1",
+      "id": "tenant1.application1.instance1",
       "load": {
         "cpu": 0.0,
         "memory": 0.0,