summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-11-04 14:41:22 +0100
committerJon Marius Venstad <venstad@gmail.com>2019-11-04 14:43:33 +0100
commit62daf7b1734f817da94668dc6a526e7fe6d9c5bb (patch)
tree2861e752951e9cdeb60b68d2ad7e4f280d8bc575 /controller-api
parentd9945779dbc13b8a03f0b0f48ef0cbee931d6ff9 (diff)
Get ZoneRegistry from ServiceRegistry, to make them the same in container tests
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java
index 578be18c4d7..3d04c239798 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java
@@ -20,6 +20,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.resource.MeteringClient
import com.yahoo.vespa.hosted.controller.api.integration.resource.TenantCost;
import com.yahoo.vespa.hosted.controller.api.integration.routing.GlobalRoutingService;
import com.yahoo.vespa.hosted.controller.api.integration.routing.RoutingGenerator;
+import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry;
import java.time.Clock;
@@ -77,4 +78,6 @@ public interface ServiceRegistry {
TenantCost tenantCost();
+ ZoneRegistry zoneRegistry();
+
}