Support public systems in ControllerTester & ZoneRegistryMock

1 files changed, 18 insertions, 14 deletions

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 1d2c743ffba..222b1d4ea21 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
@@ -50,21 +50,25 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
      */
     public ZoneRegistryMock(SystemName system) {
         this.system = system;
-        this.zones = List.of(ZoneApiMock.fromId("test.us-east-1"),
-                             ZoneApiMock.fromId("staging.us-east-3"),
-                             ZoneApiMock.fromId("dev.us-east-1"),
-                             ZoneApiMock.fromId("dev.aws-us-east-2a"),
-                             ZoneApiMock.fromId("perf.us-east-3"),
-                             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"),
-                             ZoneApiMock.fromId("prod.eu-west-1"));
+        this.zones = system.isPublic() ?
+                List.of(ZoneApiMock.fromId("test.aws-us-east-1c"),
+                        ZoneApiMock.fromId("staging.aws-us-east-1c"),
+                        ZoneApiMock.fromId("prod.aws-us-east-1c")) :
+                List.of(ZoneApiMock.fromId("test.us-east-1"),
+                        ZoneApiMock.fromId("staging.us-east-3"),
+                        ZoneApiMock.fromId("dev.us-east-1"),
+                        ZoneApiMock.fromId("dev.aws-us-east-2a"),
+                        ZoneApiMock.fromId("perf.us-east-3"),
+                        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"),
+                        ZoneApiMock.fromId("prod.eu-west-1"));
         // All zones use a shared routing method by default
-        setRoutingMethod(this.zones, RoutingMethod.shared);
+        setRoutingMethod(this.zones, system.isPublic() ? RoutingMethod.exclusive : RoutingMethod.shared);
     }
 
     public ZoneRegistryMock setDeploymentTimeToLive(ZoneId zone, Duration duration) {