diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2019-12-12 13:50:11 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2019-12-12 13:50:11 +0100 |
| commit | 49e5adcaf566d16aaddeb22a8dad591fa14d906b (patch) | |
| tree | 95b5e4ea8f5c849460b220aafafdff501df77c99 /controller-server | |
| parent | 23cd31ecc5553268a46735fc47a1c2dc0c7eca6d (diff) | |
Add more zones to mock zone registry
Diffstat (limited to 'controller-server')
2 files changed, 13 insertions, 13 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 a6819cc2bae..35e4b018eed 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 @@ -43,6 +43,7 @@ import java.util.Set; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; +import java.util.stream.Stream; import static com.yahoo.config.provision.SystemName.main; import static com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType.productionUsEast3; @@ -707,19 +708,14 @@ public class ControllerTest { context1.submit(applicationPackage).deploy(); var cert = certificate.apply(context1.instance()); assertTrue("Provisions certificate in " + Environment.prod, cert.isPresent()); - assertEquals(List.of( - "vznqtz7a5ygwjkbhhj7ymxvlrekgt4l6g.vespa.oath.cloud", - "app1.tenant1.global.vespa.oath.cloud", - "*.app1.tenant1.global.vespa.oath.cloud", - "app1.tenant1.us-east-3.vespa.oath.cloud", - "*.app1.tenant1.us-east-3.vespa.oath.cloud", - "app1.tenant1.us-west-1.vespa.oath.cloud", - "*.app1.tenant1.us-west-1.vespa.oath.cloud", - "app1.tenant1.us-central-1.vespa.oath.cloud", - "*.app1.tenant1.us-central-1.vespa.oath.cloud", - "app1.tenant1.eu-west-1.vespa.oath.cloud", - "*.app1.tenant1.eu-west-1.vespa.oath.cloud" - ), tester.controllerTester().serviceRegistry().applicationCertificateMock().dnsNamesOf(context1.instanceId())); + assertEquals(Stream.concat(Stream.of("vznqtz7a5ygwjkbhhj7ymxvlrekgt4l6g.vespa.oath.cloud", + "app1.tenant1.global.vespa.oath.cloud", + "*.app1.tenant1.global.vespa.oath.cloud"), + tester.controller().zoneRegistry().zones().all().ids().stream() + .flatMap(zone -> Stream.of("", "*.") + .map(prefix -> prefix + "app1.tenant1." + zone.region().value() + ".vespa.oath.cloud"))) + .collect(Collectors.toUnmodifiableList()), + tester.controllerTester().serviceRegistry().applicationCertificateMock().dnsNamesOf(context1.instanceId())); // Next deployment reuses certificate context1.submit(applicationPackage).deploy(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java index 07db06164c6..7c44bde598c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java @@ -47,6 +47,10 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry public ZoneRegistryMock(SystemName system) { this.system = system; setZones(List.of( + ZoneApiMock.fromId("prod.aws-us-east-1a"), + ZoneApiMock.fromId("prod.ap-northeast-1"), + ZoneApiMock.fromId("prod.ap-northeast-2"), + ZoneApiMock.fromId("prod.ap-southeast-1"), ZoneApiMock.fromId("prod.us-east-3"), ZoneApiMock.fromId("prod.us-west-1"), ZoneApiMock.fromId("prod.us-central-1"), |