Refactor terminateAllKubernetesUnits to terminateAllContainers
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/69ed6ec2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/69ed6ec2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/69ed6ec2 Branch: refs/heads/master Commit: 69ed6ec229025eedd2e3a2de175c4aa1aa37123b Parents: 12ed2dc Author: Nirmal Fernando <[email protected]> Authored: Wed Sep 24 17:26:15 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Sep 24 19:31:11 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/impl/CloudControllerServiceImpl.java | 4 ++-- .../cloud/controller/interfaces/CloudControllerService.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/69ed6ec2/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 0cbbcd7..7b4e221 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -1174,7 +1174,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { // terminate all kubernetes units try { - terminateAllKubernetesUnits(clusterId); + terminateAllContainers(clusterId); } catch (InvalidClusterException e) { String msg = "Docker instance termination fails for cluster: "+clusterId; log.error(msg, e); @@ -1490,7 +1490,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public void terminateAllKubernetesUnits(String clusterId) + public void terminateAllContainers(String clusterId) throws InvalidClusterException { ClusterContext ctxt = dataHolder.getClusterContext(clusterId); http://git-wip-us.apache.org/repos/asf/stratos/blob/69ed6ec2/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java index caef034..e966c74 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java @@ -130,11 +130,11 @@ public interface CloudControllerService { public void terminateAllInstances(String clusterId) throws InvalidClusterException; /** - * Terminate all Kubernetes units created for the given cluster. - * @param clusterId + * Terminate all containers of the given cluster. + * @param clusterId id of the subjected cluster. * @throws InvalidClusterException */ - public void terminateAllKubernetesUnits(String clusterId) throws InvalidClusterException; + public void terminateAllContainers(String clusterId) throws InvalidClusterException; /** * Unregister a docker service identified by the given cluster id.
