diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-08-26 13:42:45 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2019-08-27 08:38:17 +0200 |
| commit | 3b9eaf2a6281fade3b45d57f19509fb14af5ed7f (patch) | |
| tree | 43fc9160ae9573950b14a94c6215d8c7a2b95204 /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java | |
| parent | a90095e93781f96d121f7ee8e3894e2e00f7106e (diff) | |
Remove multiple-global-endpoints feature flag
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 6f8a10543e7..0d2d9ae68bd 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -279,13 +279,11 @@ public class ControllerTest { @Test public void testDnsAliasRegistration() { - ((InMemoryFlagSource) tester.controller().flagSource()).withBooleanFlag(Flags.MULTIPLE_GLOBAL_ENDPOINTS.id(), true); - Application application = tester.createApplication("app1", "tenant1", 1, 1L); ApplicationPackage applicationPackage = new ApplicationPackageBuilder() .environment(Environment.prod) - .globalServiceId("foo") + .endpoint("default", "foo") .region("us-west-1") .region("us-central-1") // Two deployments should result in each DNS alias being registered once .build(); @@ -352,8 +350,6 @@ public class ControllerTest { @Test public void testDnsAliasRegistrationWithEndpoints() { - ((InMemoryFlagSource) tester.controller().flagSource()).withBooleanFlag(Flags.MULTIPLE_GLOBAL_ENDPOINTS.id(), true); - Application application = tester.createApplication("app1", "tenant1", 1, 1L); ApplicationPackage applicationPackage = new ApplicationPackageBuilder() @@ -409,8 +405,6 @@ public class ControllerTest { @Test public void testDnsAliasRegistrationWithChangingZones() { - ((InMemoryFlagSource) tester.controller().flagSource()).withBooleanFlag(Flags.MULTIPLE_GLOBAL_ENDPOINTS.id(), true); - Application application = tester.createApplication("app1", "tenant1", 1, 1L); ApplicationPackage applicationPackage = new ApplicationPackageBuilder() @@ -457,8 +451,6 @@ public class ControllerTest { @Test public void testUnassignRotations() { - ((InMemoryFlagSource) tester.controller().flagSource()).withBooleanFlag(Flags.MULTIPLE_GLOBAL_ENDPOINTS.id(), true); - Application application = tester.createApplication("app1", "tenant1", 1, 1L); ApplicationPackage applicationPackage = new ApplicationPackageBuilder() @@ -490,16 +482,14 @@ public class ControllerTest { ); } - @Test + @Test public void testUpdatesExistingDnsAlias() { - ((InMemoryFlagSource) tester.controller().flagSource()).withBooleanFlag(Flags.MULTIPLE_GLOBAL_ENDPOINTS.id(), true); - // Application 1 is deployed and deleted { Application app1 = tester.createApplication("app1", "tenant1", 1, 1L); ApplicationPackage applicationPackage = new ApplicationPackageBuilder() .environment(Environment.prod) - .globalServiceId("foo") + .endpoint("default", "foo") .region("us-west-1") .region("us-central-1") // Two deployments should result in each DNS alias being registered once .build(); @@ -545,7 +535,7 @@ public class ControllerTest { Application app2 = tester.createApplication("app2", "tenant2", 2, 1L); ApplicationPackage applicationPackage = new ApplicationPackageBuilder() .environment(Environment.prod) - .globalServiceId("foo") + .endpoint("default", "foo") .region("us-west-1") .region("us-central-1") .build(); @@ -564,7 +554,7 @@ public class ControllerTest { Application app1 = tester.createApplication("app1", "tenant1", 1, 1L); ApplicationPackage applicationPackage = new ApplicationPackageBuilder() .environment(Environment.prod) - .globalServiceId("foo") + .endpoint("default", "foo") .region("us-west-1") .region("us-central-1") .build(); |