Always pass wanted Vespa version

6 files changed, 49 insertions, 34 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java
index ff7ff0b4971..b78c4bb9f56 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java
@@ -2,6 +2,7 @@
 package com.yahoo.config.provision;
 
 import com.yahoo.component.Version;
+import com.yahoo.component.Vtag;
 
 import java.util.Optional;
 
@@ -20,7 +21,7 @@ public class ClusterMembership {
 
     protected ClusterMembership() {}
 
-    private ClusterMembership(String stringValue, Optional<Version> vespaVersion) {
+    private ClusterMembership(String stringValue, Version vespaVersion) {
         String restValue;
         if (stringValue.endsWith("/retired")) {
             retired = true;
@@ -51,14 +52,14 @@ public class ClusterMembership {
         this.stringValue = toStringValue();
     }
 
-    private void initWithoutGroup(String[] components, Optional<Version> vespaVersion) {
-        this.cluster = ClusterSpec.requestVersion(ClusterSpec.Type.valueOf(components[0]),
-                                                  ClusterSpec.Id.from(components[1]),
-                                                  vespaVersion);
+    private void initWithoutGroup(String[] components, Version vespaVersion) {
+        this.cluster = ClusterSpec.request(ClusterSpec.Type.valueOf(components[0]),
+                                           ClusterSpec.Id.from(components[1]),
+                                           vespaVersion);
         this.index = Integer.parseInt(components[2]);
     }
 
-    private void initWithGroup(String[] components, Optional<Version> vespaVersion) {
+    private void initWithGroup(String[] components, Version vespaVersion) {
         this.cluster = ClusterSpec.from(ClusterSpec.Type.valueOf(components[0]), ClusterSpec.Id.from(components[1]),
                                         ClusterSpec.Group.from(Integer.valueOf(components[2])), vespaVersion);
         this.index = Integer.parseInt(components[3]);
@@ -115,10 +116,16 @@ public class ClusterMembership {
     @Deprecated
     // TODO: April 2017 - Remove this when no version older than 6.92 is in production
     public static ClusterMembership from(String stringValue, Optional<String> dockerImage) {
-        return fromVersion(stringValue, dockerImage.map(DockerImage::new).map(DockerImage::tagAsVersion));
+        return from(stringValue, dockerImage.map(DockerImage::new).map(DockerImage::tagAsVersion).orElse(Vtag.currentVersion));
     }
 
+    @Deprecated
+    // TODO: April 2017 - Remove this when no version older than 6.97 is in production
     public static ClusterMembership fromVersion(String stringValue, Optional<Version> vespaVersion) {
+        return new ClusterMembership(stringValue, vespaVersion.orElse(Vtag.currentVersion));
+    }
+
+    public static ClusterMembership from(String stringValue, Version vespaVersion) {
         return new ClusterMembership(stringValue, vespaVersion);
     }
 
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index ec655f0eee2..6a79f2f06ed 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -2,6 +2,8 @@
 package com.yahoo.config.provision;
 
 import com.yahoo.component.Version;
+import com.yahoo.component.Vtag;
+
 import java.util.Objects;
 import java.util.Optional;
 
@@ -55,7 +57,7 @@ public final class ClusterSpec {
     /** Create a specification <b>requesting</b> a cluster with these attributes */
     // TODO: April 2017 - Remove this when no version older than 6.97 is used anywhere
     public static ClusterSpec requestVersion(Type type, Id id, Optional<Version> vespaVersion) {
-        return new ClusterSpec(type, id, Optional.empty(), vespaVersion.get());
+        return new ClusterSpec(type, id, Optional.empty(), vespaVersion.orElse(Vtag.currentVersion));
     }
 
     public static ClusterSpec request(Type type, Id id, Version vespaVersion) {
@@ -65,18 +67,13 @@ public final class ClusterSpec {
     /** Create a specification <b>specifying</b> an existing cluster group having these attributes */
     // TODO: April 2017 - Remove this when no version older than 6.97 is used anywhere
     public static ClusterSpec from(Type type, Id id, Group groupId, Optional<Version> vespaVersion) {
-        return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion.get());
+        return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion.orElse(Vtag.currentVersion));
     }
 
-    /** Create a specification <b>specifying</b> an existing cluster group having these attributes */
-    // TODO: April 2017 - Remove this when no version older than 6.97 is used anywhere
     public static ClusterSpec from(Type type, Id id, Group groupId, Version vespaVersion) {
         return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion);
     }
 
-    neste: - sørg for at ingen bruker deprecateds over
-           - gå tilbake til NodeSpecification og sørg for at version sendes inn der fra ModelContext
-    
     @Override
     public String toString() {
         return String.join(" ", type.toString(), id.toString(),
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) {
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java
index 56da6dbcaa7..90a727a221f 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java
@@ -1,6 +1,8 @@
 // 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.*;
+import com.yahoo.component.Version;
 import org.junit.Test;
 
 import java.util.Optional;
@@ -16,59 +18,59 @@ public class ClusterMembershipTest {
 
     @Test
     public void testContainerServiceInstance() {
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"), Version.fromString("6.42"));
         assertContainerService(ClusterMembership.from(cluster, 3));
     }
 
     @Test
     public void testContainerServiceInstanceFromString() {
-        assertContainerService(ClusterMembership.fromVersion("container/id1/3", Optional.empty()));
+        assertContainerService(ClusterMembership.from("container/id1/3", Vtag.currentVersion));
     }
 
     @Test
     public void testServiceInstance() {
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Version.fromString("6.42"));
         assertContentService(ClusterMembership.from(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceFromString() {
-        assertContentService(ClusterMembership.fromVersion("content/id1/37", Optional.empty()));
+        assertContentService(ClusterMembership.from("content/id1/37", Vtag.currentVersion));
     }
 
     @Test
     public void testServiceInstanceWithGroup() {
         ClusterSpec cluster = ClusterSpec.from(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"),
-                                               ClusterSpec.Group.from(4), Optional.empty());
+                                               ClusterSpec.Group.from(4), Version.fromString("6.42"));
         assertContentServiceWithGroup(ClusterMembership.from(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceWithGroupFromString() {
-        assertContentServiceWithGroup(ClusterMembership.from("content/id1/4/37", Optional.empty()));
+        assertContentServiceWithGroup(ClusterMembership.from("content/id1/4/37", Vtag.currentVersion));
     }
 
     @Test
     public void testServiceInstanceWithRetire() {
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Version.fromString("6.42"));
         assertContentServiceWithRetire(ClusterMembership.retiredFrom(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceWithRetireFromString() {
-        assertContentServiceWithRetire(ClusterMembership.from("content/id1/37/retired", Optional.empty()));
+        assertContentServiceWithRetire(ClusterMembership.from("content/id1/37/retired", Vtag.currentVersion));
     }
 
     @Test
     public void testServiceInstanceWithGroupAndRetire() {
         ClusterSpec cluster = ClusterSpec.from(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"),
-                                               ClusterSpec.Group.from(4), Optional.empty());
+                                               ClusterSpec.Group.from(4), Version.fromString("6.42"));
         assertContentServiceWithGroupAndRetire(ClusterMembership.retiredFrom(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceWithGroupAndRetireFromString() {
-        assertContentServiceWithGroupAndRetire(ClusterMembership.from("content/id1/4/37/retired", Optional.empty()));
+        assertContentServiceWithGroupAndRetire(ClusterMembership.from("content/id1/4/37/retired", Vtag.currentVersion));
     }
 
     private void assertContainerService(ClusterMembership instance) {
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.java
index b16e2d76ca8..23fe00d0ec5 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.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 org.junit.Test;
 
 import java.util.Arrays;
@@ -70,7 +71,7 @@ public class HostFilterTest {
     }
 
     private Optional<ClusterMembership> membership(String membershipString) {
-        return Optional.of(ClusterMembership.from(membershipString, Optional.empty()));
+        return Optional.of(ClusterMembership.from(membershipString, Vtag.currentVersion));
     }
 
 }
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
index 2538d687c1d..d54b76c1b65 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
@@ -20,7 +20,7 @@ public class ProvisionInfoTest {
 
     private final HostSpec h1 = new HostSpec("host1", Optional.empty());
     private final HostSpec h2 = new HostSpec("host2", Optional.empty());
-    private final HostSpec h3 = new HostSpec("host3", Optional.of(ClusterMembership.from("container/test/0", Optional.empty())));
+    private final HostSpec h3 = new HostSpec("host3", Optional.of(ClusterMembership.from("container/test/0", com.yahoo.component.Version.fromString("6.73.1"))));
     private final HostSpec h4 = new HostSpec("host4", Optional.of(ClusterMembership.from("container/test/1", Optional.of("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.1"))));
 
     @Test
@@ -57,6 +57,7 @@ public class ProvisionInfoTest {
         assertTrue(serializedInfo.getHosts().contains(h4));
         assertTrue(!getHost(h1.hostname(), serializedInfo.getHosts()).membership().isPresent());
         assertEquals("container/test/0", getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().stringValue());
+        assertEquals(h3.membership().get().cluster().vespaVersion(), getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().cluster().vespaVersion());
         assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.1", getHost(h4.hostname(), serializedInfo.getHosts()).membership().get().cluster().dockerImage());
     }