Remove method from interface, only used in tests

8 files changed, 8 insertions, 15 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java
index 29f5e63719c..a0657c3d34c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.admin.nodeadmin;
 
-import com.yahoo.vespa.hosted.dockerapi.ContainerName;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
 
 import java.time.Duration;
@@ -49,11 +48,6 @@ public interface NodeAdmin {
     void stopNodeAgentServices(List<String> nodes);
 
     /**
-     * Returns list of hosts.
-     */
-    Set<ContainerName> getListOfHosts();
-
-    /**
      * Returns a map containing all relevant NodeAdmin variables and their current values.
      * Do not try to parse output or use in tests.
      */
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index 54e492fa1f4..f6e05b92310 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -154,9 +154,8 @@ public class NodeAdminImpl implements NodeAdmin {
                 .forEach(NodeAgent::stopServices);
     }
 
-    @Override
-    public Set<ContainerName> getListOfHosts() {
-        return nodeAgents.keySet();
+    public int getNumberOfNodeAgents() {
+        return nodeAgents.keySet().size();
     }
 
     @Override
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 6b49ade8d5c..ec29cf0fe25 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
@@ -31,7 +31,7 @@ public class DockerFailTest {
             dockerTester.addChildNodeRepositoryNode(nodeSpec);
 
             // Wait for node admin to be notified with node repo state and the docker container has been started
-            while (dockerTester.nodeAdmin.getListOfHosts().size() == 0) {
+            while (dockerTester.nodeAdmin.getNumberOfNodeAgents() == 0) {
                 Thread.sleep(10);
             }
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
index eb4c2c80dfd..603ad3ebccf 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
@@ -51,7 +51,7 @@ public class DockerTester implements AutoCloseable {
     final Docker dockerMock = new DockerMock(callOrderVerifier);
     final NodeRepoMock nodeRepositoryMock = new NodeRepoMock(callOrderVerifier);
     final NodeAdminStateUpdaterImpl nodeAdminStateUpdater;
-    final NodeAdmin nodeAdmin;
+    final NodeAdminImpl nodeAdmin;
     private final OrchestratorMock orchestratorMock = new OrchestratorMock(callOrderVerifier);
 
 
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 7d2faf27bc5..9c9b2afe956 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
@@ -80,7 +80,7 @@ public class MultiDockerTest {
         tester.addChildNodeRepositoryNode(nodeSpec);
 
         // Wait for node admin to be notified with node repo state and the docker container has been started
-        while (tester.nodeAdmin.getListOfHosts().size() + 1 != tester.nodeRepositoryMock.getNumberOfContainerSpecs()) {
+        while (tester.nodeAdmin.getNumberOfNodeAgents() + 1 != tester.nodeRepositoryMock.getNumberOfContainerSpecs()) {
             Thread.sleep(10);
         }
 
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 1936c619519..3681878d728 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
@@ -30,7 +30,7 @@ public class NodeStateTest {
         tester.addChildNodeRepositoryNode(initialNodeSpec);
 
         // Wait for node admin to be notified with node repo state and the docker container has been started
-        while (tester.nodeAdmin.getListOfHosts().size() == 0) {
+        while (tester.nodeAdmin.getNumberOfNodeAgents() == 0) {
             Thread.sleep(10);
         }
 
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 745582cfcd3..778443295bf 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
@@ -28,7 +28,7 @@ public class RebootTest {
             dockerTester.addChildNodeRepositoryNode(createNodeRepositoryNode());
 
             // Wait for node admin to be notified with node repo state and the docker container has been started
-            while (dockerTester.nodeAdmin.getListOfHosts().size() == 0) {
+            while (dockerTester.nodeAdmin.getNumberOfNodeAgents() == 0) {
                 Thread.sleep(10);
             }
 
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 115950d020a..0406934defc 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
@@ -23,7 +23,7 @@ public class RestartTest {
             dockerTester.addChildNodeRepositoryNode(createNodeRepositoryNode(wantedRestartGeneration, currentRestartGeneration));
 
             // Wait for node admin to be notified with node repo state and the docker container has been started
-            while (dockerTester.nodeAdmin.getListOfHosts().size() == 0) {
+            while (dockerTester.nodeAdmin.getNumberOfNodeAgents() == 0) {
                 Thread.sleep(10);
             }