Non-functional changes

5 files changed, 43 insertions, 41 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
index 11a01c10f1b..6041c95b565 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
@@ -32,14 +32,13 @@ public class DockerFailTest {
                 Thread.sleep(10);
             }
 
-            CallOrderVerifier callOrderVerifier = dockerTester.getCallOrderVerifier();
-            callOrderVerifier.assertInOrder(
+            dockerTester.callOrderVerifier.assertInOrder(
                     "createContainerCommand with DockerImage { imageId=dockerImage }, HostName: host1.test.yahoo.com, ContainerName { name=host1 }",
                     "executeInContainerAsRoot with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", resume]");
 
-            dockerTester.deleteContainer(new ContainerName("host1"));
+            dockerTester.dockerMock.deleteContainer(new ContainerName("host1"));
 
-            callOrderVerifier.assertInOrder(
+            dockerTester.callOrderVerifier.assertInOrder(
                     "deleteContainer with ContainerName { name=host1 }",
                     "createContainerCommand with DockerImage { imageId=dockerImage }, HostName: host1.test.yahoo.com, ContainerName { name=host1 }",
                     "executeInContainerAsRoot with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", resume]");
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
index c06febe3f17..3d2d75c8edf 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
@@ -22,21 +22,20 @@ public class MultiDockerTest {
             ContainerNodeSpec containerNodeSpec2 = addAndWaitForNode(
                     dockerTester, "host2.test.yahoo.com", new DockerImage("image2"));
 
-            dockerTester.updateContainerNodeSpec(
+            dockerTester.addContainerNodeSpec(
                     new ContainerNodeSpec.Builder(containerNodeSpec2)
                             .nodeState(Node.State.dirty)
                             .build());
 
             // Wait until it is marked ready
-            while (dockerTester.getContainerNodeSpec(containerNodeSpec2.hostname)
+            while (dockerTester.nodeRepositoryMock.getContainerNodeSpec(containerNodeSpec2.hostname)
                     .filter(nodeSpec -> nodeSpec.nodeState != Node.State.ready).isPresent()) {
                 Thread.sleep(10);
             }
 
             addAndWaitForNode(dockerTester, "host3.test.yahoo.com", new DockerImage("image1"));
 
-            CallOrderVerifier callOrderVerifier = dockerTester.getCallOrderVerifier();
-            callOrderVerifier.assertInOrder(
+            dockerTester.callOrderVerifier.assertInOrder(
                     "createContainerCommand with DockerImage { imageId=image1 }, HostName: host1.test.yahoo.com, ContainerName { name=host1 }",
                     "executeInContainerAsRoot with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", resume]",
 
@@ -49,11 +48,12 @@ public class MultiDockerTest {
                     "createContainerCommand with DockerImage { imageId=image1 }, HostName: host3.test.yahoo.com, ContainerName { name=host3 }",
                     "executeInContainerAsRoot with ContainerName { name=host3 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", resume]");
 
-            callOrderVerifier.assertInOrderWithAssertMessage("Maintainer did not receive call to delete application storage",
-                                                             "deleteContainer with ContainerName { name=host2 }",
-                                                             "DeleteContainerStorage with ContainerName { name=host2 }");
+            dockerTester.callOrderVerifier.assertInOrderWithAssertMessage(
+                    "Maintainer did not receive call to delete application storage",
+                    "deleteContainer with ContainerName { name=host2 }",
+                     "DeleteContainerStorage with ContainerName { name=host2 }");
 
-            callOrderVerifier.assertInOrder(
+            dockerTester.callOrderVerifier.assertInOrder(
                     "updateNodeAttributes with HostName: host1.test.yahoo.com, NodeAttributes{restartGeneration=1, rebootGeneration=0, dockerImage=image1, vespaVersion='1.2.3'}",
                     "updateNodeAttributes with HostName: host2.test.yahoo.com, NodeAttributes{restartGeneration=1, rebootGeneration=0, dockerImage=image2, vespaVersion='1.2.3'}",
                     "markNodeAvailableForNewAllocation with HostName: host2.test.yahoo.com",
@@ -76,12 +76,12 @@ public class MultiDockerTest {
         tester.addContainerNodeSpec(containerNodeSpec);
 
         // Wait for node admin to be notified with node repo state and the docker container has been started
-        while (tester.getNodeAdmin().getListOfHosts().size() != tester.getNumberOfContainerSpecs()) {
+        while (tester.getNodeAdmin().getListOfHosts().size() != tester.nodeRepositoryMock.getNumberOfContainerSpecs()) {
             Thread.sleep(10);
         }
 
         ContainerName containerName = ContainerName.fromHostname(hostName);
-        tester.getCallOrderVerifier().assertInOrder(
+        tester.callOrderVerifier.assertInOrder(
                 "createContainerCommand with " + dockerImage + ", HostName: " + hostName + ", " + containerName,
                 "executeInContainerAsRoot with " + containerName + ", args: [" + DockerOperationsImpl.NODE_PROGRAM + ", resume]");
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
index 187bfa22195..8774fef576b 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
@@ -33,7 +33,7 @@ public class NodeStateTest {
             Thread.sleep(10);
         }
 
-        tester.getCallOrderVerifier().assertInOrder(
+        tester.callOrderVerifier.assertInOrder(
                 "createContainerCommand with DockerImage { imageId=dockerImage }, HostName: host1.test.yahoo.com, ContainerName { name=host1 }",
                 "executeInContainerAsRoot with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", resume]");
     }
@@ -44,20 +44,20 @@ public class NodeStateTest {
         try (DockerTester dockerTester = new DockerTester()) {
             setup(dockerTester);
             // Change node state to dirty
-            dockerTester.updateContainerNodeSpec(new ContainerNodeSpec.Builder(initialContainerNodeSpec)
+            dockerTester.addContainerNodeSpec(new ContainerNodeSpec.Builder(initialContainerNodeSpec)
                     .nodeState(Node.State.dirty)
                     .build());
 
             // Wait until it is marked ready
-            while (dockerTester.getContainerNodeSpec(initialContainerNodeSpec.hostname)
+            while (dockerTester.nodeRepositoryMock.getContainerNodeSpec(initialContainerNodeSpec.hostname)
                     .filter(nodeSpec -> nodeSpec.nodeState != Node.State.ready).isPresent()) {
                 Thread.sleep(10);
             }
 
-            dockerTester.getCallOrderVerifier()
-                        .assertInOrder("executeInContainerAsRoot with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", stop]",
-                                       "stopContainer with ContainerName { name=host1 }",
-                                       "deleteContainer with ContainerName { name=host1 }");
+            dockerTester.callOrderVerifier.assertInOrder(
+                    "executeInContainerAsRoot with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", stop]",
+                    "stopContainer with ContainerName { name=host1 }",
+                    "deleteContainer with ContainerName { name=host1 }");
         }
     }
 
@@ -70,28 +70,29 @@ public class NodeStateTest {
             DockerImage newDockerImage = new DockerImage("newDockerImage");
 
             // Change node state to inactive and change the wanted docker image
-            dockerTester.updateContainerNodeSpec(new ContainerNodeSpec.Builder(initialContainerNodeSpec)
+            dockerTester.addContainerNodeSpec(new ContainerNodeSpec.Builder(initialContainerNodeSpec)
                     .wantedDockerImage(newDockerImage)
                     .nodeState(Node.State.inactive)
                     .build());
 
-            CallOrderVerifier callOrderVerifier = dockerTester.getCallOrderVerifier();
-            callOrderVerifier.assertInOrderWithAssertMessage("Node set to inactive, but no stop/delete call received",
-                                                             "stopContainer with ContainerName { name=host1 }",
-                                                             "deleteContainer with ContainerName { name=host1 }");
+            dockerTester.callOrderVerifier.assertInOrderWithAssertMessage(
+                    "Node set to inactive, but no stop/delete call received",
+                    "stopContainer with ContainerName { name=host1 }",
+                    "deleteContainer with ContainerName { name=host1 }");
 
 
             // Change node state to active
-            dockerTester.updateContainerNodeSpec(new ContainerNodeSpec.Builder(initialContainerNodeSpec)
+            dockerTester.addContainerNodeSpec(new ContainerNodeSpec.Builder(initialContainerNodeSpec)
                     .wantedDockerImage(newDockerImage)
                     .nodeState(Node.State.active)
                     .build());
 
             // Check that the container is started again after the delete call
-            callOrderVerifier.assertInOrderWithAssertMessage("Node not started again after being put to active state",
-                                                             "deleteContainer with ContainerName { name=host1 }",
-                                                             "createContainerCommand with DockerImage { imageId=newDockerImage }, HostName: host1.test.yahoo.com, ContainerName { name=host1 }",
-                                                             "executeInContainerAsRoot with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", resume]");
+            dockerTester.callOrderVerifier.assertInOrderWithAssertMessage(
+                    "Node not started again after being put to active state",
+                    "deleteContainer with ContainerName { name=host1 }",
+                    "createContainerCommand with DockerImage { imageId=newDockerImage }, HostName: host1.test.yahoo.com, ContainerName { name=host1 }",
+                    "executeInContainerAsRoot with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", resume]");
         }
     }
 }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
index 31145fdc6a0..04f8d226d57 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
@@ -36,10 +36,10 @@ public class RebootTest {
                 Thread.sleep(10);
             }
 
-            CallOrderVerifier callOrderVerifier = dockerTester.getCallOrderVerifier();
             // Check that the container is started and NodeRepo has received the PATCH update
-            callOrderVerifier.assertInOrder("createContainerCommand with DockerImage { imageId=dockerImage }, HostName: host1.test.yahoo.com, ContainerName { name=host1 }",
-                                            "updateNodeAttributes with HostName: host1.test.yahoo.com, NodeAttributes{restartGeneration=1, rebootGeneration=null,  dockerImage=dockerImage, vespaVersion='null'}");
+            dockerTester.callOrderVerifier.assertInOrder(
+                    "createContainerCommand with DockerImage { imageId=dockerImage }, HostName: host1.test.yahoo.com, ContainerName { name=host1 }",
+                    "updateNodeAttributes with HostName: host1.test.yahoo.com, NodeAttributes{restartGeneration=1, rebootGeneration=null,  dockerImage=dockerImage, vespaVersion='null'}");
 
             NodeAdminStateUpdater updater = dockerTester.getNodeAdminStateUpdater();
             assertThat(updater.setResumeStateAndCheckIfResumed(NodeAdminStateUpdater.State.SUSPENDED),
@@ -56,7 +56,8 @@ public class RebootTest {
 
             assertTrue(nodeAdmin.setFrozen(false));
 
-            callOrderVerifier.assertInOrder("executeInContainer with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", stop]");
+            dockerTester.callOrderVerifier.assertInOrder(
+                    "executeInContainer with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", stop]");
         }
     }
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
index a0024fae3dc..10028e6862c 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
@@ -29,17 +29,18 @@ public class RestartTest {
                 Thread.sleep(10);
             }
 
-            CallOrderVerifier callOrderVerifier = dockerTester.getCallOrderVerifier();
             // Check that the container is started and NodeRepo has received the PATCH update
-            callOrderVerifier.assertInOrder("createContainerCommand with DockerImage { imageId=image:1.2.3 }, HostName: host1.test.yahoo.com, ContainerName { name=host1 }",
-                                            "updateNodeAttributes with HostName: host1.test.yahoo.com, NodeAttributes{restartGeneration=1, rebootGeneration=0, dockerImage=image:1.2.3, vespaVersion='1.2.3'}");
+            dockerTester.callOrderVerifier.assertInOrder(
+                    "createContainerCommand with DockerImage { imageId=image:1.2.3 }, HostName: host1.test.yahoo.com, ContainerName { name=host1 }",
+                    "updateNodeAttributes with HostName: host1.test.yahoo.com, NodeAttributes{restartGeneration=1, rebootGeneration=0, dockerImage=image:1.2.3, vespaVersion='1.2.3'}");
 
             wantedRestartGeneration = 2;
             currentRestartGeneration = 1;
-            dockerTester.updateContainerNodeSpec(createContainerNodeSpec(wantedRestartGeneration, currentRestartGeneration));
+            dockerTester.addContainerNodeSpec(createContainerNodeSpec(wantedRestartGeneration, currentRestartGeneration));
 
-            callOrderVerifier.assertInOrder("Suspend for host1.test.yahoo.com",
-                                            "executeInContainerAsRoot with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", restart-vespa]");
+            dockerTester.callOrderVerifier.assertInOrder(
+                    "Suspend for host1.test.yahoo.com",
+                    "executeInContainerAsRoot with ContainerName { name=host1 }, args: [" + DockerOperationsImpl.NODE_PROGRAM + ", restart-vespa]");
         }
     }