Avoid too much use of ZoneList.ids() now that zones() is available

4 files changed, 17 insertions, 19 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
index 3ce32347e35..887406ecba8 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
@@ -5,6 +5,7 @@ import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.TenantName;
+import com.yahoo.config.provision.zone.ZoneApi;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.test.ManualClock;
 import com.yahoo.vespa.hosted.controller.Application;
@@ -123,10 +124,10 @@ public class DeploymentTester {
 
     /** Upgrade system applications in all zones to given version */
     public void upgradeSystemApplications(Version version) {
-        for (ZoneId zone : tester.zoneRegistry().zones().all().ids()) {
+        for (ZoneApi zone : tester.zoneRegistry().zones().all().zones()) {
             for (SystemApplication application : SystemApplication.all()) {
-                tester.configServer().setVersion(application.id(), zone, version);
-                tester.configServer().convergeServices(application.id(), zone);
+                tester.configServer().setVersion(application.id(), zone.getId(), version);
+                tester.configServer().convergeServices(application.id(), zone.getId());
             }
         }
         computeVersionStatus();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java
index 57f29fb72af..00e6162d5e5 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java
@@ -82,11 +82,6 @@ public class ZoneFilterMock implements ZoneList {
     }
 
     @Override
-    public List<ZoneId> ids() {
-        return List.copyOf(zones.stream().map(ZoneApi::getId).collect(Collectors.toList()));
-    }
-
-    @Override
     public ZoneList ofCloud(CloudName cloud) {
         return filter(zone -> zone.getCloudName().equals(cloud));
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java
index ef86ffa125f..c7be543dd00 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java
@@ -6,6 +6,7 @@ import com.yahoo.application.container.handler.Request;
 import com.yahoo.application.container.handler.Response;
 import com.yahoo.component.ComponentSpecification;
 import com.yahoo.component.Version;
+import com.yahoo.config.provision.zone.ZoneApi;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.container.http.filter.FilterChainRepository;
 import com.yahoo.jdisc.http.filter.SecurityRequestFilter;
@@ -59,10 +60,10 @@ public class ContainerTester {
 
     public void upgradeSystem(Version version) {
         controller().curator().writeControllerVersion(controller().hostname(), version);
-        for (ZoneId zone : controller().zoneRegistry().zones().all().ids()) {
+        for (ZoneApi zone : controller().zoneRegistry().zones().all().zones()) {
             for (SystemApplication application : SystemApplication.all()) {
-                configServer().setVersion(application.id(), zone, version);
-                configServer().convergeServices(application.id(), zone);
+                configServer().setVersion(application.id(), zone.getId(), version);
+                configServer().convergeServices(application.id(), zone.getId());
             }
         }
         computeVersionStatus();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
index 8e3dc24193f..655c16ccceb 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
@@ -6,6 +6,7 @@ import com.yahoo.component.Version;
 import com.yahoo.component.Vtag;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostName;
+import com.yahoo.config.provision.zone.ZoneApi;
 import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
@@ -60,10 +61,10 @@ public class VersionStatusTest {
         Version version0 = Version.fromString("6.1");
         Version version1 = Version.fromString("6.5");
         // Upgrade some config servers
-        for (ZoneId zone : tester.zoneRegistry().zones().all().ids()) {
-            for (Node node : tester.configServer().nodeRepository().list(zone, SystemApplication.configServer.id())) {
-                tester.configServer().nodeRepository().putByHostname(zone, new Node(node.hostname(), node.state(), node.type(),
-                                                                                    node.owner(), version1, node.wantedVersion()));
+        for (ZoneApi zone : tester.zoneRegistry().zones().all().zones()) {
+            for (Node node : tester.configServer().nodeRepository().list(zone.getId(), SystemApplication.configServer.id())) {
+                Node upgradedNode = new Node(node.hostname(), node.state(), node.type(), node.owner(), version1, node.wantedVersion());
+                tester.configServer().nodeRepository().putByHostname(zone.getId(), upgradedNode);
                 break;
             }
         }
@@ -105,10 +106,10 @@ public class VersionStatusTest {
 
         // Downgrade one config server in each zone
         Version ancientVersion = Version.fromString("5.1");
-        for (ZoneId zone : tester.controller().zoneRegistry().zones().all().ids()) {
-            for (Node node : tester.configServer().nodeRepository().list(zone, SystemApplication.configServer.id())) {
-                tester.configServer().nodeRepository().putByHostname(zone, new Node(node.hostname(), node.state(), node.type(),
-                                                                                    node.owner(), ancientVersion, node.wantedVersion()));
+        for (ZoneApi zone : tester.controller().zoneRegistry().zones().all().zones()) {
+            for (Node node : tester.configServer().nodeRepository().list(zone.getId(), SystemApplication.configServer.id())) {
+                Node downgradedNode = new Node(node.hostname(), node.state(), node.type(), node.owner(), ancientVersion, node.wantedVersion());
+                tester.configServer().nodeRepository().putByHostname(zone.getId(), downgradedNode);
                 break;
             }
         }