diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-06-08 13:00:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-08 13:00:42 +0200 |
| commit | a4d30e8f9dba1347068d61cd457044a076b8a491 (patch) | |
| tree | 44996d839c498c15f6e2457ea76cd929182a3204 /docker-api | |
| parent | 0784e69e29cf06ea828242765da8c486c64da198 (diff) | |
| parent | c5cd0da50846decdfab54f6409c4dd6bea77a469 (diff) | |
Merge pull request #2667 from yahoo/freva/add-list-containers
Freva/add list containers
Diffstat (limited to 'docker-api')
3 files changed, 11 insertions, 1 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 d2cffda329f..1663452ec75 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 @@ -56,6 +56,8 @@ public interface Docker { List<Container> getAllContainersManagedBy(String manager); + List<ContainerName> listAllContainersManagedBy(String manager); + 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 e94a2d9d118..4e26efa97b2 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 @@ -346,6 +346,14 @@ public class DockerImpl implements Docker { } @Override + public List<ContainerName> listAllContainersManagedBy(String manager) { + return listAllContainers().stream() + .filter(container -> isManagedBy(container, manager)) + .map(container -> new ContainerName(decode(container.getNames()[0]))) + .collect(Collectors.toList()); + } + + @Override public List<Container> getAllContainersManagedBy(String manager) { return listAllContainers().stream() .filter(container -> isManagedBy(container, manager)) 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 f91fccb2cc7..b79c6eb1f1e 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 @@ -112,7 +112,7 @@ public class DockerTest { assertEquals(container.get().state, Container.State.EXITED); docker.deleteContainer(containerName); - assertThat(docker.getAllContainersManagedBy(MANAGER_NAME).isEmpty(), is(true)); + assertThat(docker.listAllContainersManagedBy(MANAGER_NAME).isEmpty(), is(true)); } /** |