1 files changed, 20 insertions, 13 deletions
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 33d3d3d50dc..78feba14fbf 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,6 +85,7 @@ public class Fixture {
                                 clusterSpec,
                                 cluster(),
                                 nodes(),
+                                new AllocatableResources(nodes(), tester.nodeRepository()),
                                 tester.nodeRepository().metricsDb(),
                                 tester.nodeRepository().clock());
     }
@@ -180,6 +177,7 @@ public class Fixture {
                                                                new NodeResources(100, 1000, 1000, 1, NodeResources.DiskSpeed.any)));
         HostResourcesCalculator resourceCalculator = new DynamicProvisioningTester.MockHostResourcesCalculator(zone);
         final InMemoryFlagSource flagSource = new InMemoryFlagSource();
+        boolean reversedFlavorOrder = false;
         int hostCount = 0;
 
         public Fixture.Builder zone(Zone zone) {
@@ -228,12 +226,16 @@ public class Fixture {
         public Fixture.Builder awsSetup(boolean allowHostSharing, Environment environment) {
             return this.awsHostFlavors()
                        .awsResourceCalculator()
-                       .zone(new Zone(Cloud.builder().dynamicProvisioning(true)
-                                           .allowHostSharing(allowHostSharing)
-                                           .build(),
-                                      SystemName.Public,
-                                      environment,
-                                      RegionName.from("aws-eu-west-1a")));
+                       .awsZone(allowHostSharing, environment);
+        }
+
+        public Fixture.Builder awsZone(boolean allowHostSharing, Environment environment) {
+            return zone(new Zone(Cloud.builder().dynamicProvisioning(true)
+                                       .allowHostSharing(allowHostSharing)
+                                       .build(),
+                                  SystemName.Public,
+                                  environment,
+                                  RegionName.from("aws-eu-west-1a")));
         }
 
         public Fixture.Builder vespaVersion(Version version) {
@@ -246,6 +248,11 @@ public class Fixture {
             return this;
         }
 
+        public Fixture.Builder hostFlavors(List<Flavor> hostFlavors) {
+            this.hostFlavors = hostFlavors;
+            return this;
+        }
+
         /** Adds the host resources available on AWS. */
         public Fixture.Builder awsHostFlavors() {
             this.hostFlavors = AwsNodeTypes.asFlavors();