Always pass wanted Vespa version

1 files changed, 15 insertions, 8 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
index cc7d871d23f..01ef305034d 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
+import com.yahoo.component.Vtag;
 import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Inspector;
@@ -8,10 +9,13 @@ import com.yahoo.slime.Slime;
 import com.yahoo.vespa.config.SlimeUtils;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Optional;
+import java.util.Set;
 
 /**
- * Information about provisioned hosts, and (de)serialization (from)to JSON.
+ * Information about hosts provisioned for an application, and (de)serialization of this information to/from JSON.
  *
  * @author lulf
  * @since 5.12
@@ -23,7 +27,7 @@ public class ProvisionInfo {
     private static final String hostSpecHostName = "hostName";
     private static final String hostSpecMembership = "membership";
     private static final String hostSpecFlavor = "flavor";
-    private static final String dockerImage = "dockerImage";
+    private static final String hostSpecVespaVersion = "vespaVersion";
 
     private final Set<HostSpec> hosts = new LinkedHashSet<>();
 
@@ -47,7 +51,7 @@ public class ProvisionInfo {
         cursor.setString(hostSpecHostName, host.hostname());
         if (host.membership().isPresent()) {
             cursor.setString(hostSpecMembership, host.membership().get().stringValue());
-            cursor.setString(dockerImage, host.membership().get().cluster().dockerImage());
+            cursor.setString(hostSpecVespaVersion, host.membership().get().cluster().vespaVersion().toString());
         }
         if (host.flavor().isPresent())
             cursor.setString(hostSpecFlavor, host.flavor().get().name());
@@ -59,17 +63,17 @@ public class ProvisionInfo {
 
     private static ProvisionInfo fromSlime(Inspector inspector, Optional<NodeFlavors> nodeFlavors) {
         Inspector array = inspector.field(mappingKey);
-        final Set<HostSpec> hosts = new LinkedHashSet<>();
+        Set<HostSpec> hosts = new LinkedHashSet<>();
         array.traverse(new ArrayTraverser() {
             @Override
             public void entry(int i, Inspector inspector) {
-                hosts.add(createHostSpec(inspector.field(hostSpecKey), nodeFlavors));
+                hosts.add(deserializeHostSpec(inspector.field(hostSpecKey), nodeFlavors));
             }
         });
         return new ProvisionInfo(hosts);
     }
 
-    private static HostSpec createHostSpec(Inspector object, Optional<NodeFlavors> nodeFlavors) {
+    private static HostSpec deserializeHostSpec(Inspector object, Optional<NodeFlavors> nodeFlavors) {
         Optional<ClusterMembership> membership =
                 object.field(hostSpecMembership).valid() ? Optional.of(readMembership(object)) : Optional.empty();
         Optional<Flavor> flavor =
@@ -79,8 +83,11 @@ public class ProvisionInfo {
     }
 
     private static ClusterMembership readMembership(Inspector object) {
+        // TODO: When no version older than 6.97 is present anywhere, remove the possibility of the version field missing
         return ClusterMembership.from(object.field(hostSpecMembership).asString(),
-                                      object.field(dockerImage).valid() ? Optional.of(object.field(dockerImage).asString()) : Optional.empty());
+                                      object.field(hostSpecVespaVersion).valid() ? 
+                                      com.yahoo.component.Version.fromString(object.field(hostSpecVespaVersion).asString()) :
+                                      Vtag.currentVersion);
     }
 
     private static Optional<Flavor> readFlavor(Inspector object, Optional<NodeFlavors> nodeFlavors) {