1 files changed, 22 insertions, 13 deletions

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 4418b5c85ca..3ac04cd1cb5 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
@@ -18,72 +18,81 @@ public class ClusterMembershipTest {
 
     @Test
     public void testContainerServiceInstance() {
-        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"), Version.fromString("6.42"), false, Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"),
+                                                  Version.fromString("6.42"), false, Optional.empty(), Optional.empty());
         assertContainerService(ClusterMembership.from(cluster, 3));
     }
 
     @Test
     public void testSerializationWithOptionalParts() {
         {
-            ClusterMembership instance = ClusterMembership.from("container/id1/4/37/exclusive/retired", Vtag.currentVersion);
-            ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion);
+            ClusterMembership instance = ClusterMembership.from("container/id1/4/37/exclusive/retired", Vtag.currentVersion, Optional.empty());
+            ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion, Optional.empty());
             assertEquals(instance, serialized);
             assertTrue(instance.retired());
             assertTrue(instance.cluster().isExclusive());
             assertFalse(instance.cluster().combinedId().isPresent());
+            assertTrue(instance.cluster().dockerImageRepo().isEmpty());
         }
         {
-            ClusterMembership instance = ClusterMembership.from("container/id1/4/37/exclusive", Vtag.currentVersion);
-            ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion);
+            ClusterMembership instance = ClusterMembership.from("container/id1/4/37/exclusive", Vtag.currentVersion, Optional.empty());
+            ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion, Optional.empty());
             assertEquals(instance, serialized);
             assertFalse(instance.retired());
             assertTrue(instance.cluster().isExclusive());
             assertFalse(instance.cluster().combinedId().isPresent());
+            assertTrue(instance.cluster().dockerImageRepo().isEmpty());
         }
         {
-            ClusterMembership instance = ClusterMembership.from("combined/id1/4/37/exclusive/containerId1", Vtag.currentVersion);
-            ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion);
+            Optional<String> dockerImageRepo = Optional.of("docker.foo.com:4443/vespa/bar");
+            ClusterMembership instance = ClusterMembership.from("combined/id1/4/37/exclusive/containerId1", Vtag.currentVersion, dockerImageRepo);
+            ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion, dockerImageRepo);
             assertEquals(instance, serialized);
             assertFalse(instance.retired());
             assertTrue(instance.cluster().isExclusive());
             assertEquals(ClusterSpec.Id.from("containerId1"), instance.cluster().combinedId().get());
+            assertEquals(dockerImageRepo.get(), instance.cluster().dockerImageRepo().get());
         }
     }
 
     @Test
     public void testServiceInstance() {
-        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Version.fromString("6.42"), false, Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"),
+                                                  Version.fromString("6.42"), false, Optional.empty(), Optional.empty());
         assertContentService(ClusterMembership.from(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceWithGroup() {
         ClusterSpec cluster = ClusterSpec.from(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"),
-                                               ClusterSpec.Group.from(4), Version.fromString("6.42"), false, Optional.empty());
+                                               ClusterSpec.Group.from(4), Version.fromString("6.42"),
+                                               false, Optional.empty(), Optional.empty());
         assertContentServiceWithGroup(ClusterMembership.from(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceWithGroupFromString() {
-        assertContentServiceWithGroup(ClusterMembership.from("content/id1/4/37", Vtag.currentVersion));
+        assertContentServiceWithGroup(ClusterMembership.from("content/id1/4/37", Vtag.currentVersion, Optional.empty()));
     }
 
     @Test
     public void testServiceInstanceWithRetire() {
-        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Version.fromString("6.42"), false, Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"),
+                                                  Version.fromString("6.42"), false, Optional.empty(), Optional.empty());
         assertContentServiceWithRetire(ClusterMembership.retiredFrom(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceWithGroupAndRetire() {
         ClusterSpec cluster = ClusterSpec.from(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"),
-                                               ClusterSpec.Group.from(4), Version.fromString("6.42"), false, Optional.empty());
+                                               ClusterSpec.Group.from(4), Version.fromString("6.42"),
+                                               false, Optional.empty(), Optional.empty());
         assertContentServiceWithGroupAndRetire(ClusterMembership.retiredFrom(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceWithGroupAndRetireFromString() {
-        assertContentServiceWithGroupAndRetire(ClusterMembership.from("content/id1/4/37/retired", Vtag.currentVersion));
+        assertContentServiceWithGroupAndRetire(ClusterMembership.from("content/id1/4/37/retired", Vtag.currentVersion, Optional.empty()));
     }
 
     private void assertContainerService(ClusterMembership instance) {