diff options
author | Håkon Hallingstad <hakon@yahooinc.com> | 2023-11-04 21:47:19 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@yahooinc.com> | 2023-11-04 21:47:19 +0100 |
commit | a0c08e57b4fabeb6cfb4b8272cd9d69308a6856e (patch) | |
tree | 172fcf3a96fd38816672ac53bbea0af5550c89d5 /node-repository/src/test | |
parent | 6e06c8d9cb0a8a05009be93f9d31005827443783 (diff) |
Rename to ClusterAllocationParams
Diffstat (limited to 'node-repository/src/test')
3 files changed, 9 insertions, 9 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java index 6fa0b4beeba..921c059f3bf 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java @@ -389,7 +389,7 @@ public class AutoscalingTest { .build(); NodeResources defaultResources = - new CapacityPolicies(fixture.tester().nodeRepository()).specifyFully(fixture.features, NodeResources.unspecified(), fixture.clusterSpec, fixture.applicationId); + new CapacityPolicies(fixture.tester().nodeRepository()).specifyFully(fixture.params, NodeResources.unspecified(), fixture.clusterSpec, fixture.applicationId); fixture.tester().assertResources("Min number of nodes and default resources", 2, 1, defaultResources, 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 c02a9221485..561cc279669 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 @@ -10,7 +10,7 @@ import com.yahoo.test.ManualClock; import com.yahoo.vespa.hosted.provision.applications.Application; import com.yahoo.vespa.hosted.provision.applications.Cluster; import com.yahoo.vespa.hosted.provision.applications.Status; -import com.yahoo.vespa.hosted.provision.provisioning.ClusterAllocationFeatures; +import com.yahoo.vespa.hosted.provision.provisioning.ClusterAllocationParams; import com.yahoo.vespa.hosted.provision.provisioning.ProvisioningTester; import org.junit.Test; @@ -90,12 +90,12 @@ public class ClusterModelTest { Cluster cluster = cluster(); application = application.with(cluster); var nodeRepository = new ProvisioningTester.Builder().build().nodeRepository(); - var features = ClusterAllocationFeatures.from(nodeRepository.flagSource(), application.id(), clusterSpec.vespaVersion()); - return new ClusterModel(features, + var params = ClusterAllocationParams.from(nodeRepository.flagSource(), application.id(), clusterSpec.vespaVersion()); + return new ClusterModel(params, nodeRepository, application.with(status), clusterSpec, cluster, - new AllocatableResources(features, clusterResources(), clusterSpec, nodeRepository), + new AllocatableResources(params, 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 33de791f3bc..c79cbb06ad9 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 @@ -26,7 +26,7 @@ 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.provisioning.ClusterAllocationFeatures; +import com.yahoo.vespa.hosted.provision.provisioning.ClusterAllocationParams; import java.time.Duration; import java.util.Arrays; @@ -40,7 +40,7 @@ import java.util.Optional; */ public class Fixture { - final ClusterAllocationFeatures features; + final ClusterAllocationParams params; final DynamicProvisioningTester tester; final ApplicationId applicationId; final ClusterSpec clusterSpec; @@ -50,7 +50,7 @@ public class Fixture { Autoscaling lastAutoscaling = Autoscaling.empty(); public Fixture(Fixture.Builder builder, Optional<ClusterResources> initialResources, int hostCount) { - features = ClusterAllocationFeatures.from(builder.flagSource, builder.application, builder.cluster.vespaVersion()); + params = ClusterAllocationParams.from(builder.flagSource, builder.application, builder.cluster.vespaVersion()); applicationId = builder.application; clusterSpec = builder.cluster; capacity = builder.capacity; @@ -83,7 +83,7 @@ public class Fixture { public Capacity capacity() { return capacity; } public ClusterModel clusterModel() { - return new ClusterModel(features, + return new ClusterModel(params, tester.nodeRepository(), application(), clusterSpec, |