Remove ZoneRegistryMock from services.xml in tests

1 files changed, 3 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java
index 64a32bce3c0..6ffdea93a1c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java
@@ -11,6 +11,7 @@ import com.yahoo.restapi.SlimeJsonResponse;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Slime;
 import com.yahoo.vespa.hosted.controller.Controller;
+import com.yahoo.vespa.hosted.controller.api.integration.ServiceRegistry;
 import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry;
 import com.yahoo.vespa.hosted.controller.auditlog.AuditLoggingRequestHandler;
 import com.yahoo.vespa.hosted.controller.proxy.ConfigServerRestExecutor;
@@ -39,10 +40,10 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler {
     private final ZoneRegistry zoneRegistry;
     private final ConfigServerRestExecutor proxy;
 
-    public ConfigServerApiHandler(Context parentCtx, ZoneRegistry zoneRegistry,
+    public ConfigServerApiHandler(Context parentCtx, ServiceRegistry serviceRegistry,
                                   ConfigServerRestExecutor proxy, Controller controller) {
         super(parentCtx, controller.auditLogger());
-        this.zoneRegistry = zoneRegistry;
+        this.zoneRegistry = serviceRegistry.zoneRegistry();
         this.proxy = proxy;
     }