commit cef77e6c5c2e8ecd3971fbb79563ec34637592cc
author David Bosschaert <davidb@apache.org> Thu May 25 17:17:12 2017 +0100
committer David Bosschaert <davidb@apache.org> Thu May 25 17:17:12 2017 +0100
tree f9038e20686e0769a0b4a02633377d751f049412
parent 3efdf07944f8539e38de8a328aee1970ec9cb6d1

Implement getActualInstanceCount for service.

containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerContainerFactory.java

diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerContainerFactory.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerContainerFactory.java
index 93b9464..11ad192 100644
--- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerContainerFactory.java
+++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerContainerFactory.java
@@ -72,6 +72,10 @@
             docker = new LocalDockerController();
     }
 
+    List<String> getDockerIDs(ServiceConfig config) {
+        return docker.ps(SERVICE_NAME + "=" + config.getServiceName());
+    }
+
     @Override
     public Service getService(ServiceConfig config) throws Exception {
         init();
@@ -155,7 +159,7 @@
     @SuppressWarnings({ "rawtypes", "unchecked" })
     private List<ContainerImpl> discoverContainers(ServiceConfig config) {
         List<ContainerImpl> res = new ArrayList<>();
-        List<String> ids = docker.ps(SERVICE_NAME + "=" + config.getServiceName());
+        List<String> ids = getDockerIDs(config);
         if (ids.size() == 0)
             return Collections.emptyList();
 

containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java

diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java
index 4577f70..76484f0 100644
--- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java
+++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java
@@ -44,7 +44,8 @@
 
     @Override
     public int getActualInstanceCount() {
-        return containers.size(); // TODO obtain live
+        return factory.getDockerIDs(config).size();
+        // TODO test
     }
 
     @Override