diff options
author | Morten Tokle <mortent@verizonmedia.com> | 2020-06-26 09:39:22 +0200 |
---|---|---|
committer | Morten Tokle <mortent@verizonmedia.com> | 2020-06-26 09:48:51 +0200 |
commit | 3aca539b25a75c405c2264c085fa8a56c84fd83e (patch) | |
tree | 52734446202b448e5cef73afce09c577468eaba3 /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java | |
parent | 21b21e029359213038ca4ffbcb17e9687a10c64b (diff) |
Support sharedl4 routing in manually deployed zones
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 | 10 |
1 files changed, 10 insertions, 0 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 95f8219b401..9e6eb9ca2e1 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 @@ -625,6 +625,8 @@ public class ControllerTest { // Create application var context = tester.newDeploymentContext(); ZoneId zone = ZoneId.from("dev", "us-east-1"); + tester.controllerTester().zoneRegistry() + .setRoutingMethod(ZoneApiMock.from(zone), RoutingMethod.shared, RoutingMethod.sharedLayer4); // Deploy tester.controller().applications().deploy(context.instanceId(), zone, Optional.of(applicationPackage), DeployOptions.none()); @@ -633,6 +635,14 @@ public class ControllerTest { assertTrue("No job status added", context.instanceJobs().isEmpty()); assertEquals("DeploymentSpec is not persisted", DeploymentSpec.empty, context.application().deploymentSpec()); + + // Verify zone supports shared layer 4 and shared routing methods + Set<RoutingMethod> routingMethods = tester.controller().routing().endpointsOf(context.deploymentIdIn(zone)) + .asList() + .stream() + .map(Endpoint::routingMethod) + .collect(Collectors.toSet()); + assertEquals(routingMethods, Set.of(RoutingMethod.shared, RoutingMethod.sharedLayer4)); } @Test |