[04/12] stratos git commit: Merging parent and cluster level networkPartitionContext to networkPartitionContext

[reka]

http://git-wip-us.apache.org/repos/asf/stratos/blob/f1e5488e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
 
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
index e6495af..9d65a5b 100644
--- 
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
+++ 
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
@@ -24,7 +24,7 @@ import 
org.apache.stratos.autoscaler.applications.ApplicationHolder;
 import org.apache.stratos.autoscaler.context.AutoscalerContext;
 import org.apache.stratos.autoscaler.context.cluster.ClusterInstanceContext;
 import 
org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext;
-import 
org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext;
+import 
org.apache.stratos.autoscaler.context.partition.network.NetworkPartitionContext;
 import 
org.apache.stratos.autoscaler.event.publisher.ClusterStatusEventPublisher;
 import org.apache.stratos.autoscaler.monitor.cluster.ClusterMonitor;
 import org.apache.stratos.autoscaler.status.processor.StatusProcessor;
@@ -118,7 +118,7 @@ public class ClusterStatusTerminatedProcessor extends 
ClusterStatusProcessor {
      * @return whether has members or not
      */
     private boolean clusterInstanceHasMembers(ClusterMonitor monitor, String 
instanceId) {
-        for (ClusterLevelNetworkPartitionContext 
clusterLevelNetworkPartitionContext :
+        for (NetworkPartitionContext clusterLevelNetworkPartitionContext :
                 monitor.getAllNetworkPartitionCtxts().values()) {
             //minimum check per partition
             if 
(clusterLevelNetworkPartitionContext.containsInstanceContext(instanceId)) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/f1e5488e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
 
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index db43650..b76322c 100644
--- 
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ 
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -34,8 +34,6 @@ import 
org.apache.stratos.autoscaler.applications.pojo.GroupContext;
 import org.apache.stratos.autoscaler.context.AutoscalerContext;
 import org.apache.stratos.autoscaler.context.InstanceContext;
 import org.apache.stratos.autoscaler.context.cluster.ClusterInstanceContext;
-import 
org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext;
-import 
org.apache.stratos.autoscaler.context.partition.network.ParentLevelNetworkPartitionContext;
 import 
org.apache.stratos.autoscaler.context.partition.network.NetworkPartitionContext;
 import org.apache.stratos.autoscaler.exception.AutoScalerException;
 import org.apache.stratos.autoscaler.exception.application.*;
@@ -813,9 +811,9 @@ public class AutoscalerUtil {
                         //Updating the GroupMonitor
                         for (NetworkPartitionContext networkPartitionContext : 
groupMonitor.
                                 getNetworkPartitionContextsMap().values()) {
-                            ((ParentLevelNetworkPartitionContext) 
networkPartitionContext).
+                            ((NetworkPartitionContext) 
networkPartitionContext).
                                     
setMinInstanceCount(newGroup.getGroupMinInstances());
-                            ((ParentLevelNetworkPartitionContext) 
networkPartitionContext).
+                            ((NetworkPartitionContext) 
networkPartitionContext).
                                     
setMaxInstanceCount(newGroup.getGroupMaxInstances());
                         }
                     }
@@ -853,7 +851,7 @@ public class AutoscalerUtil {
             ClusterMonitor clusterMonitor = AutoscalerContext.getInstance().
                     getClusterMonitor(clusterDataHolder.getClusterId());
             if (clusterMonitor != null) {
-                for (ClusterLevelNetworkPartitionContext 
networkPartitionContext :
+                for (NetworkPartitionContext networkPartitionContext :
                         clusterMonitor.getNetworkPartitionCtxts()) {
                     for (InstanceContext instanceContext :
                             
networkPartitionContext.getInstanceIdToInstanceContextMap().values()) {