Less Docker

4 files changed, 25 insertions, 35 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java
index 8d9e79218d4..761afed23cc 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java
@@ -43,12 +43,12 @@ import static org.junit.Assert.fail;
 /**
  * @author mortent
  */
-public class DynamicDockerAllocationTest {
+public class DynamicAllocationTest {
 
     /**
      * Test relocation of nodes from spare hosts.
      * <p>
-     * Setup 4 docker hosts and allocate one container on each (from two different applications)
+     * Setup 4 hosts and allocate one container on each (from two different applications)
      * getSpareCapacityProd() spares.
      * <p>
      * Check that it relocates containers away from the getSpareCapacityProd() spares
@@ -68,20 +68,20 @@ public class DynamicDockerAllocationTest {
                                                                     .build();
         tester.makeReadyNodes(4, "host-small", NodeType.host, 32);
         tester.activateTenantHosts();
-        List<Node> dockerHosts = tester.nodeRepository().nodes().list(Node.State.active).nodeType(NodeType.host).asList();
+        List<Node> hosts = tester.nodeRepository().nodes().list(Node.State.active).nodeType(NodeType.host).asList();
         NodeResources flavor = new NodeResources(1, 4, 100, 1);
 
         // Application 1
         ApplicationId application1 = makeApplicationId("t1", "a1");
         ClusterSpec clusterSpec1 = clusterSpec("myContent.t1.a1");
-        addAndAssignNode(application1, "1a", dockerHosts.get(0).hostname(), clusterSpec1, flavor, 0, tester);
-        addAndAssignNode(application1, "1b", dockerHosts.get(1).hostname(), clusterSpec1, flavor, 1, tester);
+        addAndAssignNode(application1, "1a", hosts.get(0).hostname(), clusterSpec1, flavor, 0, tester);
+        addAndAssignNode(application1, "1b", hosts.get(1).hostname(), clusterSpec1, flavor, 1, tester);
 
         // Application 2
         ApplicationId application2 = makeApplicationId("t2", "a2");
         ClusterSpec clusterSpec2 = clusterSpec("myContent.t2.a2");
-        addAndAssignNode(application2, "2a", dockerHosts.get(2).hostname(), clusterSpec2, flavor, 3, tester);
-        addAndAssignNode(application2, "2b", dockerHosts.get(3).hostname(), clusterSpec2, flavor, 4, tester);
+        addAndAssignNode(application2, "2a", hosts.get(2).hostname(), clusterSpec2, flavor, 3, tester);
+        addAndAssignNode(application2, "2b", hosts.get(3).hostname(), clusterSpec2, flavor, 4, tester);
 
         // Redeploy both applications (to be agnostic on which hosts are picked as spares)
         deployApp(application1, clusterSpec1, flavor, tester, 2);
@@ -109,7 +109,7 @@ public class DynamicDockerAllocationTest {
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).flavorsConfig(flavorsConfig()).build();
         tester.makeReadyNodes(5, "host-small", NodeType.host, 32);
         tester.activateTenantHosts();
-        NodeList dockerHosts = tester.nodeRepository().nodes().list(Node.State.active).nodeType(NodeType.host);
+        NodeList hosts = tester.nodeRepository().nodes().list(Node.State.active).nodeType(NodeType.host);
         NodeResources resources = new NodeResources(1, 4, 100, 0.3);
 
         // Application 1
@@ -137,7 +137,7 @@ public class DynamicDockerAllocationTest {
         deployApp(application3, clusterSpec3, resources, tester, 2);
 
         Map<Integer, Integer> numberOfChildrenStat = new HashMap<>();
-        for (Node host : dockerHosts) {
+        for (Node host : hosts) {
             int nofChildren = tester.nodeRepository().nodes().list().childrenOf(host).size();
             if (!numberOfChildrenStat.containsKey(nofChildren)) {
                 numberOfChildrenStat.put(nofChildren, 0);
@@ -188,7 +188,7 @@ public class DynamicDockerAllocationTest {
     /**
      * Test redeployment of nodes that violates spare headroom - but without alternatives
      * <p>
-     * Setup 2 docker hosts and allocate one app with a container on each. 2 spares
+     * Setup 2 hosts and allocate one app with a container on each. 2 spares
      * <p>
      * Initial allocation of app 1 --> final allocation:
      * <p>
@@ -201,14 +201,14 @@ public class DynamicDockerAllocationTest {
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).flavorsConfig(flavorsConfig()).build();
         tester.makeReadyNodes(2, "host-small", NodeType.host, 32);
         tester.activateTenantHosts();
-        List<Node> dockerHosts = tester.nodeRepository().nodes().list(Node.State.active).nodeType(NodeType.host).asList();
+        List<Node> hosts = tester.nodeRepository().nodes().list(Node.State.active).nodeType(NodeType.host).asList();
         NodeResources flavor = new NodeResources(1, 4, 100, 1);
 
         // Application 1
         ApplicationId application1 = makeApplicationId("t1", "a1");
         ClusterSpec clusterSpec1 = clusterSpec("myContent.t1.a1");
-        addAndAssignNode(application1, "1a", dockerHosts.get(0).hostname(), clusterSpec1, flavor, 0, tester);
-        addAndAssignNode(application1, "1b", dockerHosts.get(1).hostname(), clusterSpec1, flavor, 1, tester);
+        addAndAssignNode(application1, "1a", hosts.get(0).hostname(), clusterSpec1, flavor, 0, tester);
+        addAndAssignNode(application1, "1b", hosts.get(1).hostname(), clusterSpec1, flavor, 1, tester);
 
         // Redeploy both applications (to be agnostic on which hosts are picked as spares)
         deployApp(application1, clusterSpec1, flavor, tester, 2);
@@ -227,7 +227,7 @@ public class DynamicDockerAllocationTest {
         tester.makeReadyNodes(5, "host-small", NodeType.host, 32);
         tester.activateTenantHosts();
 
-        //Deploy an application having 6 nodes (3 nodes in 2 groups). We only have 5 docker hosts available
+        //Deploy an application having 6 nodes (3 nodes in 2 groups). We only have 5 hosts available
         ApplicationId application1 = ProvisioningTester.applicationId();
         tester.prepare(application1, clusterSpec("myContent.t1.a1"), 6, 2, new NodeResources(1, 4, 100, 1));
 
@@ -285,7 +285,7 @@ public class DynamicDockerAllocationTest {
     }
 
     @Test
-    public void cd_uses_slow_disk_nodes_for_docker_hosts() {
+    public void cd_uses_slow_disk_hosts() {
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(SystemName.cd, Environment.test, RegionName.from("us-east"))).flavorsConfig(flavorsConfig()).build();
         tester.makeReadyNodes(4, new Flavor(new NodeResources(1, 8, 120, 1, NodeResources.DiskSpeed.slow)), NodeType.host, 10, true);
         tester.activateTenantHosts();
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/DynamicProvisioningTest.java
index 029c9ffa559..6f1e2630434 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/DynamicProvisioningTest.java
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.when;
  * @author freva
  * @author bratseth
  */
-public class DynamicDockerProvisionTest {
+public class DynamicProvisioningTest {
 
     private static final Zone zone = new Zone(
             Cloud.builder().dynamicProvisioning(true).build(),
@@ -396,7 +396,7 @@ public class DynamicDockerProvisionTest {
         List<HostSpec> prepared = tester.prepare(application, clusterSpec, nodes, groups, resources);
         NodeList provisionedHosts = tester.nodeRepository().nodes().list(Node.State.provisioned).nodeType(NodeType.host);
         if (!provisionedHosts.isEmpty()) {
-            tester.nodeRepository().nodes().setReady(provisionedHosts.asList(), Agent.system, DynamicDockerProvisionTest.class.getSimpleName());
+            tester.nodeRepository().nodes().setReady(provisionedHosts.asList(), Agent.system, DynamicProvisioningTest.class.getSimpleName());
             tester.activateTenantHosts();
         }
         tester.activate(application, prepared);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningCompleteHostCalculatorTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningCompleteHostCalculatorTest.java
index 36c08ad37d9..5f2d567bd24 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningCompleteHostCalculatorTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningCompleteHostCalculatorTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
 /**
  * @author bratseth
  */
-public class DockerProvisioningCompleteHostCalculatorTest {
+public class VirtualNodeProvisioningCompleteHostCalculatorTest {
 
     @Test
     public void changing_to_different_range_preserves_allocation() {
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 01b7930ffa6..18fcb56d87f 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
@@ -235,7 +235,7 @@ public class VirtualNodeProvisioningTest {
     }
 
     @Test
-    public void docker_application_deployment() {
+    public void application_deployment() {
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
         tester.makeReadyHosts(10, resources2).activateTenantHosts();
         ApplicationId application1 = ProvisioningTester.applicationId("app1");
@@ -335,7 +335,7 @@ public class VirtualNodeProvisioningTest {
 
     /** Exclusive app first, then non-exclusive: Should give the same result as below */
     @Test
-    public void docker_application_deployment_with_exclusive_app_first() {
+    public void application_deployment_with_exclusive_app_first() {
         NodeResources hostResources = new NodeResources(10, 40, 1000, 10);
         NodeResources nodeResources = new NodeResources(1, 4, 100, 1);
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
@@ -354,7 +354,7 @@ public class VirtualNodeProvisioningTest {
 
     /** Non-exclusive app first, then an exclusive: Should give the same result as above */
     @Test
-    public void docker_application_deployment_with_exclusive_app_last() {
+    public void application_deployment_with_exclusive_app_last() {
         NodeResources hostResources = new NodeResources(10, 40, 1000, 10);
         NodeResources nodeResources = new NodeResources(1, 4, 100, 1);
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
@@ -373,21 +373,11 @@ public class VirtualNodeProvisioningTest {
 
     /** Test making an application exclusive */
     @Test
-    public void docker_application_deployment_change_to_exclusive_and_back() {
+    public void application_deployment_change_to_exclusive_and_back() {
         NodeResources hostResources = new NodeResources(10, 40, 1000, 10);
         NodeResources nodeResources = new NodeResources(1, 4, 100, 1);
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
         tester.makeReadyHosts(4, hostResources).activateTenantHosts();
-        /*
-        for (int i = 1; i <= 4; i++)
-            tester.makeReadyVirtualDockerNode(i, dockerResources, "host1");
-        for (int i = 5; i <= 8; i++)
-            tester.makeReadyVirtualDockerNode(i, dockerResources, "host2");
-        for (int i = 9; i <= 12; i++)
-            tester.makeReadyVirtualDockerNode(i, dockerResources, "host3");
-        for (int i = 13; i <= 16; i++)
-            tester.makeReadyVirtualDockerNode(i, dockerResources, "host4");
-         */
 
         ApplicationId application1 = ProvisioningTester.applicationId();
         prepareAndActivate(application1, 2, false, nodeResources, tester);
@@ -407,7 +397,7 @@ public class VirtualNodeProvisioningTest {
 
     /** Non-exclusive app first, then an exclusive: Should give the same result as above */
     @Test
-    public void docker_application_deployment_with_exclusive_app_causing_allocation_failure() {
+    public void application_deployment_with_exclusive_app_causing_allocation_failure() {
         ApplicationId application1 = ApplicationId.from("tenant1", "app1", "default");
         ApplicationId application2 = ApplicationId.from("tenant2", "app2", "default");
         ApplicationId application3 = ApplicationId.from("tenant1", "app3", "default");
@@ -444,8 +434,8 @@ public class VirtualNodeProvisioningTest {
             ProvisioningTester tester = new ProvisioningTester.Builder()
                     .zone(new Zone(Environment.prod, RegionName.from("us-east-1"))).build();
             ApplicationId application1 = ProvisioningTester.applicationId("app1");
-            tester.makeReadyChildren(1, resources2, "dockerHost1");
-            tester.makeReadyChildren(1, resources2, "dockerHost2");
+            tester.makeReadyChildren(1, resources2, "host1");
+            tester.makeReadyChildren(1, resources2, "host2");
 
             tester.prepare(application1,
                            ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent")).vespaVersion("6.42").build(),