Add additional fields to application/v4 nodes response

2 files changed, 9 insertions, 3 deletions

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 ca080078328..bf869395c61 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
@@ -816,9 +816,12 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
             nodeObject.setString("version", node.currentVersion().toString());
             nodeObject.setString("flavor", node.flavor());
             toSlime(node.resources(), nodeObject);
-            nodeObject.setBool("fastDisk", node.resources().diskSpeed() == NodeResources.DiskSpeed.fast); // TODO: Remove
             nodeObject.setString("clusterId", node.clusterId());
             nodeObject.setString("clusterType", valueOf(node.clusterType()));
+            nodeObject.setBool("down", node.history().stream().anyMatch(event -> "down".equals(event.getEvent())));
+            nodeObject.setBool("retired", node.retired() || node.wantToRetire());
+            nodeObject.setBool("restarting", node.wantedRestartGeneration() > node.restartGeneration());
+            nodeObject.setBool("rebooting", node.wantedRebootGeneration() > node.rebootGeneration());
         }
         return new SlimeJsonResponse(slime);
     }
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
index 0cfb457660c..886a1dec5a5 100644
--- 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
@@ -12,9 +12,12 @@
       "bandwidthGbps": 1.0,
       "diskSpeed": "slow",
       "storageType": "remote",
-      "fastDisk": false,
       "clusterId": "default",
-      "clusterType": "container"
+      "clusterType": "container",
+      "down": false,
+      "retired": false,
+      "restarting": false,
+      "rebooting": false
     }
   ]
 }