Updating the commented out code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d66bf8d5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d66bf8d5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d66bf8d5 Branch: refs/heads/master Commit: d66bf8d52fbe9845a2d368eb8abe87c527cc3f00 Parents: cda0465 Author: Lahiru Sandaruwan <[email protected]> Authored: Mon Dec 1 00:54:27 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Mon Dec 1 00:54:27 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/api/AutoScalerServiceImpl.java | 12 ++++++------ .../autoscaler/monitor/component/GroupMonitor.java | 4 ++-- .../policy/deployment/partition/PartitionManager.java | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d66bf8d5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java index 0809e9c..d740605 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java @@ -229,7 +229,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { // public void checkLBExistenceAgainstPolicy(String lbClusterId, String deploymentPolicyId) throws NonExistingLBException { // // boolean exist = false; -// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getApplicationLevelNetworkPartitions()) { +// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getChildLevelNetworkPartitions()) { // // NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); // @@ -249,7 +249,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { // public boolean checkDefaultLBExistenceAgainstPolicy(String deploymentPolicyId) { // -// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getApplicationLevelNetworkPartitions()) { +// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getChildLevelNetworkPartitions()) { // // NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); // @@ -273,7 +273,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { // if (log.isDebugEnabled()) { // log.debug("Default LB Cluster Id for Deployment Policy [" + deploymentPolicyName + "] "); // } -// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyName).getApplicationLevelNetworkPartitions()) { +// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyName).getChildLevelNetworkPartitions()) { // // NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); // @@ -312,7 +312,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { // public boolean checkServiceLBExistenceAgainstPolicy(String serviceName, String deploymentPolicyId) { // -// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getApplicationLevelNetworkPartitions()) { +// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getChildLevelNetworkPartitions()) { // // NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); // @@ -334,7 +334,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { // // public String getServiceLBClusterId(String serviceType, String deploymentPolicyName) { // -// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyName).getApplicationLevelNetworkPartitions()) { +// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyName).getChildLevelNetworkPartitions()) { // // NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); // @@ -355,7 +355,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { // public boolean checkClusterLBExistenceAgainstPolicy(String clusterId, String deploymentPolicyId) { // -// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getApplicationLevelNetworkPartitions()) { +// for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getChildLevelNetworkPartitions()) { // // NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); // http://git-wip-us.apache.org/repos/asf/stratos/blob/d66bf8d5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java index 0d10858..455bafb 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java @@ -331,7 +331,7 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler getChildLevelNetworkPartition(parentInstanceContext.getNetworkPartitionId()); AutoscaleAlgorithm algorithm = this.getAutoscaleAlgorithm(networkPartition.getPartitionAlgo()); - //Partition partition = algorithm.getNextScaleUpPartition(groupLevelNetworkPartitionContext, this.id); + //Partition partition = algorithm.getNextScaleUpPartitionContext(groupLevelNetworkPartitionContext, this.id); //TODO need to find the partition. partitionId=? } instanceId = createGroupInstance(group, parentInstanceId, partitionId, networkPartitionId); @@ -380,7 +380,7 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler getChildLevelNetworkPartition(parentInstanceContext.getNetworkPartitionId()); AutoscaleAlgorithm algorithm = this.getAutoscaleAlgorithm(networkPartition.getPartitionAlgo()); - //Partition partition = algorithm.getNextScaleUpPartition(groupLevelNetworkPartitionContext, this.id); + //Partition partition = algorithm.getNextScaleUpPartitionContext(groupLevelNetworkPartitionContext, this.id); //TODO need to find the partition. partitionId=? } instanceId = createGroupInstance(group, parentInstanceId, partitionId, networkPartitionId); http://git-wip-us.apache.org/repos/asf/stratos/blob/d66bf8d5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/PartitionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/PartitionManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/PartitionManager.java index 29db039..da974b5 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/PartitionManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/PartitionManager.java @@ -125,7 +125,7 @@ // //// public List<NetworkPartitionLbHolder> getNetworkPartitionLbHolders(DeploymentPolicy depPolicy) { //// List<NetworkPartitionLbHolder> lbHolders = new ArrayList<NetworkPartitionLbHolder>(); -//// for (NetworkPartition networkPartition : depPolicy.getApplicationLevelNetworkPartitions()) { +//// for (NetworkPartition networkPartition : depPolicy.getChildLevelNetworkPartitions()) { //// String id = networkPartition.getId(); //// NetworkPartitionLbHolder entry = networkPartitionLbHolders.get(id); //// if (entry != null) { @@ -136,7 +136,7 @@ //// } // //// public void deployNewNetworkPartitions(DeploymentPolicy depPolicy) { -//// for (NetworkPartition networkPartition : depPolicy.getApplicationLevelNetworkPartitions()) { +//// for (NetworkPartition networkPartition : depPolicy.getChildLevelNetworkPartitions()) { //// String id = networkPartition.getId(); //// if (!networkPartitionLbHolders.containsKey(id)) { //// NetworkPartitionLbHolder networkPartitionLbHolder = @@ -149,7 +149,7 @@ //// } // //// public void undeployNetworkPartitions(DeploymentPolicy depPolicy) { -//// for (NetworkPartition networkPartition : depPolicy.getApplicationLevelNetworkPartitions()) { +//// for (NetworkPartition networkPartition : depPolicy.getChildLevelNetworkPartitions()) { //// String id = networkPartition.getId(); //// if (networkPartitionLbHolders.containsKey(id)) { //// NetworkPartitionLbHolder netPartCtx = this.getNetworkPartitionLbHolder(id);
