Refactor CC client to use new CC container API.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8b5048a1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8b5048a1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8b5048a1 Branch: refs/heads/container-autoscaling Commit: 8b5048a14c999d6116bdeecaad70a8da90718d59 Parents: 67bb746 Author: Nirmal Fernando <[email protected]> Authored: Tue Oct 7 18:21:18 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Oct 8 22:21:29 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/CloudControllerClient.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/8b5048a1/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java index d554cec..296182f 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java @@ -24,17 +24,16 @@ import org.apache.commons.configuration.XMLConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.Constants; -import org.apache.stratos.autoscaler.api.AutoScalerServiceImpl; import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy; import org.apache.stratos.autoscaler.exception.NonExistingKubernetesGroupException; import org.apache.stratos.autoscaler.exception.PartitionValidationException; import org.apache.stratos.autoscaler.exception.SpawningException; import org.apache.stratos.autoscaler.exception.TerminationException; -import org.apache.stratos.autoscaler.interfaces.AutoScalerServiceInterface; import org.apache.stratos.autoscaler.kubernetes.KubernetesManager; import org.apache.stratos.autoscaler.util.ConfUtil; import org.apache.stratos.cloud.controller.stub.*; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.stub.pojo.ContainerClusterContext; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.cloud.controller.stub.pojo.Property; @@ -239,7 +238,7 @@ public class CloudControllerClient { * @return * @throws SpawningException */ - public synchronized MemberContext createContainer(String kubernetesClusterId, String clusterId) throws SpawningException { + public synchronized MemberContext[] createContainer(String kubernetesClusterId, String clusterId) throws SpawningException { try { KubernetesManager kubernetesManager = KubernetesManager.getInstance(); @@ -250,9 +249,8 @@ public class CloudControllerClient { int upper = kubernetesGroup.getPortRange().getUpper(); String portRange = Integer.toString(lower) + "-" + Integer.toString(upper); - MemberContext member = new MemberContext(); - member.setClusterId(clusterId); - member.setInitTime(System.currentTimeMillis()); + ContainerClusterContext context = new ContainerClusterContext(); + context.setClusterId(clusterId); Properties memberContextProps = new Properties(); Property kubernetesClusterMasterIPProps = new Property(); kubernetesClusterMasterIPProps.setName(StratosConstants.KUBERNETES_MASTER_IP); @@ -262,15 +260,15 @@ public class CloudControllerClient { kubernetesClusterPortRangeProps.setName(StratosConstants.KUBERNETES_PORT_RANGE); kubernetesClusterPortRangeProps.setValue(portRange); memberContextProps.addProperties(kubernetesClusterPortRangeProps); - member.setProperties(memberContextProps); + context.setProperties(memberContextProps); long startTime = System.currentTimeMillis(); - MemberContext memberContext = stub.startContainers(member); + MemberContext[] memberContexts = stub.startContainers(context); if(log.isDebugEnabled()) { long endTime = System.currentTimeMillis(); log.debug(String.format("Service call startContainer() returned in %dms", (endTime - startTime))); } - return memberContext; + return memberContexts; } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) { String message = e.getFaultMessage().getUnregisteredCartridgeException().getMessage(); log.error(message, e);
