Rename methods, simplify arguments

4 files changed, 74 insertions, 69 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
index 3e69a5391af..c2354fa894a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
@@ -50,7 +50,7 @@ public class AclProvisioningTest {
         // Populate repo
         tester.makeReadyNodes(10, "default");
         List<Node> dockerHost = tester.makeReadyNodes(1, "default", NodeType.host);
-        tester.makeReadyDockerNodes(1, "default", dockerHost.get(0).hostname());
+        tester.makeReadyVirtualDockerNodes(1, "default", dockerHost.get(0).hostname());
         List<Node> proxyNodes = tester.makeReadyNodes(3, "default", NodeType.proxy);
 
         // Allocate 2 nodes
@@ -143,7 +143,7 @@ public class AclProvisioningTest {
         // Populate repo
         List<Node> dockerHostNodes = tester.makeReadyNodes(2, "default", NodeType.host);
         Node dockerHostNodeUnderTest = dockerHostNodes.get(0);
-        List<Node> dockerNodes = tester.makeReadyDockerNodes(5, "dockerSmall",
+        List<Node> dockerNodes = tester.makeReadyVirtualDockerNodes(5, "dockerSmall",
                                                              dockerHostNodeUnderTest.hostname());
 
         List<NodeAcl> acls = tester.nodeRepository().getNodeAcls(dockerHostNodeUnderTest, true);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
index 16aa613db4a..2550bb546d2 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
@@ -42,7 +42,7 @@ public class DockerProvisioningTest {
         ApplicationId application1 = tester.makeApplicationId();
 
         for (int i = 1; i < 10; i++)
-            tester.makeReadyDockerNodes(1, dockerFlavor, "dockerHost" + i);
+            tester.makeReadyVirtualDockerNodes(1, dockerFlavor, "dockerHost" + i);
 
         Version wantedVespaVersion = Version.fromString("6.39");
         int nodeCount = 7;
@@ -72,13 +72,13 @@ public class DockerProvisioningTest {
     public void docker_application_deployment_with_exclusive_app_first() {
         ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")));
         for (int i = 1; i <= 4; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host1");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host1");
         for (int i = 5; i <= 8; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host2");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host2");
         for (int i = 9; i <= 12; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host3");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host3");
         for (int i = 13; i <= 16; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host4");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host4");
 
         ApplicationId application1 = tester.makeApplicationId();
         prepareAndActivate(application1, 2, true, tester);
@@ -95,13 +95,13 @@ public class DockerProvisioningTest {
     public void docker_application_deployment_with_exclusive_app_last() {
         ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")));
         for (int i = 1; i <= 4; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host1");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host1");
         for (int i = 5; i <= 8; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host2");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host2");
         for (int i = 9; i <= 12; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host3");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host3");
         for (int i = 13; i <= 16; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host4");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host4");
 
         ApplicationId application1 = tester.makeApplicationId();
         prepareAndActivate(application1, 2, false, tester);
@@ -118,13 +118,13 @@ public class DockerProvisioningTest {
     public void docker_application_deployment_change_to_exclusive_and_back() {
         ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")));
         for (int i = 1; i <= 4; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host1");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host1");
         for (int i = 5; i <= 8; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host2");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host2");
         for (int i = 9; i <= 12; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host3");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host3");
         for (int i = 13; i <= 16; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host4");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host4");
 
         ApplicationId application1 = tester.makeApplicationId();
         prepareAndActivate(application1, 2, false, tester);
@@ -147,13 +147,13 @@ public class DockerProvisioningTest {
     public void docker_application_deployment_with_exclusive_app_causing_allocation_failure() {
         ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")));
         for (int i = 1; i <= 4; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host1");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host1");
         for (int i = 5; i <= 8; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host2");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host2");
         for (int i = 9; i <= 12; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host3");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host3");
         for (int i = 13; i <= 16; i++)
-            tester.makeReadyVirtualNode(i, dockerFlavor, "host4");
+            tester.makeReadyVirtualDockerNode(i, dockerFlavor, "host4");
 
         ApplicationId application1 = tester.makeApplicationId();
         prepareAndActivate(application1, 2, true, tester);
@@ -180,7 +180,7 @@ public class DockerProvisioningTest {
     public void get_specified_flavor_not_default_flavor_for_docker() {
         ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.test, RegionName.from("corp-us-east-1")));
         ApplicationId application1 = tester.makeApplicationId();
-        tester.makeReadyDockerNodes(1, dockerFlavor, "dockerHost");
+        tester.makeReadyVirtualDockerNodes(1, dockerFlavor, "dockerHost");
 
         List<HostSpec> hosts = tester.prepare(application1, ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), Version.fromString("6.42"), false), 1, 1, dockerFlavor);
         tester.activate(application1, new HashSet<>(hosts));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
index 04138dfce55..8fdaf6c9eaa 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
@@ -335,29 +335,38 @@ public class ProvisioningTester {
         return nodeRepository.setReady(nodes, Agent.system, getClass().getSimpleName());
     }
 
-    /** Creates a set of virtual docker nodes on a single docker host */
-    public List<Node> makeReadyDockerNodes(int n, String flavor, String dockerHostId) {
-        return makeReadyVirtualNodes(n, flavor, Optional.of(dockerHostId));
+    /** Creates a set of virtual docker hosts */
+    public List<Node> makeReadyVirtualDockerHosts(int n, String flavor) {
+        return makeReadyVirtualNodes(n, 1, flavor, Optional.empty(),
+                i -> "dockerHost" + i, NodeType.host);
     }
 
-    /** Creates a set of virtual nodes on a single parent host */
-    public List<Node> makeReadyVirtualNodes(int n, String flavor, Optional<String> parentHostId) {
-        return makeReadyVirtualNodes(n, 0, flavor, parentHostId, index -> UUID.randomUUID().toString());
+    /** Creates a set of virtual docker nodes on a single docker host starting with index 1 and increasing */
+    public List<Node> makeReadyVirtualDockerNodes(int n, String flavor, String dockerHostId) {
+        return makeReadyVirtualNodes(n, 1, flavor, Optional.of(dockerHostId),
+                i -> String.format("%s-%03d", dockerHostId, i), NodeType.tenant);
     }
 
-    /** Creates a set of virtual nodes on a single parent host */
-    public List<Node> makeReadyVirtualNode(int index, String flavor, String parentHostId) {
-        return makeReadyVirtualNodes(1, index, flavor, Optional.of(parentHostId), i -> String.format("node%03d", i));
+    /** Creates a single of virtual docker node on a single parent host */
+    public List<Node> makeReadyVirtualDockerNode(int index, String flavor, String dockerHostId) {
+        return makeReadyVirtualNodes(1, index, flavor, Optional.of(dockerHostId),
+                i -> String.format("%s-%03d", dockerHostId, i), NodeType.tenant);
+    }
+
+    /** Creates a set of virtual nodes without a parent host */
+    public List<Node> makeReadyVirtualNodes(int n, String flavor) {
+        return makeReadyVirtualNodes(n, 0, flavor, Optional.empty(),
+                i -> UUID.randomUUID().toString(), NodeType.tenant);
     }
 
     /** Creates a set of virtual nodes on a single parent host */
-    public List<Node> makeReadyVirtualNodes(int count, int startIndex, String flavor, Optional<String> parentHostId,
-                                     Function<Integer, String> nodeNamer) {
+    private List<Node> makeReadyVirtualNodes(int count, int startIndex, String flavor, Optional<String> parentHostId,
+                                             Function<Integer, String> nodeNamer, NodeType nodeType) {
         List<Node> nodes = new ArrayList<>(count);
         for (int i = startIndex; i < count + startIndex; i++) {
             String hostname = nodeNamer.apply(i);
             nodes.add(nodeRepository.createNode("openstack-id", hostname, parentHostId,
-                                                nodeFlavors.getFlavorOrThrow(flavor), NodeType.tenant));
+                                                nodeFlavors.getFlavorOrThrow(flavor), nodeType));
         }
         nodes = nodeRepository.addNodes(nodes);
         nodes = nodeRepository.setDirty(nodes, Agent.system, getClass().getSimpleName());
@@ -365,10 +374,6 @@ public class ProvisioningTester {
         return nodes;
     }
 
-    public List<Node> makeReadyVirtualNodes(int n, String flavor, String parentHostId) {
-        return makeReadyVirtualNodes(n, flavor, Optional.of(parentHostId));
-    }
-
     /** Returns the hosts from the input list which are not retired */
     public List<HostSpec> nonRetired(Collection<HostSpec> hosts) {
         return hosts.stream().filter(host -> ! host.membership().get().retired()).collect(Collectors.toList());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java
index c4af98dbbb6..9321d644242 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java
@@ -49,10 +49,10 @@ public class VirtualNodeProvisioningTest {
 
     @Test
     public void distinct_parent_host_for_each_node_in_a_cluster() {
-        tester.makeReadyVirtualNodes(2, flavor, "parentHost1");
-        tester.makeReadyVirtualNodes(2, flavor, "parentHost2");
-        tester.makeReadyVirtualNodes(2, flavor, "parentHost3");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost4");
+        tester.makeReadyVirtualDockerNodes(2, flavor, "parentHost1");
+        tester.makeReadyVirtualDockerNodes(2, flavor, "parentHost2");
+        tester.makeReadyVirtualDockerNodes(2, flavor, "parentHost3");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost4");
 
         final int containerNodeCount = 4;
         final int contentNodeCount = 3;
@@ -88,7 +88,7 @@ public class VirtualNodeProvisioningTest {
         // Allowed to use same parent host for several nodes in same cluster in dev
         {
             tester = new ProvisioningTester(new Zone(Environment.dev, RegionName.from("us-east")));
-            tester.makeReadyVirtualNodes(4, "default", "parentHost1");
+            tester.makeReadyVirtualDockerNodes(4, "default", "parentHost1");
 
             List<HostSpec> containerHosts = prepare(containerClusterSpec, containerNodeCount, groups);
             List<HostSpec> contentHosts = prepare(contentClusterSpec, contentNodeCount, groups);
@@ -101,7 +101,7 @@ public class VirtualNodeProvisioningTest {
         // Allowed to use same parent host for several nodes in same cluster in CD (even if prod env)
         {
             tester = new ProvisioningTester(new Zone(SystemName.cd, Environment.prod, RegionName.from("us-east")));
-            tester.makeReadyVirtualNodes(4, flavor, "parentHost1");
+            tester.makeReadyVirtualDockerNodes(4, flavor, "parentHost1");
 
             List<HostSpec> containerHosts = prepare(containerClusterSpec, containerNodeCount, groups);
             List<HostSpec> contentHosts = prepare(contentClusterSpec, contentNodeCount, groups);
@@ -113,12 +113,12 @@ public class VirtualNodeProvisioningTest {
 
     @Test
     public void will_retire_clashing_active() {
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost1");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost2");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost3");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost4");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost5");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost6");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost1");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost2");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost3");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost4");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost5");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost6");
 
         int containerNodeCount = 2;
         int contentNodeCount = 2;
@@ -146,10 +146,10 @@ public class VirtualNodeProvisioningTest {
 
     @Test
     public void fail_when_all_hosts_become_clashing() {
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost1");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost2");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost3");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost4");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost1");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost2");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost3");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost4");
 
         int containerNodeCount = 2;
         int contentNodeCount = 2;
@@ -177,8 +177,8 @@ public class VirtualNodeProvisioningTest {
 
     @Test(expected = OutOfCapacityException.class)
     public void fail_when_too_few_distinct_parent_hosts() {
-        tester.makeReadyVirtualNodes(2, flavor, "parentHost1");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost2");
+        tester.makeReadyVirtualDockerNodes(2, flavor, "parentHost1");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost2");
 
         int contentNodeCount = 3;
         List<HostSpec> hosts = prepare(contentClusterSpec, contentNodeCount, 1);
@@ -190,9 +190,9 @@ public class VirtualNodeProvisioningTest {
 
     @Test
     public void incomplete_parent_hosts_has_distinct_distribution() {
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost1");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost2");
-        tester.makeReadyVirtualNodes(1, flavor, Optional.empty());
+        tester.makeReadyVirtualDockerNode(1, flavor, "parentHost1");
+        tester.makeReadyVirtualDockerNode(1, flavor, "parentHost2");
+        tester.makeReadyVirtualNodes(1, flavor);
 
         final int contentNodeCount = 3;
         final int groups = 1;
@@ -200,15 +200,15 @@ public class VirtualNodeProvisioningTest {
         activate(contentHosts);
         assertEquals(3, getNodes(applicationId).size());
 
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost1");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost2");
+        tester.makeReadyVirtualDockerNode(2, flavor, "parentHost1");
+        tester.makeReadyVirtualDockerNode(2, flavor, "parentHost2");
 
         assertEquals(contentHosts, prepare(contentClusterSpec, contentNodeCount, groups));
     }
 
     @Test
     public void indistinct_distribution_with_known_ready_nodes() {
-        tester.makeReadyVirtualNodes(3, flavor, Optional.empty());
+        tester.makeReadyVirtualNodes(3, flavor);
 
         final int contentNodeCount = 3;
         final int groups = 1;
@@ -225,8 +225,8 @@ public class VirtualNodeProvisioningTest {
         nodes = getNodes(applicationId);
         assertEquals(3, nodes.stream().filter(n -> n.parentHostname().isPresent()).count());
 
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost1");
-        tester.makeReadyVirtualNodes(2, flavor, "parentHost2");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost1");
+        tester.makeReadyVirtualDockerNodes(2, flavor, "parentHost2");
 
         OutOfCapacityException expectedException = null;
         try {
@@ -239,7 +239,7 @@ public class VirtualNodeProvisioningTest {
 
     @Test
     public void unknown_distribution_with_known_ready_nodes() {
-        tester.makeReadyVirtualNodes(3, flavor, Optional.empty());
+        tester.makeReadyVirtualNodes(3, flavor);
 
         final int contentNodeCount = 3;
         final int groups = 1;
@@ -247,15 +247,15 @@ public class VirtualNodeProvisioningTest {
         activate(contentHosts);
         assertEquals(3, getNodes(applicationId).size());
 
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost1");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost2");
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost3");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost1");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost2");
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost3");
         assertEquals(contentHosts, prepare(contentClusterSpec, contentNodeCount, groups));
     }
 
     @Test
     public void unknown_distribution_with_known_and_unknown_ready_nodes() {
-        tester.makeReadyVirtualNodes(3, flavor, Optional.empty());
+        tester.makeReadyVirtualNodes(3, flavor);
 
         final int contentNodeCount = 3;
         final int groups = 1;
@@ -263,8 +263,8 @@ public class VirtualNodeProvisioningTest {
         activate(contentHosts);
         assertEquals(3, getNodes(applicationId).size());
 
-        tester.makeReadyVirtualNodes(1, flavor, "parentHost1");
-        tester.makeReadyVirtualNodes(1, flavor, Optional.empty());
+        tester.makeReadyVirtualDockerNodes(1, flavor, "parentHost1");
+        tester.makeReadyVirtualNodes(1, flavor);
         assertEquals(contentHosts, prepare(contentClusterSpec, contentNodeCount, groups));
     }