diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-06-08 16:01:29 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-06-08 16:01:29 +0200 |
commit | 5a3f260e4e701f8ed0cb654a8efba7c6565f10b0 (patch) | |
tree | 0303beadb30a84f5683ae39625e264f72b31a33e /controller-server | |
parent | a1cd2f4aabfa858f4b394f43891cb1e92593fb50 (diff) |
Remove ZoneId from UpgradePolicy
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java index b2c14f96a39..75144bcd880 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java @@ -7,6 +7,7 @@ import com.yahoo.config.provision.CloudName; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.RegionName; +import com.yahoo.config.provision.zone.ZoneApi; import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.vespa.hosted.controller.application.SystemApplication; @@ -70,12 +71,12 @@ public class OsVersionStatus { if (!application.isEligibleForOsUpgrades()) { continue; // Avoid querying applications that are not eligible for OS upgrades } - for (ZoneId zone : zonesToUpgrade(controller)) { - controller.configServer().nodeRepository().list(zone, application.id()).stream() + for (ZoneApi zone : zonesToUpgrade(controller)) { + controller.configServer().nodeRepository().list(zone.toDeprecatedId(), application.id()).stream() .filter(node -> OsUpgrader.eligibleForUpgrade(node, application)) - .map(node -> new Node(node.hostname(), node.currentOsVersion(), zone.environment(), zone.region())) + .map(node -> new Node(node.hostname(), node.currentOsVersion(), zone.getEnvironment(), zone.getRegionName())) .forEach(node -> { - var version = new OsVersion(node.version(), zone.cloud()); + var version = new OsVersion(node.version(), zone.getCloudName()); versions.putIfAbsent(version, new ArrayList<>()); versions.get(version).add(node); }); @@ -85,9 +86,9 @@ public class OsVersionStatus { return new OsVersionStatus(versions); } - private static List<ZoneId> zonesToUpgrade(Controller controller) { + private static List<ZoneApi> zonesToUpgrade(Controller controller) { return controller.zoneRegistry().osUpgradePolicies().stream() - .flatMap(upgradePolicy -> upgradePolicy.deprecatedAsList().stream()) + .flatMap(upgradePolicy -> upgradePolicy.asList().stream()) .flatMap(Collection::stream) .collect(Collectors.toUnmodifiableList()); } |