Simplify method names

5 files changed, 9 insertions, 13 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java
index c1867db4f78..c6fade91de3 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java
@@ -34,19 +34,15 @@ public interface DockerOperations {
     /** Resume node. Resuming a node means that it is ready to take on traffic. */
     void resumeNode(ContainerName containerName);
 
-    void restartVespaOnNode(ContainerName containerName);
-
-    void stopServicesOnNode(ContainerName containerName);
-
     /**
      * Suspend node. Suspending a node means the node should be taken temporarly offline,
      * such that maintenance of the node can be done (upgrading, rebooting, etc).
      */
     void suspendNode(ContainerName containerName);
 
-    void restartVespaOnNode(ContainerName containerName);
+    void restartVespa(ContainerName containerName);
 
-    void stopServicesOnNode(ContainerName containerName);
+    void stopServices(ContainerName containerName);
 
     Optional<ContainerStats> getContainerStats(ContainerName containerName);
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
index e0e477b3af8..2811dff0c1b 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
@@ -296,12 +296,12 @@ public class DockerOperationsImpl implements DockerOperations {
     }
 
     @Override
-    public void restartVespaOnNode(ContainerName containerName) {
+    public void restartVespa(ContainerName containerName) {
         executeCommandInContainer(containerName, nodeProgram, "restart-vespa");
     }
 
     @Override
-    public void stopServicesOnNode(ContainerName containerName) {
+    public void stopServices(ContainerName containerName) {
         executeCommandInContainer(containerName, nodeProgram, "stop");
     }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 4358e336f66..fad2d3f7001 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -293,7 +293,7 @@ public class NodeAgentImpl implements NodeAgent {
             logger.info("Restarting services");
             // Since we are restarting the services we need to suspend the node.
             orchestratorSuspendNode();
-            dockerOperations.restartVespaOnNode(containerName);
+            dockerOperations.restartVespa(containerName);
         }
     }
 
@@ -302,7 +302,7 @@ public class NodeAgentImpl implements NodeAgent {
         logger.info("Stopping services");
         if (containerState == ABSENT) return;
         try {
-            dockerOperations.stopServicesOnNode(containerName);
+            dockerOperations.stopServices(containerName);
         } catch (ContainerNotFoundException e) {
             containerState = ABSENT;
         }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RunInContainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RunInContainerTest.java
index b5b51516e3f..a46defc991b 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RunInContainerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RunInContainerTest.java
@@ -196,7 +196,7 @@ public class RunInContainerTest {
         doNothing().when(dockerOperationsMock)
                 .suspendNode(eq(new ContainerName("host1")));
         doNothing().when(dockerOperationsMock)
-                .stopServicesOnNode(eq(new ContainerName("host1")));
+                .stopServices(eq(new ContainerName("host1")));
 
         assertTrue(verifyWithRetries("suspend", false));
         assertTrue(verifyWithRetries("suspend", true));
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
index 28a2b8ff5e0..9a239e5439e 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
@@ -426,8 +426,8 @@ public class NodeAgentImplTest {
 
         verify(dockerOperations, never()).createContainer(eq(containerName), any(), any());
         verify(dockerOperations, never()).startContainer(eq(containerName));
-        verify(dockerOperations, never()).trySuspendNode(eq(containerName));
-        verify(dockerOperations, times(1)).stopServicesOnNode(eq(containerName));
+        verify(dockerOperations, never()).suspendNode(eq(containerName));
+        verify(dockerOperations, times(1)).stopServices(eq(containerName));
         verify(orchestrator, never()).resume(any(String.class));
         verify(orchestrator, never()).suspend(any(String.class));
         // current Docker image and vespa version should be cleared