diff options
| author | valerijf <valerijf@yahoo-inc.com> | 2017-06-08 12:47:51 +0200 |
|---|---|---|
| committer | valerijf <valerijf@yahoo-inc.com> | 2017-06-08 12:47:51 +0200 |
| commit | 8de3518b7b6a24437816fec1ef88cd81627dde9d (patch) | |
| tree | e10296ce09c848f7d2d5b80586fe1535b686374d /docker-api | |
| parent | ab131f2a48628dd7ed86e112819860c67e8df75b (diff) | |
Add listAllContainersManagedBy() method to DockerImpl
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)); } /** |