AllocatableClusterresources -> AllocatableResources

9 files changed, 75 insertions, 81 deletions

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/AllocatableResources.java
index 69f844e5f5c..8069c9c089b 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/AllocatableResources.java
@@ -17,7 +17,7 @@ import java.util.Optional;
 /**
  * @author bratseth
  */
-public class AllocatableClusterResources {
+public class AllocatableResources {
 
     /** The node count in the cluster */
     private final int nodes;
@@ -33,9 +33,9 @@ public class AllocatableClusterResources {
     private final double fulfilment;
 
     /** Fake allocatable resources from requested capacity */
-    public AllocatableClusterResources(ClusterResources requested,
-                                       ClusterSpec clusterSpec,
-                                       NodeRepository nodeRepository) {
+    public AllocatableResources(ClusterResources requested,
+                                ClusterSpec clusterSpec,
+                                NodeRepository nodeRepository) {
         this.nodes = requested.nodes();
         this.groups = requested.groups();
         this.realResources = nodeRepository.resourcesCalculator().requestToReal(requested.nodeResources(), nodeRepository.exclusiveAllocation(clusterSpec), false);
@@ -44,7 +44,7 @@ public class AllocatableClusterResources {
         this.fulfilment = 1;
     }
 
-    public AllocatableClusterResources(NodeList nodes, NodeRepository nodeRepository) {
+    public AllocatableResources(NodeList nodes, NodeRepository nodeRepository) {
         this.nodes = nodes.size();
         this.groups = (int)nodes.stream().map(node -> node.allocation().get().membership().cluster().group()).distinct().count();
         this.realResources = averageRealResourcesOf(nodes.asList(), nodeRepository); // Average since we average metrics over nodes
@@ -53,10 +53,10 @@ public class AllocatableClusterResources {
         this.fulfilment = 1;
     }
 
-    public AllocatableClusterResources(ClusterResources realResources,
-                                       NodeResources advertisedResources,
-                                       ClusterResources idealResources,
-                                       ClusterSpec clusterSpec) {
+    public AllocatableResources(ClusterResources realResources,
+                                NodeResources advertisedResources,
+                                ClusterResources idealResources,
+                                ClusterSpec clusterSpec) {
         this.nodes = realResources.nodes();
         this.groups = realResources.groups();
         this.realResources = realResources.nodeResources();
@@ -65,12 +65,12 @@ public class AllocatableClusterResources {
         this.fulfilment = fulfilment(realResources, idealResources);
     }
 
-    private AllocatableClusterResources(int nodes,
-                                        int groups,
-                                        NodeResources realResources,
-                                        NodeResources advertisedResources,
-                                        ClusterSpec clusterSpec,
-                                        double fulfilment) {
+    private AllocatableResources(int nodes,
+                                 int groups,
+                                 NodeResources realResources,
+                                 NodeResources advertisedResources,
+                                 ClusterSpec clusterSpec,
+                                 double fulfilment) {
         this.nodes = nodes;
         this.groups = groups;
         this.realResources = realResources;
@@ -80,16 +80,16 @@ public class AllocatableClusterResources {
     }
 
     /** Returns this with the redundant node or group removed from counts. */
-    public AllocatableClusterResources withoutRedundancy() {
+    public AllocatableResources withoutRedundancy() {
         int groupSize = nodes / groups;
         int nodesAdjustedForRedundancy   = nodes > 1 ? (groups == 1 ? nodes - 1 : nodes - groupSize) : nodes;
         int groupsAdjustedForRedundancy  = nodes > 1 ? (groups == 1 ? 1 : groups - 1) : groups;
-        return new AllocatableClusterResources(nodesAdjustedForRedundancy,
-                                               groupsAdjustedForRedundancy,
-                                               realResources,
-                                               advertisedResources,
-                                               clusterSpec,
-                                               fulfilment);
+        return new AllocatableResources(nodesAdjustedForRedundancy,
+                                        groupsAdjustedForRedundancy,
+                                        realResources,
+                                        advertisedResources,
+                                        clusterSpec,
+                                        fulfilment);
     }
 
     /**
@@ -130,7 +130,7 @@ public class AllocatableClusterResources {
         return (vcpuFulfilment + memoryGbFulfilment + diskGbFulfilment) / 3;
     }
 
-    public boolean preferableTo(AllocatableClusterResources other, ClusterModel model) {
+    public boolean preferableTo(AllocatableResources other, ClusterModel model) {
         if (other.fulfilment() < 1 || this.fulfilment() < 1) // always fulfil as much as possible
             return this.fulfilment() > other.fulfilment();
 
@@ -167,13 +167,13 @@ public class AllocatableClusterResources {
                                        .withBandwidthGbps(sum.bandwidthGbps() / nodes.size());
     }
 
-    public static Optional<AllocatableClusterResources> from(ClusterResources wantedResources,
-                                                             ApplicationId applicationId,
-                                                             ClusterSpec clusterSpec,
-                                                             Limits applicationLimits,
-                                                             List<NodeResources> availableRealHostResources,
-                                                             ClusterModel model,
-                                                             NodeRepository nodeRepository) {
+    public static Optional<AllocatableResources> from(ClusterResources wantedResources,
+                                                      ApplicationId applicationId,
+                                                      ClusterSpec clusterSpec,
+                                                      Limits applicationLimits,
+                                                      List<NodeResources> availableRealHostResources,
+                                                      ClusterModel model,
+                                                      NodeRepository nodeRepository) {
         var systemLimits = nodeRepository.nodeResourceLimits();
         boolean exclusive = nodeRepository.exclusiveAllocation(clusterSpec);
         if (! exclusive) {
@@ -207,8 +207,8 @@ public class AllocatableClusterResources {
         }
         else { // Return the cheapest flavor satisfying the requested resources, if any
             NodeResources cappedWantedResources = applicationLimits.cap(wantedResources.nodeResources());
-            Optional<AllocatableClusterResources> best = Optional.empty();
-            Optional<AllocatableClusterResources> bestDisregardingDiskLimit = Optional.empty();
+            Optional<AllocatableResources> best = Optional.empty();
+            Optional<AllocatableResources> bestDisregardingDiskLimit = Optional.empty();
             for (Flavor flavor : nodeRepository.flavors().getFlavors()) {
                 // Flavor decide resources: Real resources are the worst case real resources we'll get if we ask for these advertised resources
                 NodeResources advertisedResources = nodeRepository.resourcesCalculator().advertisedResourcesOf(flavor);
@@ -230,10 +230,10 @@ public class AllocatableClusterResources {
                 if ( ! between(applicationLimits.min().nodeResources(), applicationLimits.max().nodeResources(), advertisedResources)) continue;
                 if ( ! systemLimits.isWithinRealLimits(realResources, applicationId, clusterSpec)) continue;
 
-                var candidate = new AllocatableClusterResources(wantedResources.with(realResources),
-                                                                advertisedResources,
-                                                                wantedResources,
-                                                                clusterSpec);
+                var candidate = new AllocatableResources(wantedResources.with(realResources),
+                                                         advertisedResources,
+                                                         wantedResources,
+                                                         clusterSpec);
 
                 if ( ! systemLimits.isWithinAdvertisedDiskLimits(advertisedResources, clusterSpec)) { // TODO: Remove when disk limit is enforced
                     if (bestDisregardingDiskLimit.isEmpty() || candidate.preferableTo(bestDisregardingDiskLimit.get(), model)) {
@@ -251,13 +251,13 @@ public class AllocatableClusterResources {
         }
     }
 
-    private static AllocatableClusterResources calculateAllocatableResources(ClusterResources wantedResources,
-                                                                             NodeRepository nodeRepository,
-                                                                             ApplicationId applicationId,
-                                                                             ClusterSpec clusterSpec,
-                                                                             Limits applicationLimits,
-                                                                             boolean exclusive,
-                                                                             boolean bestCase) {
+    private static AllocatableResources calculateAllocatableResources(ClusterResources wantedResources,
+                                                                      NodeRepository nodeRepository,
+                                                                      ApplicationId applicationId,
+                                                                      ClusterSpec clusterSpec,
+                                                                      Limits applicationLimits,
+                                                                      boolean exclusive,
+                                                                      boolean bestCase) {
         var systemLimits = nodeRepository.nodeResourceLimits();
         var advertisedResources = nodeRepository.resourcesCalculator().realToRequest(wantedResources.nodeResources(), exclusive, bestCase);
         advertisedResources = systemLimits.enlargeToLegal(advertisedResources, applicationId, clusterSpec, exclusive, true); // Ask for something legal
@@ -269,10 +269,10 @@ public class AllocatableClusterResources {
             advertisedResources = advertisedResources.with(NodeResources.StorageType.remote);
             realResources = nodeRepository.resourcesCalculator().requestToReal(advertisedResources, exclusive, bestCase);
         }
-        return new AllocatableClusterResources(wantedResources.with(realResources),
-                                               advertisedResources,
-                                               wantedResources,
-                                               clusterSpec);
+        return new AllocatableResources(wantedResources.with(realResources),
+                                        advertisedResources,
+                                        wantedResources,
+                                        clusterSpec);
     }
 
     /** Returns true if the given resources could be allocated on any of the given host flavors */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java
index 707abd0f4df..f650d8ec269 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java
@@ -5,9 +5,7 @@ import com.yahoo.config.provision.ClusterResources;
 import com.yahoo.config.provision.IntRange;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
-import com.yahoo.vespa.hosted.provision.provisioning.NodeResourceLimits;
 
-import java.time.Duration;
 import java.util.Optional;
 
 import static com.yahoo.vespa.hosted.provision.autoscale.Autoscaler.headroomRequiredToScaleDown;
@@ -36,16 +34,16 @@ public class AllocationOptimizer {
      * @return the best allocation, if there are any possible legal allocations, fulfilling the target
      *         fully or partially, within the limits
      */
-    public Optional<AllocatableClusterResources> findBestAllocation(Load loadAdjustment,
-                                                                    ClusterModel model,
-                                                                    Limits limits) {
+    public Optional<AllocatableResources> findBestAllocation(Load loadAdjustment,
+                                                             ClusterModel model,
+                                                             Limits limits) {
         if (limits.isEmpty())
             limits = Limits.of(new ClusterResources(minimumNodes,    1, NodeResources.unspecified()),
                                new ClusterResources(maximumNodes, maximumNodes, NodeResources.unspecified()),
                                IntRange.empty());
         else
             limits = atLeast(minimumNodes, limits).fullySpecified(model.current().clusterSpec(), nodeRepository, model.application().id());
-        Optional<AllocatableClusterResources> bestAllocation = Optional.empty();
+        Optional<AllocatableResources> bestAllocation = Optional.empty();
         var availableRealHostResources = nodeRepository.zone().cloud().dynamicProvisioning()
                                          ? nodeRepository.flavors().getFlavors().stream().map(flavor -> flavor.resources()).toList()
                                          : nodeRepository.nodes().list().hosts().stream().map(host -> host.flavor().resources())
@@ -59,13 +57,13 @@ public class AllocationOptimizer {
                                                      groups,
                                                      nodeResourcesWith(nodes, groups,
                                                                        limits, loadAdjustment, model));
-                var allocatableResources = AllocatableClusterResources.from(resources,
-                                                                            model.application().id(),
-                                                                            model.current().clusterSpec(),
-                                                                            limits,
-                                                                            availableRealHostResources,
-                                                                            model,
-                                                                            nodeRepository);
+                var allocatableResources = AllocatableResources.from(resources,
+                                                                     model.application().id(),
+                                                                     model.current().clusterSpec(),
+                                                                     limits,
+                                                                     availableRealHostResources,
+                                                                     model,
+                                                                     nodeRepository);
                 if (allocatableResources.isEmpty()) continue;
                 if (bestAllocation.isEmpty() || allocatableResources.get().preferableTo(bestAllocation.get(), model))
                     bestAllocation = allocatableResources;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
index 091c15dea69..b5f86be68f6 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
@@ -59,7 +59,7 @@ public class Autoscaler {
                                      clusterNodes.not().retired().clusterSpec(),
                                      cluster,
                                      clusterNodes,
-                                     new AllocatableClusterResources(clusterNodes.not().retired(), nodeRepository),
+                                     new AllocatableResources(clusterNodes.not().retired(), nodeRepository),
                                      nodeRepository.metricsDb(),
                                      nodeRepository.clock());
         if (model.isEmpty()) return Autoscaling.empty();
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
index 27352376be1..3eecf7bdc1b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
@@ -50,7 +50,7 @@ public class ClusterModel {
     private final Application application;
     private final ClusterSpec clusterSpec;
     private final Cluster cluster;
-    private final AllocatableClusterResources current;
+    private final AllocatableResources current;
 
     private final CpuModel cpu = new CpuModel();
     private final MemoryModel memory = new MemoryModel();
@@ -79,7 +79,7 @@ public class ClusterModel {
                         ClusterSpec clusterSpec,
                         Cluster cluster,
                         NodeList clusterNodes,
-                        AllocatableClusterResources current,
+                        AllocatableResources current,
                         MetricsDb metricsDb,
                         Clock clock) {
         this.nodeRepository = nodeRepository;
@@ -100,7 +100,7 @@ public class ClusterModel {
                  Application application,
                  ClusterSpec clusterSpec,
                  Cluster cluster,
-                 AllocatableClusterResources current,
+                 AllocatableResources current,
                  Clock clock,
                  Duration scalingDuration,
                  Duration allocationDuration,
@@ -123,7 +123,7 @@ public class ClusterModel {
 
     public Application application() { return application; }
     public ClusterSpec clusterSpec() { return clusterSpec; }
-    public AllocatableClusterResources current() { return current; }
+    public AllocatableResources current() { return current; }
     private ClusterNodesTimeseries nodeTimeseries() { return nodeTimeseries; }
     private ClusterTimeseries clusterTimeseries() { return clusterTimeseries; }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceChange.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceChange.java
index cd3a052ee49..c0cbb40d992 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceChange.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ResourceChange.java
@@ -13,10 +13,10 @@ import java.time.Duration;
  */
 public class ResourceChange {
 
-    private final AllocatableClusterResources from, to;
+    private final AllocatableResources from, to;
     private final ClusterModel model;
 
-    public ResourceChange(ClusterModel model, AllocatableClusterResources to) {
+    public ResourceChange(ClusterModel model, AllocatableResources to) {
         this.from = model.current();
         this.to = to;
         this.model = model;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
index 92f86325cf7..6a01a2bcd18 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
@@ -16,7 +16,7 @@ import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.applications.Application;
 import com.yahoo.vespa.hosted.provision.applications.Applications;
 import com.yahoo.vespa.hosted.provision.applications.Cluster;
-import com.yahoo.vespa.hosted.provision.autoscale.AllocatableClusterResources;
+import com.yahoo.vespa.hosted.provision.autoscale.AllocatableResources;
 import com.yahoo.vespa.hosted.provision.autoscale.Autoscaler;
 import com.yahoo.vespa.hosted.provision.autoscale.Autoscaling;
 import com.yahoo.vespa.hosted.provision.autoscale.NodeMetricSnapshot;
@@ -87,7 +87,7 @@ public class AutoscalingMaintainer extends NodeRepositoryMaintainer {
             NodeList clusterNodes = nodeRepository().nodes().list(Node.State.active).owner(applicationId).cluster(clusterId);
             cluster = updateCompletion(cluster, clusterNodes);
 
-            var current = new AllocatableClusterResources(clusterNodes.not().retired(), nodeRepository()).advertisedResources();
+            var current = new AllocatableResources(clusterNodes.not().retired(), nodeRepository()).advertisedResources();
 
             // Autoscale unless an autoscaling is already in progress
             Autoscaling autoscaling = null;
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 5c8b07c7135..a67a513550a 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
@@ -23,7 +23,7 @@ import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.applications.Application;
 import com.yahoo.vespa.hosted.provision.applications.Cluster;
-import com.yahoo.vespa.hosted.provision.autoscale.AllocatableClusterResources;
+import com.yahoo.vespa.hosted.provision.autoscale.AllocatableResources;
 import com.yahoo.vespa.hosted.provision.autoscale.AllocationOptimizer;
 import com.yahoo.vespa.hosted.provision.autoscale.ClusterModel;
 import com.yahoo.vespa.hosted.provision.autoscale.Limits;
@@ -184,8 +184,8 @@ public class NodeRepositoryProvisioner implements Provisioner {
         boolean firstDeployment = nodes.isEmpty();
         var current =
                 firstDeployment // start at min, preserve current resources otherwise
-                ? new AllocatableClusterResources(initialResourcesFrom(requested, clusterSpec, application.id()), clusterSpec, nodeRepository)
-                : new AllocatableClusterResources(nodes, nodeRepository);
+                ? new AllocatableResources(initialResourcesFrom(requested, clusterSpec, application.id()), clusterSpec, nodeRepository)
+                : new AllocatableResources(nodes, nodeRepository);
         var model = new ClusterModel(nodeRepository, application, clusterSpec, cluster, nodes, current, nodeRepository.metricsDb(), nodeRepository.clock());
         return within(Limits.of(requested), model, firstDeployment);
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModelTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModelTest.java
index 72b078853aa..f07d52a4a7f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModelTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModelTest.java
@@ -92,7 +92,7 @@ public class ClusterModelTest {
         return new ClusterModel(nodeRepository,
                                 application.with(status),
                                 clusterSpec, cluster,
-                                new AllocatableClusterResources(clusterResources(), clusterSpec, nodeRepository),
+                                new AllocatableResources(clusterResources(), clusterSpec, nodeRepository),
                                 clock, Duration.ofMinutes(10), Duration.ofMinutes(5),
                                 timeseries(cluster,100, queryRate, writeRate, clock),
                                 ClusterNodesTimeseries.empty());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java
index 526fdef9762..f0dfb8eab13 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java
@@ -5,17 +5,14 @@ import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Capacity;
 import com.yahoo.config.provision.Cloud;
-import com.yahoo.config.provision.ClusterInfo;
 import com.yahoo.config.provision.ClusterResources;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.Flavor;
-import com.yahoo.config.provision.NodeFlavors;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.Zone;
-import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.flags.custom.HostResources;
@@ -29,7 +26,6 @@ import com.yahoo.vespa.hosted.provision.autoscale.awsnodes.AwsHostResourcesCalcu
 import com.yahoo.vespa.hosted.provision.autoscale.awsnodes.AwsNodeTypes;
 import com.yahoo.vespa.hosted.provision.provisioning.DynamicProvisioningTester;
 import com.yahoo.vespa.hosted.provision.provisioning.HostResourcesCalculator;
-import com.yahoo.vespa.hosted.provision.testutils.MockNodeRepository;
 
 import java.time.Duration;
 import java.util.Arrays;
@@ -72,9 +68,9 @@ public class Fixture {
         return tester().nodeRepository().applications().get(applicationId).orElse(Application.empty(applicationId));
     }
 
-    public AllocatableClusterResources currentResources() {
-        return new AllocatableClusterResources(tester.nodeRepository().nodes().list(Node.State.active).owner(applicationId).cluster(clusterId()),
-                                               tester.nodeRepository());
+    public AllocatableResources currentResources() {
+        return new AllocatableResources(tester.nodeRepository().nodes().list(Node.State.active).owner(applicationId).cluster(clusterId()),
+                                        tester.nodeRepository());
     }
 
     public Cluster cluster() {
@@ -89,7 +85,7 @@ public class Fixture {
                                 clusterSpec,
                                 cluster(),
                                 nodes(),
-                                new AllocatableClusterResources(nodes(), tester.nodeRepository()),
+                                new AllocatableResources(nodes(), tester.nodeRepository()),
                                 tester.nodeRepository().metricsDb(),
                                 tester.nodeRepository().clock());
     }