diff options
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java | 3 | ||||
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java index 49c72b9eea8..5f3f2e10898 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java @@ -29,6 +29,9 @@ public interface ZoneList extends ZoneFilter { /** Only the given zones — combine with not() for best effect! */ ZoneList among(ZoneId... zones); + /** Returns the ZoneApi of all zones in this list. */ + List<? extends ZoneApi> zones(); + /** Returns the id of all zones in this list as — you guessed it — a list. */ List<ZoneId> ids(); 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 e6846144192..059cf92aa52 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 @@ -4,6 +4,7 @@ package com.yahoo.vespa.hosted.controller.integration; import com.yahoo.config.provision.CloudName; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; +import com.yahoo.config.provision.zone.ZoneApi; import com.yahoo.config.provision.zone.ZoneFilter; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.config.provision.zone.ZoneList; @@ -77,6 +78,11 @@ public class ZoneFilterMock implements ZoneList { } @Override + public List<? extends ZoneApi> zones() { + throw new UnsupportedOperationException(); + } + + @Override public List<ZoneId> ids() { return Collections.unmodifiableList(zones); } |