Update tests

4 files changed, 19 insertions, 15 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
index 234841f2b6c..4d8d8e52e0e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
@@ -9,17 +9,12 @@ import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostSpec;
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.Optional;
 
-import static com.yahoo.config.provision.ClusterSpec.Type.admin;
 import static com.yahoo.config.provision.ClusterSpec.Type.container;
-import static com.yahoo.config.provision.ClusterSpec.Type.content;
 import static org.hamcrest.Matchers.endsWith;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author gjoranv
@@ -54,7 +49,8 @@ public class HostResourceTest {
     }
 
     private static ClusterSpec clusterSpec(ClusterSpec.Type type, String id) {
-        return ClusterSpec.from(type, ClusterSpec.Id.from(id), ClusterSpec.Group.from(0), Version.fromString("6.42"), false);
+        return ClusterSpec.from(type, ClusterSpec.Id.from(id), ClusterSpec.Group.from(0),
+                                Version.fromString("6.42"), false, Optional.empty());
     }
 
     private static HostResource hostResourceWithMemberships(ClusterMembership membership) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
index 90ec1779f39..5e3f337b2d7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
@@ -109,7 +109,9 @@ public class VespaModelFactoryTest {
                                     ClusterMembership.from(ClusterSpec.from(ClusterSpec.Type.admin,
                                                                             new ClusterSpec.Id(routingClusterName),
                                                                             ClusterSpec.Group.from(0),
-                                                                            Version.fromString("6.42"), false),
+                                                                            Version.fromString("6.42"),
+                                                                            false,
+                                                                            Optional.empty()),
                                                            0));
             }
 
@@ -120,7 +122,9 @@ public class VespaModelFactoryTest {
                                                               ClusterMembership.from(ClusterSpec.from(ClusterSpec.Type.container,
                                                                                                       new ClusterSpec.Id(routingClusterName),
                                                                                                       ClusterSpec.Group.from(0),
-                                                                                                      Version.fromString("6.42"), false),
+                                                                                                      Version.fromString("6.42"),
+                                                                                                      false,
+                                                                                                      Optional.empty()),
                                                                                      0)));
             }
         };
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationSimulator.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationSimulator.java
index 2c01cdde932..68c68a849b1 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationSimulator.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationSimulator.java
@@ -110,7 +110,8 @@ public class AllocationSimulator {
     }
 
     private ClusterSpec cluster() {
-        return ClusterSpec.from(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), ClusterSpec.Group.from(1), Version.fromString("6.41"), false);
+        return ClusterSpec.from(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), ClusterSpec.Group.from(1),
+                                Version.fromString("6.41"), false, Optional.empty());
     }
 
     /* ------------ Methods to add events to the system ----------------*/
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
index a0f0cd26f59..d831ab038db 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
@@ -682,8 +682,9 @@ public class ProvisioningTest {
         ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content,
                                                   ClusterSpec.Id.from("music"),
                                                   Version.fromString("1.2.3"),
-                                                  false);
-        var initalNodes = tester.activate(application, tester.prepare(application, cluster,
+                                                  false,
+                                                  Optional.empty());
+        var initialNodes = tester.activate(application, tester.prepare(application, cluster,
                                                                        Capacity.fromCount(2, defaultResources, false, false),
                                                                        1));
 
@@ -691,12 +692,13 @@ public class ProvisioningTest {
         cluster = ClusterSpec.request(ClusterSpec.Type.combined,
                                       ClusterSpec.Id.from("music"),
                                       Version.fromString("1.2.3"),
-                                      false);
+                                      false,
+                                      Optional.empty());
         var newNodes = tester.activate(application, tester.prepare(application, cluster,
                                                                    Capacity.fromCount(2, defaultResources, false, false),
                                                                    1));
 
-        assertEquals("Node allocation remains the same", initalNodes, newNodes);
+        assertEquals("Node allocation remains the same", initialNodes, newNodes);
         assertEquals("Cluster type is updated",
                      Set.of(ClusterSpec.Type.combined),
                      newNodes.stream().map(n -> n.membership().get().cluster().type()).collect(Collectors.toSet()));
@@ -705,11 +707,12 @@ public class ProvisioningTest {
         cluster = ClusterSpec.request(ClusterSpec.Type.content,
                                       ClusterSpec.Id.from("music"),
                                       Version.fromString("1.2.3"),
-                                      false);
+                                      false,
+                                      Optional.empty());
         newNodes = tester.activate(application, tester.prepare(application, cluster,
                                                                Capacity.fromCount(2, defaultResources, false, false),
                                                                1));
-        assertEquals("Node allocation remains the same", initalNodes, newNodes);
+        assertEquals("Node allocation remains the same", initialNodes, newNodes);
         assertEquals("Cluster type is updated",
                      Set.of(ClusterSpec.Type.content),
                      newNodes.stream().map(n -> n.membership().get().cluster().type()).collect(Collectors.toSet()));