Differentiate between reachable and controller upgraded zones

2 files changed, 11 insertions, 3 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilter.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilter.java
index d8a3fa1ce96..1cb5cd22b8d 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilter.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilter.java
@@ -17,7 +17,10 @@ public interface ZoneFilter {
     /** All zones from the initial pool. */
     ZoneList all();
 
-    /** Zones where which are managed by the controller. */
-    ZoneList controllerManaged();
+    /** Zones which are upgraded by the controller. */
+    ZoneList controllerUpgraded();
+
+    /** Zones where config servers are up and running. */
+    ZoneList reachable();
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilterMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilterMock.java
index 70e90554735..7f4637e0492 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilterMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilterMock.java
@@ -42,7 +42,12 @@ public class ZoneFilterMock implements ZoneList {
     }
 
     @Override
-    public ZoneList controllerManaged() {
+    public ZoneList controllerUpgraded() {
+        return all();
+    }
+
+    @Override
+    public ZoneList reachable() {
         return all();
     }