Add Cloud builder

3 files changed, 31 insertions, 21 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 08e4237fe00..4bb3ffafcd8 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
@@ -298,9 +298,10 @@ public class AutoscalingTest {
         flavors.add(new Flavor("aws-large",  new NodeResources(3, 150, 100, 1, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote)));
         flavors.add(new Flavor("aws-medium", new NodeResources(3, 100, 100, 1, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote)));
         flavors.add(new Flavor("aws-small",  new NodeResources(3,  80, 100, 1, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote)));
-        AutoscalingTester tester = new AutoscalingTester(new Zone(Cloud.defaultCloud()
-                                                                       .withDynamicProvisioning(true)
-                                                                       .withAllowHostSharing(false),
+        AutoscalingTester tester = new AutoscalingTester(new Zone(Cloud.builder()
+                                                                       .dynamicProvisioning(true)
+                                                                       .allowHostSharing(false)
+                                                                       .build(),
                                                                   SystemName.main,
                                                                   Environment.prod, RegionName.from("us-east")),
                                                          flavors);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
index 2ffb103708f..507d875c69f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
@@ -150,24 +150,34 @@ public class DynamicProvisioningMaintainerTest {
         private static final NodeFlavors flavors = FlavorConfigBuilder.createDummies("default", "docker");
 
         private final ManualClock clock = new ManualClock();
-        private final Zone zone = new Zone(Cloud.defaultCloud().withDynamicProvisioning(true), SystemName.defaultSystem(),
-                                           Environment.defaultEnvironment(), RegionName.defaultName());
-        private final NodeRepository nodeRepository = new NodeRepository(flavors,
-                                                                         new HostResourcesCalculatorMock(),
-                                                                         new MockCurator(),
-                                                                         clock,
-                                                                         zone,
-                                                                         new MockNameResolver().mockAnyLookup(),
-                                                                         DockerImage.fromString("docker-image"), true);
-
-
         private final InMemoryFlagSource flagSource = new InMemoryFlagSource()
                 .withListFlag(Flags.PREPROVISION_CAPACITY.id(), List.of(), PreprovisionCapacity.class);
-        private final HostProvisionerMock hostProvisioner = new HostProvisionerMock(nodeRepository);
-        private final DynamicProvisioningMaintainer maintainer = new DynamicProvisioningMaintainer(nodeRepository,
-                                                                                                   Duration.ofDays(1),
-                                                                                                   hostProvisioner,
-                                                                                                   flagSource);
+
+        private final Zone zone;
+        private final NodeRepository nodeRepository;
+        private final HostProvisionerMock hostProvisioner;
+        private final DynamicProvisioningMaintainer maintainer;
+
+        public DynamicProvisioningTester() {
+            this(Cloud.builder().dynamicProvisioning(true).build());
+        }
+
+        public DynamicProvisioningTester(Cloud cloud) {
+            this.zone = new Zone(cloud, SystemName.defaultSystem(), Environment.defaultEnvironment(),
+                                 RegionName.defaultName());
+            this.nodeRepository = new NodeRepository(flavors,
+                                                     new HostResourcesCalculatorMock(),
+                                                     new MockCurator(),
+                                                     clock,
+                                                     zone,
+                                                     new MockNameResolver().mockAnyLookup(),
+                                                     DockerImage.fromString("docker-image"), true);
+            this.hostProvisioner = new HostProvisionerMock(nodeRepository);
+            this.maintainer = new DynamicProvisioningMaintainer(nodeRepository,
+                                                                Duration.ofDays(1),
+                                                                hostProvisioner,
+                                                                flagSource);
+        }
 
         private DynamicProvisioningTester addInitialNodes() {
             List.of(createNode("host1", Optional.empty(), NodeType.host, Node.State.active, Optional.of(tenantHostApp)),
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
index 7ef780b8b7f..cf37de07304 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
@@ -33,7 +33,6 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static com.yahoo.config.provision.NodeResources.DiskSpeed.any;
 import static com.yahoo.config.provision.NodeResources.DiskSpeed.fast;
 import static com.yahoo.config.provision.NodeResources.StorageType.local;
 import static com.yahoo.config.provision.NodeResources.StorageType.remote;
@@ -51,7 +50,7 @@ import static org.mockito.Mockito.verify;
 public class DynamicDockerProvisionTest {
 
     private static final Zone zone = new Zone(
-            Cloud.defaultCloud().withDynamicProvisioning(true).withAllowHostSharing(false),
+            Cloud.builder().dynamicProvisioning(true).allowHostSharing(false).build(),
             SystemName.main,
             Environment.prod,
             RegionName.from("us-east"));