Preserve compatibility with older config models

7 files changed, 13 insertions, 9 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidator.java
index d8615c95d37..c5615924a8e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidator.java
@@ -21,7 +21,7 @@ public class AwsAccessControlValidator extends Validator {
     public void validate(VespaModel model, DeployState deployState) {
 
         if (! needsAccessControlValidation(model, deployState)) return;
-        if(! deployState.zone().cloud().requireAccessControl()) return;
+        if(! deployState.zone().getCloud().requireAccessControl()) return;
 
         List<String> offendingClusters = new ArrayList<>();
         for (var cluster : model.getContainerClusters().values()) {
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
index 260f17f1c81..5b6485de2b4 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
@@ -63,7 +63,11 @@ public class Zone {
     }
 
     /** Returns the current cloud */
-    public Cloud cloud() { return cloud; }
+    // TODO: For compatibility with older config models. Remove after June 2020
+    public CloudName cloud() { return cloud.name(); }
+
+    /** Returns the current cloud */
+    public Cloud getCloud() { return cloud; }
 
     /** Returns the current system */
     public SystemName system() { return systemName; }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
index b7863ba8b3c..436b1e49a54 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
@@ -651,7 +651,7 @@ public class NodeRepository extends AbstractComponent {
                 children.forEach(child -> requireRemovable(child, true, force));
                 db.removeNodes(children);
                 List<Node> removed = new ArrayList<>(children);
-                if (zone.cloud().dynamicProvisioning())
+                if (zone.getCloud().dynamicProvisioning())
                     db.removeNodes(List.of(node));
                 else {
                     node = node.with(IP.Config.EMPTY);
@@ -797,7 +797,7 @@ public class NodeRepository extends AbstractComponent {
         if (host.status().wantToRetire() || host.allocation().map(alloc -> alloc.membership().retired()).orElse(false))
             return false;
 
-        if (!zone.cloud().dynamicProvisioning()) return host.state() == State.active;
+        if (!zone.getCloud().dynamicProvisioning()) return host.state() == State.active;
         else return EnumSet.of(State.active, State.ready, State.provisioned).contains(host.state());
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java
index fc70ae060de..fb0fe47d150 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java
@@ -151,7 +151,7 @@ public class AllocatableClusterResources {
         NodeResources cappedNodeResources = limits.cap(resources.nodeResources());
         cappedNodeResources = new NodeResourceLimits(nodeRepository.zone()).enlargeToLegal(cappedNodeResources, clusterType);
 
-        if (nodeRepository.zone().cloud().allowHostSharing()) {
+        if (nodeRepository.zone().getCloud().allowHostSharing()) {
             // return the requested resources, or empty if they cannot fit on existing hosts
             for (Flavor flavor : nodeRepository.flavors().getFlavors()) {
                 if (flavor.resources().satisfies(cappedNodeResources))
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java
index e85af1acf26..f6cadabec54 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java
@@ -38,7 +38,7 @@ public class CapacityReportMaintainer extends NodeRepositoryMaintainer {
 
     @Override
     protected void maintain() {
-        if (nodeRepository.zone().cloud().dynamicProvisioning()) return; // Hosts and nodes are 1-1
+        if (nodeRepository.zone().getCloud().dynamicProvisioning()) return; // Hosts and nodes are 1-1
 
         CapacityChecker capacityChecker = new CapacityChecker(this.nodeRepository);
         List<Node> overcommittedHosts = capacityChecker.findOvercommittedHosts();
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
index 7ddeb936d10..e9e6fd30286 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
@@ -28,7 +28,7 @@ public class CapacityPolicies {
     public CapacityPolicies(Zone zone) {
         this.zone = zone;
         this.nodeResourceLimits = new NodeResourceLimits(zone);
-        this.isUsingAdvertisedResources = zone.cloud().dynamicProvisioning();
+        this.isUsingAdvertisedResources = zone.getCloud().dynamicProvisioning();
     }
 
     public int decideSize(int requested, Capacity capacity, ClusterSpec cluster, ApplicationId application) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
index 0e424779331..64d5a53aed8 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
@@ -206,7 +206,7 @@ class AutoscalingTester {
 
         @Override
         public NodeResources realResourcesOf(Node node, NodeRepository nodeRepository) {
-            if (zone.cloud().dynamicProvisioning())
+            if (zone.getCloud().dynamicProvisioning())
                 return node.flavor().resources().withMemoryGb(node.flavor().resources().memoryGb() - 3);
             else
                 return node.flavor().resources();
@@ -214,7 +214,7 @@ class AutoscalingTester {
 
         @Override
         public NodeResources advertisedResourcesOf(Flavor flavor) {
-            if (zone.cloud().dynamicProvisioning())
+            if (zone.getCloud().dynamicProvisioning())
                 return flavor.resources().withMemoryGb(flavor.resources().memoryGb() + 3);
             else
                 return flavor.resources();