Revert "Revert "Bjorncs/system flags handler""

1 files changed, 7 insertions, 2 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 7771dd2d1a0..32bbf3ceb9b 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
@@ -165,6 +165,11 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
     }
 
     @Override
+    public URI apiUrl() {
+        return URI.create("https://api.tld:4443/");
+    }
+
+    @Override
     public boolean hasZone(ZoneId zoneId) {
         return zones.stream().anyMatch(zone -> zone.getId().equals(zoneId));
     }
@@ -175,8 +180,8 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
     }
 
     @Override
-    public Optional<URI> getConfigServerVipUri(ZoneId zoneId) {
-        return Optional.of(URI.create(String.format("https://cfg.%s.test.vip:4443/", zoneId.value())));
+    public URI getConfigServerVipUri(ZoneId zoneId) {
+        return URI.create(String.format("https://cfg.%s.test.vip:4443/", zoneId.value()));
     }
 
     @Override