From 2319fe6f00fe0e1891f26f919de3ec9796752a2c Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Fri, 24 Apr 2020 09:51:15 +0200
Subject: Add docker image repository to node details

---
 .../hosted/controller/deployment/InternalStepRunner.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'controller-server/src/main/java/com')

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..353b82ede49 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,15 @@ 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) {
+        return node.wantedDockerImage().repository() + ":" + node.wantedVersion();
+    }
+
     private String humanize(Node.ServiceState state) {
         switch (state) {
             case allowedDown: return "allowed to be DOWN";
-- 
cgit v1.2.3