1 files changed, 17 insertions, 7 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 71e039f6e8e..1f170cca9a0 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
@@ -26,31 +26,41 @@ public class ClusterMembershipTest {
         {
             ClusterMembership instance = ClusterMembership.from("container/id1/4/37/exclusive/retired", Vtag.currentVersion, Optional.empty());
             ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion, Optional.empty());
+            assertFalse(serialized.cluster().isStateful());
             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, Optional.empty());
             ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion, Optional.empty());
+            assertFalse(serialized.cluster().isStateful());
             assertEquals(instance, serialized);
-            assertFalse(instance.retired());
             assertTrue(instance.cluster().isExclusive());
-            assertFalse(instance.cluster().combinedId().isPresent());
-            assertTrue(instance.cluster().dockerImageRepo().isEmpty());
         }
         {
             Optional<DockerImage> dockerImageRepo = Optional.of(DockerImage.fromString("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);
+            assertTrue(serialized.cluster().isStateful());
             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());
         }
+        {
+            ClusterMembership instance = ClusterMembership.from("container/id1/4/37", Vtag.currentVersion, Optional.empty());
+            ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion, Optional.empty());
+            assertEquals(instance, serialized);
+            assertFalse("Skips serialization of stateful property", instance.cluster().isStateful());
+        }
+    }
+
+    @Test
+    public void testLegacyFormat() { // TODO(mpolden): Remove after December 2020
+        ClusterMembership instance = ClusterMembership.from("content/id1/4/37/exclusive", Vtag.currentVersion, Optional.empty());
+        ClusterMembership serialized = ClusterMembership.from(instance.stringValue(), Vtag.currentVersion, Optional.empty());
+        assertEquals(instance, serialized);
+        assertTrue(serialized.cluster().isStateful());
     }
 
     @Test