No functional changes only: Wrap current resources in model

1 files changed, 9 insertions, 11 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
index 3d0c1069584..5c8b07c7135 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
@@ -182,12 +182,12 @@ public class NodeRepositoryProvisioner implements Provisioner {
                                        .not().retired()
                                        .not().removable();
         boolean firstDeployment = nodes.isEmpty();
-        AllocatableClusterResources currentResources =
+        var current =
                 firstDeployment // start at min, preserve current resources otherwise
                 ? new AllocatableClusterResources(initialResourcesFrom(requested, clusterSpec, application.id()), clusterSpec, nodeRepository)
                 : new AllocatableClusterResources(nodes, nodeRepository);
-        var clusterModel = new ClusterModel(nodeRepository, application, clusterSpec, cluster, nodes, nodeRepository.metricsDb(), nodeRepository.clock());
-        return within(Limits.of(requested), currentResources, firstDeployment, clusterModel);
+        var model = new ClusterModel(nodeRepository, application, clusterSpec, cluster, nodes, current, nodeRepository.metricsDb(), nodeRepository.clock());
+        return within(Limits.of(requested), model, firstDeployment);
     }
 
     private ClusterResources initialResourcesFrom(Capacity requested, ClusterSpec clusterSpec, ApplicationId applicationId) {
@@ -197,21 +197,19 @@ public class NodeRepositoryProvisioner implements Provisioner {
 
     /** Make the minimal adjustments needed to the current resources to stay within the limits */
     private ClusterResources within(Limits limits,
-                                    AllocatableClusterResources current,
-                                    boolean firstDeployment,
-                                    ClusterModel clusterModel) {
+                                    ClusterModel model,
+                                    boolean firstDeployment) {
         if (limits.min().equals(limits.max())) return limits.min();
 
         // Don't change current deployments that are still legal
-        if (! firstDeployment && current.advertisedResources().isWithin(limits.min(), limits.max()))
-            return current.advertisedResources();
+        if (! firstDeployment && model.current().advertisedResources().isWithin(limits.min(), limits.max()))
+            return model.current().advertisedResources();
 
         // Otherwise, find an allocation that preserves the current resources as well as possible
         return allocationOptimizer.findBestAllocation(Load.one(),
-                                                      current,
-                                                      clusterModel,
+                                                      model,
                                                       limits)
-                                  .orElseThrow(() -> newNoAllocationPossible(current.clusterSpec(), limits))
+                                  .orElseThrow(() -> newNoAllocationPossible(model.current().clusterSpec(), limits))
                                   .advertisedResources();
     }