Allow applications to request exlcusive access to hosts

3 files changed, 36 insertions, 50 deletions

diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/AllocatedHostsTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/AllocatedHostsTest.java
index 675af88596a..a39b8d3ef34 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/AllocatedHostsTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/AllocatedHostsTest.java
@@ -18,7 +18,7 @@ public class AllocatedHostsTest {
 
     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", com.yahoo.component.Version.fromString("6.73.1"))));
+    private final HostSpec h3 = new HostSpec("host3", Optional.of(ClusterMembership.from("container/test/0/0", com.yahoo.component.Version.fromString("6.73.1"))));
 
     @Test
     public void testAllocatedHostsSerialization() throws IOException {
@@ -37,7 +37,7 @@ public class AllocatedHostsTest {
         assertTrue(serializedAllocatedHosts.getHosts().contains(h2));
         assertTrue(serializedAllocatedHosts.getHosts().contains(h3));
         assertTrue(!getHost(h1.hostname(), serializedAllocatedHosts.getHosts()).membership().isPresent());
-        assertEquals("container/test/0", getHost(h3.hostname(), serializedAllocatedHosts.getHosts()).membership().get().stringValue());
+        assertEquals("container/test/0/0", getHost(h3.hostname(), serializedAllocatedHosts.getHosts()).membership().get().stringValue());
         assertEquals(h3.membership().get().cluster().vespaVersion(), getHost(h3.hostname(), 
                                                                              serializedAllocatedHosts.getHosts()).membership().get().cluster().vespaVersion());
     }
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 bc8586d5c52..f1970326137 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,30 +18,20 @@ public class ClusterMembershipTest {
 
     @Test
     public void testContainerServiceInstance() {
-        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"), Version.fromString("6.42"));
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"), Version.fromString("6.42"), false);
         assertContainerService(ClusterMembership.from(cluster, 3));
     }
 
     @Test
-    public void testContainerServiceInstanceFromString() {
-        assertContainerService(ClusterMembership.from("container/id1/3", Vtag.currentVersion));
-    }
-
-    @Test
     public void testServiceInstance() {
-        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Version.fromString("6.42"));
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Version.fromString("6.42"), false);
         assertContentService(ClusterMembership.from(cluster, 37));
     }
 
     @Test
-    public void testServiceInstanceFromString() {
-        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), Version.fromString("6.42"));
+                                               ClusterSpec.Group.from(4), Version.fromString("6.42"), false);
         assertContentServiceWithGroup(ClusterMembership.from(cluster, 37));
     }
 
@@ -52,19 +42,14 @@ public class ClusterMembershipTest {
 
     @Test
     public void testServiceInstanceWithRetire() {
-        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Version.fromString("6.42"));
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Version.fromString("6.42"), false);
         assertContentServiceWithRetire(ClusterMembership.retiredFrom(cluster, 37));
     }
 
     @Test
-    public void testServiceInstanceWithRetireFromString() {
-        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), Version.fromString("6.42"));
+                                               ClusterSpec.Group.from(4), Version.fromString("6.42"), false);
         assertContentServiceWithGroupAndRetire(ClusterMembership.retiredFrom(cluster, 37));
     }
 
