diff options
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/test/apps/hosted/services.xml | 4 | ||||
| -rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java | 22 |
2 files changed, 0 insertions, 26 deletions
diff --git a/configserver/src/test/apps/hosted/services.xml b/configserver/src/test/apps/hosted/services.xml index 7c2920958a2..d84718cf141 100644 --- a/configserver/src/test/apps/hosted/services.xml +++ b/configserver/src/test/apps/hosted/services.xml @@ -15,10 +15,6 @@ </http> <search/> <nodes count='1'/> - <rotations> - <rotation id='us-cluster'/> - <rotation id='eu-cluster'/> - </rotations> </container> <content id="music" version="1.0"> diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java index 805f264adf9..b363c749212 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java @@ -15,11 +15,8 @@ import com.yahoo.config.model.provision.Host; import com.yahoo.config.model.provision.Hosts; import com.yahoo.config.model.provision.InMemoryProvisioner; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; -import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.RegionName; -import com.yahoo.config.provision.RotationName; import com.yahoo.config.provision.Zone; import com.yahoo.test.ManualClock; import com.yahoo.vespa.config.server.configchange.MockRestartAction; @@ -39,7 +36,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Optional; -import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -342,24 +338,6 @@ public class HostedDeployTest { assertThat(actions.get(0).getMessages(), equalTo(ImmutableSet.of("change", "other change"))); } - @Test - public void testDeployWithClusterRotations() { - CountingModelFactory modelFactory = DeployTester.createModelFactory(Version.fromString("4.5.6"), Clock.systemUTC()); - DeployTester tester = new DeployTester(Collections.singletonList(modelFactory), createConfigserverConfig()); - ApplicationId applicationId = tester.applicationId(); - - tester.deployApp("src/test/apps/hosted/", "4.5.6", Instant.now()); - Set<HostSpec> containers = tester.getAllocatedHostsOf(applicationId).getHosts().stream() - .filter(h -> h.membership().get().cluster().type() == ClusterSpec.Type.container) - .collect(Collectors.toSet()); - assertFalse("Allocated container hosts", containers.isEmpty()); - - Set<RotationName> expected = Set.of(RotationName.from("eu-cluster"), RotationName.from("us-cluster")); - for (HostSpec container : containers) { - assertEquals(expected, container.membership().get().cluster().rotations()); - } - } - private static ConfigserverConfig createConfigserverConfig() { return new ConfigserverConfig(new ConfigserverConfig.Builder() .configServerDBDir(Files.createTempDir().getAbsolutePath()) |