Repository: stratos Updated Branches: refs/heads/master f010309c7 -> bbf34f7f2
using kubernetes manager in as Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bbf34f7f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bbf34f7f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bbf34f7f Branch: refs/heads/master Commit: bbf34f7f2f6e7af47341499b616ce2f38c0b75b6 Parents: f010309 Author: R-Rajkumar <[email protected]> Authored: Fri Sep 26 22:07:01 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Fri Sep 26 22:07:01 2014 +0530 ---------------------------------------------------------------------- .../client/cloud/controller/CloudControllerClient.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/bbf34f7f/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 ec2846a..2efca75 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 @@ -31,6 +31,7 @@ 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; @@ -235,10 +236,10 @@ public class CloudControllerClient { public synchronized MemberContext createContainer(String kubernetesClusterId, String clusterId) throws SpawningException { try { - AutoScalerServiceInterface service = new AutoScalerServiceImpl(); - KubernetesMaster kubernetesMaster = service.getMasterForKubernetesGroup(kubernetesClusterId); - String kubernetesMasterIP = kubernetesMaster.getHostIpAddress(); - KubernetesGroup kubernetesGroup = service.getKubernetesGroup(kubernetesClusterId); + KubernetesManager kubernetesManager = KubernetesManager.getInstance(); + KubernetesMaster kubernetesMaster = kubernetesManager.getKubernetesMasterInGroup(kubernetesClusterId); + String kubernetesMasterIP = kubernetesMaster.getHostIpAddress(); + KubernetesGroup kubernetesGroup = kubernetesManager.getKubernetesGroup(kubernetesClusterId); int lower = kubernetesGroup.getPortRange().getLower(); int upper = kubernetesGroup.getPortRange().getUpper(); String portRange = Integer.toString(lower) + "-" + Integer.toString(upper);