@@ -76,7 +61,7 @@ public class ClusterMembershipTest {
     private void assertContainerService(ClusterMembership instance) {
         assertEquals(ClusterSpec.Type.container, instance.cluster().type());
         assertEquals("id1", instance.cluster().id().value());
-        assertEquals(Optional.<ClusterSpec.Group>empty(), instance.cluster().group());
+        assertFalse(instance.cluster().group().isPresent());
         assertEquals(3, instance.index());
         assertEquals("container/id1/3", instance.stringValue());
     }
@@ -84,7 +69,7 @@ public class ClusterMembershipTest {
     private void assertContentService(ClusterMembership instance) {
         assertEquals(ClusterSpec.Type.content, instance.cluster().type());
         assertEquals("id1", instance.cluster().id().value());
-        assertFalse("gr4", instance.cluster().group().isPresent());
+        assertFalse(instance.cluster().group().isPresent());
         assertEquals(37, instance.index());
         assertFalse(instance.retired());
         assertEquals("content/id1/37", instance.stringValue());
@@ -99,6 +84,7 @@ public class ClusterMembershipTest {
         assertEquals("content/id1/4/37", instance.stringValue());
     }
 
+    /** Serializing a spec without a group assigned works, but not deserialization */
     private void assertContentServiceWithRetire(ClusterMembership instance) {
         assertEquals(ClusterSpec.Type.content, instance.cluster().type());
         assertEquals("id1", instance.cluster().id().value());
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 adc7105b2a6..e1d6f061446 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
@@ -24,25 +24,25 @@ public class HostFilterTest {
         HostFilter type = HostFilter.clusterType(ClusterSpec.Type.content);
         HostFilter id = HostFilter.clusterId(ClusterSpec.Id.from("type1"));
 
-        assertTrue(      all.matches("anyhost", "flavor", membership("container/anytype/0")));
-        assertFalse(hostname.matches("anyhost", "flavor", membership("container/anytype/0")));
-        assertFalse(type.matches("anyhost", "flavor", membership("container/anytype/0")));
-        assertFalse(id.matches("anyhost", "flavor", membership("container/anytype/0")));
+        assertTrue(      all.matches("anyhost", "flavor", membership("container/anytype/0/0")));
+        assertFalse(hostname.matches("anyhost", "flavor", membership("container/anytype/0/0")));
+        assertFalse(type.matches("anyhost", "flavor", membership("container/anytype/0/0")));
+        assertFalse(id.matches("anyhost", "flavor", membership("container/anytype/0/0")));
 
-        assertTrue(      all.matches("anyhost", "flavor", membership("content/anytype/0")));
-        assertFalse(hostname.matches("anyhost", "flavor", membership("content/anytype/0")));
-        assertTrue(     type.matches("anyhost", "flavor", membership("content/anytype/0")));
-        assertFalse(      id.matches("anyhost", "flavor", membership("content/anytype/0")));
+        assertTrue(      all.matches("anyhost", "flavor", membership("content/anytype/0/0")));
+        assertFalse(hostname.matches("anyhost", "flavor", membership("content/anytype/0/0")));
+        assertTrue(     type.matches("anyhost", "flavor", membership("content/anytype/0/0")));
+        assertFalse(      id.matches("anyhost", "flavor", membership("content/anytype/0/0")));
 
-        assertTrue(      all.matches("host1", "flavor", membership("content/anytype/0")));
-        assertTrue( hostname.matches("host1", "flavor", membership("content/anytype/0")));
-        assertTrue(     type.matches("host1", "flavor", membership("content/anytype/0")));
-        assertFalse(      id.matches("host1", "flavor", membership("content/anytype/0")));
+        assertTrue(      all.matches("host1", "flavor", membership("content/anytype/0/0")));
+        assertTrue( hostname.matches("host1", "flavor", membership("content/anytype/0/0")));
+        assertTrue(     type.matches("host1", "flavor", membership("content/anytype/0/0")));
+        assertFalse(      id.matches("host1", "flavor", membership("content/anytype/0/0")));
 
-        assertTrue(      all.matches("host1", "flavor", membership("content/type1/0")));
-        assertTrue( hostname.matches("host1", "flavor", membership("content/type1/0")));
-        assertTrue(     type.matches("host1", "flavor", membership("content/type1/0")));
-        assertTrue(       id.matches("host1", "flavor", membership("content/type1/0")));
+        assertTrue(      all.matches("host1", "flavor", membership("content/type1/0/0")));
+        assertTrue( hostname.matches("host1", "flavor", membership("content/type1/0/0")));
+        assertTrue(     type.matches("host1", "flavor", membership("content/type1/0/0")));
+        assertTrue(       id.matches("host1", "flavor", membership("content/type1/0/0")));
     }
 
     @Test
@@ -52,22 +52,22 @@ public class HostFilterTest {
                                                Collections.singletonList(ClusterSpec.Type.content),
                                                Collections.singletonList(ClusterSpec.Id.from("type1")));
 
-        assertFalse(typeAndId.matches("anyhost", "flavor", membership("content/anyType/0")));
-        assertFalse(typeAndId.matches("anyhost", "flavor", membership("container/type1/0")));
-        assertTrue(typeAndId.matches("anyhost", "flavor", membership("content/type1/0")));
+        assertFalse(typeAndId.matches("anyhost", "flavor", membership("content/anyType/0/0")));
+        assertFalse(typeAndId.matches("anyhost", "flavor", membership("container/type1/0/0")));
+        assertTrue(typeAndId.matches("anyhost", "flavor", membership("content/type1/0/0")));
     }
 
     @Test
     public void testMultiConditionFilterFromStrings() {
         HostFilter typeAndId = HostFilter.from("host1  host2, host3,host4", "  , ,flavor", null, "type1  ");
 
-        assertFalse(typeAndId.matches("anotherhost", "flavor", membership("content/type1/0")));
-        assertTrue(typeAndId.matches("host1", "flavor", membership("content/type1/0")));
-        assertTrue(typeAndId.matches("host2", "flavor", membership("content/type1/0")));
-        assertTrue(typeAndId.matches("host3", "flavor", membership("content/type1/0")));
-        assertTrue(typeAndId.matches("host4", "flavor", membership("content/type1/0")));
-        assertFalse(typeAndId.matches("host1", "flavor", membership("content/type2/0")));
-        assertFalse(typeAndId.matches("host4", "differentflavor", membership("content/type1/0")));
+        assertFalse(typeAndId.matches("anotherhost", "flavor", membership("content/type1/0/0")));
+        assertTrue(typeAndId.matches("host1", "flavor", membership("content/type1/0/0")));
+        assertTrue(typeAndId.matches("host2", "flavor", membership("content/type1/0/0")));
+        assertTrue(typeAndId.matches("host3", "flavor", membership("content/type1/0/0")));
+        assertTrue(typeAndId.matches("host4", "flavor", membership("content/type1/0/0")));
+        assertFalse(typeAndId.matches("host1", "flavor", membership("content/type2/0/0")));
+        assertFalse(typeAndId.matches("host4", "differentflavor", membership("content/type1/0/0")));
     }
 
     private Optional<ClusterMembership> membership(String membershipString) {