Repository: stratos Updated Branches: refs/heads/master 52ce24f4a -> 248e4d6b1
Merging VMServiceClusterContext to VMClusterContext as abstraction is not required now Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/466fe313 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/466fe313 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/466fe313 Branch: refs/heads/master Commit: 466fe313ba1993571ae46df6282df8bdf8ac74b0 Parents: 52ce24f Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Dec 2 07:40:09 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Dec 2 07:40:09 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/context/cluster/ClusterContextFactory.java | 4 ++-- .../event/receiver/topology/AutoscalerTopologyEventReceiver.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/466fe313/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java index 23d703e..02773e0 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java @@ -48,7 +48,7 @@ public class ClusterContextFactory { private static final Log log = LogFactory.getLog(ClusterContextFactory.class); - public static VMServiceClusterContext getVMServiceClusterContext(String instanceId, Cluster cluster) + public static VMClusterContext getVMClusterContext(String instanceId, Cluster cluster) throws PolicyValidationException, PartitionValidationException { if (null == cluster) { @@ -74,7 +74,7 @@ public class ClusterContextFactory { ApplicationHolder.releaseReadLock(); } - return new VMServiceClusterContext(cluster.getClusterId(), cluster.getServiceName(), autoscalePolicy, + return new VMClusterContext(cluster.getClusterId(), cluster.getServiceName(), autoscalePolicy, deploymentPolicy); } http://git-wip-us.apache.org/repos/asf/stratos/blob/466fe313/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java index 7f8af6f..9ed5b03 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java @@ -474,7 +474,7 @@ public class AutoscalerTopologyEventReceiver implements Runnable { if (clusterContext == null) { clusterMonitor.setClusterContext( ClusterContextFactory. - getVMServiceClusterContext(instanceId, + getVMClusterContext(instanceId, cluster)); } else { clusterContext.addInstanceContext(instanceId, cluster);
