Removed getContainer(hostname) in DockerImpl

3 files changed, 1 insertions, 9 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
index 856bf4338d4..1dd8381b7c4 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
@@ -55,7 +55,7 @@ public class LocalZoneUtils {
     private static final Path PROJECT_ROOT = Paths.get("").toAbsolutePath();
 
     public static void startConfigServerIfNeeded(Docker docker, Environment environment) throws UnknownHostException {
-        Optional<Container> container = docker.getContainer(CONFIG_SERVER_HOSTNAME);
+        Optional<Container> container = docker.getContainer(CONFIG_SERVER_CONTAINER_NAME);
         if (container.isPresent()) {
             if (container.get().state.isRunning()) return;
             else docker.deleteContainer(CONFIG_SERVER_CONTAINER_NAME);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java
index c371b7fe66c..6cc681bdf5f 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java
@@ -19,7 +19,6 @@ import java.net.URL;
 import java.net.UnknownHostException;
 import java.nio.file.Path;
 import java.time.Duration;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Logger;
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java
index 75c25b3b93e..8c7eda50a24 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java
@@ -97,13 +97,6 @@ public class DockerMock implements Docker {
     }
 
     @Override
-    public Optional<Container> getContainer(String hostname) {
-        synchronized (monitor) {
-            return containers.stream().filter(container -> container.hostname.equals(hostname)).findFirst();
-        }
-    }
-
-    @Override
     public Optional<Container> getContainer(ContainerName containerName) {
         synchronized (monitor) {
             return containers.stream().filter(container -> container.name.equals(containerName)).findFirst();