You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/14 12:37:09 UTC
[2/5] stratos git commit:
s/hasGroupScalingDependent/hasScalingDependents
s/hasGroupScalingDependent/hasScalingDependents
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2a6bde65
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2a6bde65
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2a6bde65
Branch: refs/heads/4.1.0-test
Commit: 2a6bde6559d719ea0e14057a33356f655adee6b2
Parents: 5076a64
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Dec 14 17:00:18 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Dec 14 17:04:48 2014 +0530
----------------------------------------------------------------------
.../autoscaler/context/cluster/VMClusterContext.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2a6bde65/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
index 16935c0..63cbe33 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
@@ -60,7 +60,7 @@ public class VMClusterContext extends AbstractClusterContext {
protected AutoscalePolicy autoscalePolicy;
public VMClusterContext(String clusterId, String serviceId, AutoscalePolicy autoscalePolicy,
- DeploymentPolicy deploymentPolicy) {
+ DeploymentPolicy deploymentPolicy, boolean hasScalingDependents) {
super(clusterId, serviceId);
this.deploymentPolicy = deploymentPolicy;
@@ -121,7 +121,7 @@ public class VMClusterContext extends AbstractClusterContext {
return null;
}
- public void addInstanceContext(String instanceId, Cluster cluster, boolean hasGroupScalingDependent)
+ public void addInstanceContext(String instanceId, Cluster cluster, boolean hasScalingDependents)
throws PolicyValidationException, PartitionValidationException {
ClusterLevelNetworkPartitionContext networkPartitionContext = null;
ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId);
@@ -148,10 +148,10 @@ public class VMClusterContext extends AbstractClusterContext {
if (clusterInstance.getPartitionId() != null) {
//Need to add partition Context based on the given one from the parent
networkPartitionContext = addPartition(clusterInstance, cluster,
- networkPartitionContext, null, hasGroupScalingDependent);
+ networkPartitionContext, null, hasScalingDependents);
} else {
networkPartitionContext = parseDeploymentPolicy(clusterInstance, cluster,
- policy, networkPartitionContext, hasGroupScalingDependent);
+ policy, networkPartitionContext, hasScalingDependents);
}
if (!networkPartitionCtxts.containsKey(clusterInstance.getNetworkPartitionId())) {
this.networkPartitionCtxts.put(clusterInstance.getNetworkPartitionId(),
@@ -212,7 +212,7 @@ public class VMClusterContext extends AbstractClusterContext {
Cluster cluster,
ClusterLevelNetworkPartitionContext clusterLevelNetworkPartitionContext,
ChildLevelPartition childLevelPartition,
- boolean hasGroupScalingDependent)
+ boolean hasScalingDependents)
throws PolicyValidationException, PartitionValidationException {
if (clusterLevelNetworkPartitionContext == null) {
String msg =
@@ -253,7 +253,7 @@ public class VMClusterContext extends AbstractClusterContext {
}
clusterInstanceContext = new ClusterInstanceContext(clusterInstance.getInstanceId(),
clusterLevelNetworkPartitionContext.getPartitionAlgorithm(),
- minInstances, maxInstances, nPartitionId, clusterId, hasGroupScalingDependent);
+ minInstances, maxInstances, nPartitionId, clusterId, hasScalingDependents);
}
String partitionId;
if (childLevelPartition != null) {