Removed getContainer(hostname) in DockerImpl

4 files changed, 8 insertions, 16 deletions

diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java
index 663bb58cacc..f61998aba4c 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java
@@ -55,8 +55,6 @@ public interface Docker {
 
     List<Container> getAllContainersManagedBy(String manager);
 
-    Optional<Container> getContainer(String hostname);
-
     Optional<Container> getContainer(ContainerName containerName);
 
     CompletableFuture<DockerImage> pullImageAsync(DockerImage image);
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
index 1ac5f62b130..c331a6dcd5c 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
@@ -341,18 +341,12 @@ public class DockerImpl implements Docker {
     }
 
     @Override
-    public Optional<Container> getContainer(String hostname) {
-        return listAllContainers().stream()
-                .flatMap(this::asContainer)
-                .filter(c -> Objects.equals(hostname, c.hostname))
-                .findFirst();
-    }
-
-    @Override
     public Optional<Container> getContainer(ContainerName containerName) {
         return listAllContainers().stream()
+                .filter(container -> Arrays.stream(container.getNames())
+                        .map(this::decode)
+                        .anyMatch(name -> name.equals(containerName.asString())))
                 .flatMap(this::asContainer)
-                .filter(c -> Objects.equals(containerName, c.name))
                 .findFirst();
     }
 
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java
index 2aac1cff676..2c28eac5e4f 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java
@@ -91,23 +91,23 @@ public class DockerTest {
         final String containerHostname = "hostName1";
 
         docker.createContainerCommand(dockerImage, containerName, containerHostname).withManagedBy(MANAGER_NAME).create();
-        Optional<Container> container = docker.getContainer(containerHostname);
+        Optional<Container> container = docker.getContainer(containerName);
         assertTrue(container.isPresent());
         assertEquals(container.get().state, Container.State.CREATED);
 
         docker.startContainer(containerName);
-        container = docker.getContainer(containerHostname);
+        container = docker.getContainer(containerName);
         assertTrue(container.isPresent());
         assertEquals(container.get().state, Container.State.RUNNING);
 
         docker.dockerClient.pauseContainerCmd(containerName.asString()).exec();
-        container = docker.getContainer(containerHostname);
+        container = docker.getContainer(containerName);
         assertTrue(container.isPresent());
         assertEquals(container.get().state, Container.State.PAUSED);
 
         docker.dockerClient.unpauseContainerCmd(containerName.asString()).exec();
         docker.stopContainer(containerName);
-        container = docker.getContainer(containerHostname);
+        container = docker.getContainer(containerName);
         assertTrue(container.isPresent());
         assertEquals(container.get().state, Container.State.EXITED);
 
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java
index f3f8b04f5da..250baddd7f6 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java
@@ -195,7 +195,7 @@ public class RunSystemTests {
     private void startSystemTestNodeIfNeeded(ContainerName containerName) throws IOException, InterruptedException, ExecutionException {
         buildVespaSystestDockerImage(docker, vespaBaseImage);
 
-        Optional<Container> container = docker.getContainer(containerName.asString());
+        Optional<Container> container = docker.getContainer(containerName);
         if (container.isPresent()) {
             if (container.get().state.isRunning()) return;
             else docker.deleteContainer(containerName);