Remove cloud from ZoneId.equals

Region and environment pairs are unique across clouds.

2 files changed, 9 insertions, 3 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneId.java
index 91cf478d1cc..1b13d9a5760 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneId.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneId.java
@@ -80,13 +80,12 @@ public class ZoneId {
         if (o == null || getClass() != o.getClass()) return false;
         ZoneId zoneId = (ZoneId) o;
         return environment == zoneId.environment &&
-               Objects.equals(region, zoneId.region) &&
-               Objects.equals(cloud, zoneId.cloud);
+               Objects.equals(region, zoneId.region);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(environment, region, cloud);
+        return Objects.hash(environment, region);
     }
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
index 4fbad88df8d..419e532c531 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
@@ -9,6 +9,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 
 import java.net.URI;
 import java.time.Duration;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -58,6 +59,12 @@ public interface ZoneRegistry {
         return upgradePolicy();
     }
 
+    // TODO: Remove default implementation
+    /** Returns all OS upgrade policies */
+    default List<UpgradePolicy> osUpgradePolicies() {
+        return Collections.singletonList(upgradePolicy());
+    }
+
     /** Returns the OS upgrade policy to use for zones belonging to given cloud, in this registry */
     default UpgradePolicy osUpgradePolicy(CloudName cloud) {
         return osUpgradePolicy(); // TODO: Remove default implementation