Merge pull request #6651 from vespa-engine/mpolden/os-upgrade-rest-api

Implement REST API for OS upgrades

1 files changed, 3 insertions, 15 deletions

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 419e532c531..e7ef3e52eb5 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,7 +9,6 @@ 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;
 
@@ -53,21 +52,10 @@ public interface ZoneRegistry {
     /** Returns the Vespa upgrade policy to use for zones in this registry */
     UpgradePolicy upgradePolicy();
 
-    /** Returns the OS upgrade policy to use for zones in this registry */
-    // TODO: Remove
-    default UpgradePolicy osUpgradePolicy() {
-        return upgradePolicy();
-    }
+    /** Returns the OS upgrade policy to use for zones belonging to given cloud, in this registry */
+    UpgradePolicy osUpgradePolicy(CloudName cloud);
 
-    // 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
-    }
+    List<UpgradePolicy> osUpgradePolicies();
 
 }