Fixing startContainers after removal of Kub from AS.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f0f5590d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f0f5590d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f0f5590d Branch: refs/heads/master Commit: f0f5590d28498cfc6bade328f358a6f28041bccf Parents: 1ac296f Author: Nirmal Fernando <[email protected]> Authored: Thu Dec 4 11:55:26 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Sun Dec 7 17:59:31 2014 +0530 ---------------------------------------------------------------------- .../client/CloudControllerClient.java | 45 ++++++++++---------- 1 file changed, 23 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f0f5590d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java index 8bc60fa..854e80f 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java @@ -358,26 +358,26 @@ public class CloudControllerClient { public synchronized MemberContext[] startContainers(String kubernetesClusterId, String clusterId) throws SpawningException { try { - 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); +// 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); ContainerClusterContext context = new ContainerClusterContext(); context.setClusterId(clusterId); - Properties memberContextProps = new Properties(); - Property kubernetesClusterMasterIPProps = new Property(); - kubernetesClusterMasterIPProps.setName(StratosConstants.KUBERNETES_MASTER_IP); - kubernetesClusterMasterIPProps.setValue(kubernetesMasterIP); - memberContextProps.addProperty(kubernetesClusterMasterIPProps); - Property kubernetesClusterPortRangeProps = new Property(); - kubernetesClusterPortRangeProps.setName(StratosConstants.KUBERNETES_PORT_RANGE); - kubernetesClusterPortRangeProps.setValue(portRange); - memberContextProps.addProperty(kubernetesClusterPortRangeProps); - context.setProperties(AutoscalerUtil.toStubProperties(memberContextProps)); +// Properties memberContextProps = new Properties(); +// Property kubernetesClusterMasterIPProps = new Property(); +// kubernetesClusterMasterIPProps.setName(StratosConstants.KUBERNETES_MASTER_IP); +// kubernetesClusterMasterIPProps.setValue(kubernetesMasterIP); +// memberContextProps.addProperty(kubernetesClusterMasterIPProps); +// Property kubernetesClusterPortRangeProps = new Property(); +// kubernetesClusterPortRangeProps.setName(StratosConstants.KUBERNETES_PORT_RANGE); +// kubernetesClusterPortRangeProps.setValue(portRange); +// memberContextProps.addProperty(kubernetesClusterPortRangeProps); +// context.setProperties(AutoscalerUtil.toStubProperties(memberContextProps)); long startTime = System.currentTimeMillis(); MemberContext[] memberContexts = stub.startContainers(context); @@ -394,11 +394,12 @@ public class CloudControllerClient { String msg = "Error while creating containers, couldn't communicate with cloud controller service"; log.error(msg, e); throw new SpawningException(msg, e); - } catch (NonExistingKubernetesGroupException e) { - String msg = String.format("Error while creating containers, invalid kubernetes group [%s] ", kubernetesClusterId); - log.error(msg, e); - throw new SpawningException(msg, e); - } + } +// catch (NonExistingKubernetesGroupException e) { +// String msg = String.format("Error while creating containers, invalid kubernetes group [%s] ", kubernetesClusterId); +// log.error(msg, e); +// throw new SpawningException(msg, e); +// } } public synchronized void terminateAllContainers(String clusterId) throws TerminationException {
