Merge pull request #13049 from vespa-engine/musum/add-docker-image-to-node-details

Add docker image repository to node details

4 files changed, 28 insertions, 17 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index c49c56c4e82..bc206011bb1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -526,8 +526,8 @@ public class InternalStepRunner implements StepRunner {
 
     private Stream<String> nodeDetails(NodeWithServices node, boolean printAllServices) {
         return Stream.concat(Stream.of(node.node().hostname() + ": " + humanize(node.node().serviceState()) + (node.node().suspendedSince().map(since -> " since " + since).orElse("")),
-                                       "--- platform " + node.node().wantedVersion() + (node.needsPlatformUpgrade()
-                                                                                        ? " <-- " + (node.node().currentVersion().isEmpty() ? "not booted" : node.node().currentVersion())
+                                       "--- platform " + wantedPlatform(node.node()) + (node.needsPlatformUpgrade()
+                                                                                        ? " <-- " + currentPlatform(node.node())
                                                                                         : "") +
                                        (node.needsOsUpgrade() && node.isAllowedDown()
                                         ? ", upgrading OS (" + node.node().wantedOsVersion() + " <-- " + node.node().currentOsVersion() + ")"
@@ -548,6 +548,17 @@ public class InternalStepRunner implements StepRunner {
                                                                                                            : " has config generation " + service.currentGeneration() + ", wanted is " + node.wantedConfigGeneration())));
     }
 
+
+    private String wantedPlatform(Node node) {
+        return node.wantedDockerImage().repository() + ":" + node.wantedVersion();
+    }
+
+    private String currentPlatform(Node node) {
+        String currentRepo = node.currentDockerImage().repository();
+        String wantedRepo = node.wantedDockerImage().repository();
+        return (currentRepo.equals(wantedRepo) ? "" : currentRepo + ":") + node.currentVersion();
+    }
+
     private String humanize(Node.ServiceState state) {
         switch (state) {
             case allowedDown: return "allowed to be DOWN";
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
index 3a54ac70b0d..50799bcefa2 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
@@ -38,7 +38,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": 0,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
index ba51471d467..a941b824b53 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
@@ -28,7 +28,7 @@
       {
         "at": 7303000,
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": 7303000,
@@ -43,7 +43,7 @@
       {
         "at": 7303000,
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": 7303000,
@@ -58,7 +58,7 @@
       {
         "at": 7303000,
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": 7303000,
@@ -102,7 +102,7 @@
       {
         "at": 7303000,
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": 7303000,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
index 489d6a11b6a..ec45ae02487 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
@@ -33,7 +33,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": "(ignore)",
@@ -48,7 +48,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": "(ignore)",
@@ -63,7 +63,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": "(ignore)",
@@ -78,7 +78,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": "(ignore)",
@@ -122,7 +122,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": "(ignore)",
@@ -137,7 +137,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": "(ignore)",
@@ -152,7 +152,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": "(ignore)",
@@ -167,7 +167,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": "(ignore)",
@@ -182,7 +182,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": "(ignore)",
@@ -197,7 +197,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform 6.1"
+        "message": "--- platform dockerImage:6.1"
       },
       {
         "at": "(ignore)",