diff options
Diffstat (limited to 'node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java')
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java | 41 |
1 files changed, 8 insertions, 33 deletions
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 49bb51c1d79..a5b60ae6e16 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 @@ -47,28 +47,28 @@ class AutoscalingTester { /** Creates an autoscaling tester with a single host type ready */ public AutoscalingTester(NodeResources hostResources) { - this(new Zone(Environment.prod, RegionName.from("us-east")), null, null, asConfig(hostResources)); - provisioningTester.makeReadyNodes(20, "hostFlavor", NodeType.host, 8); // "hostFlavor" generated by asConfig + this(new Zone(Environment.prod, RegionName.from("us-east")), List.of(new Flavor("hostFlavor", hostResources)), null); + provisioningTester.makeReadyNodes(20, "hostFlavor", NodeType.host, 8); provisioningTester.deployZoneApp(); } public AutoscalingTester(Zone zone, List<Flavor> flavors) { this(zone, flavors, - new InMemoryFlagSource().withBooleanFlag(Flags.ENABLE_DYNAMIC_PROVISIONING.id(), true), - asConfig(flavors)); + new InMemoryFlagSource().withBooleanFlag(Flags.ENABLE_DYNAMIC_PROVISIONING.id(), true)); } - private AutoscalingTester(Zone zone, List<Flavor> flavors, FlagSource flagSource, FlavorsConfig flavorsConfig) { + private AutoscalingTester(Zone zone, List<Flavor> flavors, FlagSource flagSource) { provisioningTester = new ProvisioningTester.Builder().zone(zone) - .flavorsConfig(flavorsConfig) + .flavors(flavors) + .resourcesCalculator(new MockHostResourcesCalculator(zone)) .hostProvisioner(new MockHostProvisioner(flavors)) .flagSource(flagSource) .build(); hostResourcesCalculator = new MockHostResourcesCalculator(zone); db = new NodeMetricsDb(); - autoscaler = new Autoscaler(hostResourcesCalculator, db, nodeRepository()); + autoscaler = new Autoscaler(db, nodeRepository()); } public ApplicationId applicationId(String applicationName) { @@ -196,31 +196,6 @@ class AutoscalingTester { public NodeMetricsDb nodeMetricsDb() { return db; } - private static FlavorsConfig asConfig(NodeResources hostResources) { - FlavorsConfig.Builder b = new FlavorsConfig.Builder(); - b.flavor(asFlavorConfig("hostFlavor", hostResources)); - return b.build(); - } - - private static FlavorsConfig asConfig(List<Flavor> flavors) { - FlavorsConfig.Builder b = new FlavorsConfig.Builder(); - for (Flavor flavor : flavors) - b.flavor(asFlavorConfig(flavor.name(), flavor.resources())); - return b.build(); - } - - private static FlavorsConfig.Flavor.Builder asFlavorConfig(String flavorName, NodeResources resources) { - FlavorsConfig.Flavor.Builder flavor = new FlavorsConfig.Flavor.Builder(); - flavor.name(flavorName); - flavor.minCpuCores(resources.vcpu()); - flavor.minMainMemoryAvailableGb(resources.memoryGb()); - flavor.minDiskAvailableGb(resources.diskGb()); - flavor.bandwidth(resources.bandwidthGbps() * 1000); - flavor.fastDisk(resources.diskSpeed().compatibleWith(NodeResources.DiskSpeed.fast)); - flavor.remoteStorage(resources.storageType().compatibleWith(NodeResources.StorageType.remote)); - return flavor; - } - private static class MockHostResourcesCalculator implements HostResourcesCalculator { private final Zone zone; @@ -230,7 +205,7 @@ class AutoscalingTester { } @Override - public NodeResources realResourcesOf(Node node) { + public NodeResources realResourcesOf(Node node, NodeRepository nodeRepository) { if (zone.cloud().value().equals("aws")) return node.flavor().resources().withMemoryGb(node.flavor().resources().memoryGb() - 3); else |