Repository: stratos Updated Branches: refs/heads/master 1db3e5cdf -> 40c3f5dc1
Rename PartitionGroup to NetworkPartition Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/40c3f5dc Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/40c3f5dc Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/40c3f5dc Branch: refs/heads/master Commit: 40c3f5dc132b0af19c857febc8c28963e7f404da Parents: 1db3e5c Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Nov 28 18:06:01 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Nov 28 18:06:01 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionLbHolder.java | 2 +- .../algorithm/AutoscaleAlgorithm.java | 5 +- .../autoscaler/api/AutoScalerServiceImpl.java | 32 +++--- .../context/cluster/ClusterContextFactory.java | 24 ++--- .../interfaces/AutoScalerServiceInterface.java | 4 +- .../monitor/component/ApplicationMonitor.java | 18 ++-- .../monitor/component/GroupMonitor.java | 8 +- .../autoscaler/partition/NetworkPartition.java | 101 +++++++++++++++++++ .../autoscaler/partition/PartitionGroup.java | 101 ------------------- .../autoscaler/partition/PartitionManager.java | 12 +-- .../policy/model/DeploymentPolicy.java | 24 ++--- .../rule/AutoscalerRuleEvaluator.java | 46 ++++----- .../stratos/autoscaler/util/AutoscalerUtil.java | 4 +- .../src/test/resources/autoscaler-old.drl | 8 +- .../src/test/resources/autoscaler.drl | 2 +- .../test/resources/minimum-autoscaler-rule.drl | 2 +- .../resources/test-minimum-autoscaler-rule.drl | 2 +- .../test-terminating-obsoleted-members-rule.drl | 2 +- .../src/main/conf/drools/dependent-scaling.drl | 2 +- .../src/main/conf/drools/mincheck.drl | 2 +- .../src/main/conf/drools/obsoletecheck.drl | 2 +- .../src/main/conf/drools/scaling.drl | 2 +- 22 files changed, 202 insertions(+), 203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionLbHolder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionLbHolder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionLbHolder.java index f59f8da..99949f4 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionLbHolder.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionLbHolder.java @@ -48,7 +48,7 @@ public class NetworkPartitionLbHolder implements Serializable{ // private boolean loadAverageReset = false, averageLoadAverageReset = false, gradientLoadAverageReset = false, // secondDerivativeLoadAverageRest = false; // -// //FIXME this should be populated via PartitionGroups a.k.a. NetworkPartitions +// //FIXME this should be populated via NetworkPartitions // private int minInstanceCount = 1, maxInstanceCount = 1; // // private final Partition[] partitions; http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/AutoscaleAlgorithm.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/AutoscaleAlgorithm.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/AutoscaleAlgorithm.java index 30dd18a..5c2640e 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/AutoscaleAlgorithm.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/AutoscaleAlgorithm.java @@ -20,7 +20,6 @@ package org.apache.stratos.autoscaler.algorithm; import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext; -import org.apache.stratos.autoscaler.partition.PartitionGroup; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; @@ -45,7 +44,7 @@ public interface AutoscaleAlgorithm { public boolean scaleDownPartitionAvailable(String clusterId); /** - * Returns a {@link Partition} to scale up from the given {@link PartitionGroup} according to algorithm + * Returns a {@link Partition} to scale up from the given {@link org.apache.stratos.autoscaler.partition.NetworkPartition} according to algorithm * @param clusterLevelNetworkPartitionContext {@link org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext} which need the {@link Partition} * @param clusterId Id of the cluster which need the {@link Partition} * @return {@link Partition} to scale up @@ -54,7 +53,7 @@ public interface AutoscaleAlgorithm { /** - * Returns a {@link Partition} to scale down from the given {@link PartitionGroup} according to algorithm + * Returns a {@link Partition} to scale down from the given {@link org.apache.stratos.autoscaler.partition.NetworkPartition} according to algorithm * @param clusterLevelNetworkPartitionContext {@link org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext} which need the {@link Partition} * @param clusterId Id of the cluster which need the {@link Partition} * @return {@link Partition} to scale down http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/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 73a891a..cd4a435 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 @@ -38,7 +38,7 @@ import org.apache.stratos.autoscaler.exception.policy.InvalidPolicyException; import org.apache.stratos.autoscaler.interfaces.AutoScalerServiceInterface; import org.apache.stratos.autoscaler.kubernetes.KubernetesManager; import org.apache.stratos.autoscaler.monitor.cluster.AbstractClusterMonitor; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.autoscaler.partition.PartitionManager; import org.apache.stratos.autoscaler.pojo.Dependencies; import org.apache.stratos.autoscaler.pojo.ServiceGroup; @@ -145,8 +145,8 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { } @Override - public PartitionGroup[] getPartitionGroups(String deploymentPolicyId) { - return PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getPartitionGroups(); + public NetworkPartition[] getNetworkPartitions(String deploymentPolicyId) { + return PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getNetworkPartitions(); } public Partition[] getPartitionsOfDeploymentPolicy(String deploymentPolicyId) { @@ -219,7 +219,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { return null; } - PartitionGroup group = depPol.getPartitionGroup(groupId); + NetworkPartition group = depPol.getNetworkPartition(groupId); if (group == null) { return null; @@ -231,9 +231,9 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { public void checkLBExistenceAgainstPolicy(String lbClusterId, String deploymentPolicyId) throws NonExistingLBException { boolean exist = false; - for (PartitionGroup partitionGroup : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getPartitionGroups()) { + for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getNetworkPartitions()) { - NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(partitionGroup.getId()); + NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); if (nwPartitionLbHolder.isLBExist(lbClusterId)) { exist = true; @@ -251,9 +251,9 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { public boolean checkDefaultLBExistenceAgainstPolicy(String deploymentPolicyId) { - for (PartitionGroup partitionGroup : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getPartitionGroups()) { + for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getNetworkPartitions()) { - NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(partitionGroup.getId()); + NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); if (!nwPartitionLbHolder.isDefaultLBExist()) { if (log.isDebugEnabled()) { @@ -275,9 +275,9 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { if (log.isDebugEnabled()) { log.debug("Default LB Cluster Id for Deployment Policy [" + deploymentPolicyName + "] "); } - for (PartitionGroup partitionGroup : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyName).getPartitionGroups()) { + for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyName).getNetworkPartitions()) { - NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(partitionGroup.getId()); + NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); if (nwPartitionLbHolder.isDefaultLBExist()) { if (log.isDebugEnabled()) { @@ -314,9 +314,9 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { public boolean checkServiceLBExistenceAgainstPolicy(String serviceName, String deploymentPolicyId) { - for (PartitionGroup partitionGroup : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getPartitionGroups()) { + for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getNetworkPartitions()) { - NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(partitionGroup.getId()); + NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); if (!nwPartitionLbHolder.isServiceLBExist(serviceName)) { if (log.isDebugEnabled()) { @@ -336,9 +336,9 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { public String getServiceLBClusterId(String serviceType, String deploymentPolicyName) { - for (PartitionGroup partitionGroup : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyName).getPartitionGroups()) { + for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyName).getNetworkPartitions()) { - NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(partitionGroup.getId()); + NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); if (nwPartitionLbHolder.isServiceLBExist(serviceType)) { if (log.isDebugEnabled()) { @@ -357,9 +357,9 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { public boolean checkClusterLBExistenceAgainstPolicy(String clusterId, String deploymentPolicyId) { - for (PartitionGroup partitionGroup : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getPartitionGroups()) { + for (NetworkPartition networkPartition : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getNetworkPartitions()) { - NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(partitionGroup.getId()); + NetworkPartitionLbHolder nwPartitionLbHolder = partitionManager.getNetworkPartitionLbHolder(networkPartition.getId()); if (!nwPartitionLbHolder.isClusterLBExist(clusterId)) { if (log.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/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 1b739fc..c2d3439 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 @@ -28,7 +28,7 @@ import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetwo import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext; import org.apache.stratos.autoscaler.exception.partition.PartitionValidationException; import org.apache.stratos.autoscaler.exception.policy.PolicyValidationException; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.autoscaler.partition.PartitionManager; import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; @@ -91,18 +91,18 @@ public class ClusterContextFactory { Map<String, ClusterLevelNetworkPartitionContext> networkPartitionContextMap = new HashMap<String, ClusterLevelNetworkPartitionContext>(); - for (PartitionGroup partitionGroup : deploymentPolicy.getPartitionGroups()) { + for (NetworkPartition networkPartition : deploymentPolicy.getNetworkPartitions()) { - String networkPartitionId = partitionGroup.getId(); + String networkPartitionId = networkPartition.getId(); ClusterLevelNetworkPartitionContext clusterLevelNetworkPartitionContext = new ClusterLevelNetworkPartitionContext(networkPartitionId, - partitionGroup.getPartitionAlgo(), - partitionGroup.getPartitions()); + networkPartition.getPartitionAlgo(), + networkPartition.getPartitions()); - for (Partition partition : partitionGroup.getPartitions()) { + for (Partition partition : networkPartition.getPartitions()) { ClusterLevelPartitionContext clusterMonitorPartitionContext = new ClusterLevelPartitionContext(partition); clusterMonitorPartitionContext.setServiceName(cluster.getServiceName()); clusterMonitorPartitionContext.setProperties(cluster.getProperties()); - clusterMonitorPartitionContext.setNetworkPartitionId(partitionGroup.getId()); + clusterMonitorPartitionContext.setNetworkPartitionId(networkPartition.getId()); for (Member member : cluster.getMembers()) { String memberId = member.getMemberId(); @@ -193,9 +193,9 @@ public class ClusterContextFactory { Map<String, ClusterLevelNetworkPartitionContext> networkPartitionContextMap = new HashMap<String, ClusterLevelNetworkPartitionContext>(); // partition group = network partition context - for (PartitionGroup partitionGroup : deploymentPolicy.getPartitionGroups()) { + for (NetworkPartition networkPartition : deploymentPolicy.getNetworkPartitions()) { - String networkPartitionId = partitionGroup.getId(); + String networkPartitionId = networkPartition.getId(); NetworkPartitionLbHolder networkPartitionLbHolder = PartitionManager.getInstance() .getNetworkPartitionLbHolder(networkPartitionId); @@ -203,7 +203,7 @@ public class ClusterContextFactory { // .getNetworkPartitionLbHolder(partitionGroup.getPartitionId()); // FIXME pick a random partition Partition partition = - partitionGroup.getPartitions()[new Random().nextInt(partitionGroup.getPartitions().length)]; + networkPartition.getPartitions()[new Random().nextInt(networkPartition.getPartitions().length)]; ClusterLevelPartitionContext clusterMonitorPartitionContext = new ClusterLevelPartitionContext(partition); clusterMonitorPartitionContext.setServiceName(cluster.getServiceName()); clusterMonitorPartitionContext.setProperties(cluster.getProperties()); @@ -211,8 +211,8 @@ public class ClusterContextFactory { clusterMonitorPartitionContext.setMinimumMemberCount(1);//Here it hard codes the minimum value as one for LB cartridge partitions ClusterLevelNetworkPartitionContext clusterLevelNetworkPartitionContext = new ClusterLevelNetworkPartitionContext(networkPartitionId, - partitionGroup.getPartitionAlgo(), - partitionGroup.getPartitions()); + networkPartition.getPartitionAlgo(), + networkPartition.getPartitions()); for (Member member : cluster.getMembers()) { String memberId = member.getMemberId(); if (member.getNetworkPartitionId().equalsIgnoreCase(clusterLevelNetworkPartitionContext.getId())) { http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java index 39601d9..88b9e29 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java @@ -29,7 +29,7 @@ import org.apache.stratos.autoscaler.exception.application.ApplicationDefinition import org.apache.stratos.autoscaler.exception.partition.InvalidPartitionException; import org.apache.stratos.autoscaler.exception.policy.InvalidPolicyException; import org.apache.stratos.autoscaler.exception.cartridge.NonExistingLBException; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.autoscaler.pojo.ServiceGroup; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; @@ -64,7 +64,7 @@ public interface AutoScalerServiceInterface { public AutoscalePolicy getAutoscalingPolicy(String autoscalingPolicyId); - public PartitionGroup[] getPartitionGroups(String deploymentPolicyId); + public NetworkPartition[] getNetworkPartitions(String deploymentPolicyId); public Partition[] getPartitionsOfGroup(String deploymentPolicyId, String partitionGroup); http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java index 64dd43b..5f90e25 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java @@ -32,7 +32,7 @@ import org.apache.stratos.autoscaler.monitor.events.builder.MonitorStatusEventBu import org.apache.stratos.autoscaler.monitor.events.ApplicationStatusEvent; import org.apache.stratos.autoscaler.monitor.events.MonitorScalingEvent; import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.DeploymentPolicy; import org.apache.stratos.messaging.domain.applications.Application; @@ -192,11 +192,11 @@ public class ApplicationMonitor extends ParentComponentMonitor { List<String> instanceIds = new ArrayList<String>(); DeploymentPolicy deploymentPolicy = getDeploymentPolicy(application); String instanceId; - for (PartitionGroup partitionGroup : deploymentPolicy.getPartitionGroups()) { - if(partitionGroup.isActiveByDefault()) { + for (NetworkPartition networkPartition : deploymentPolicy.getNetworkPartitions()) { + if(networkPartition.isActiveByDefault()) { ApplicationLevelNetworkPartitionContext context = - new ApplicationLevelNetworkPartitionContext(partitionGroup.getId()); - instanceId = createApplicationInstance(application, partitionGroup.getId()); + new ApplicationLevelNetworkPartitionContext(networkPartition.getId()); + instanceId = createApplicationInstance(application, networkPartition.getId()); context.addInstanceContext(application.getInstanceContexts(instanceId)); this.networkPartitionCtxts.put(context.getId(), context); @@ -223,12 +223,12 @@ public class ApplicationMonitor extends ParentComponentMonitor { String instanceId = null; //Find out the inActive network partition boolean burstNPFound = false; - for (PartitionGroup partitionGroup : deploymentPolicy.getPartitionGroups()) { - if(!partitionGroup.isActiveByDefault()) { + for (NetworkPartition networkPartition : deploymentPolicy.getNetworkPartitions()) { + if(!networkPartition.isActiveByDefault()) { ApplicationLevelNetworkPartitionContext context = - new ApplicationLevelNetworkPartitionContext(partitionGroup.getId()); + new ApplicationLevelNetworkPartitionContext(networkPartition.getId()); context.setCreatedOnBurst(true); - instanceId = createApplicationInstance(application, partitionGroup.getId()); + instanceId = createApplicationInstance(application, networkPartition.getId()); context.addInstanceContext(application.getInstanceContexts(instanceId)); this.networkPartitionCtxts.put(context.getId(), context); burstNPFound = true; http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/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 eb15900..2f1645b 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 @@ -33,7 +33,7 @@ import org.apache.stratos.autoscaler.monitor.EventHandler; import org.apache.stratos.autoscaler.monitor.Monitor; import org.apache.stratos.autoscaler.monitor.events.builder.MonitorStatusEventBuilder; import org.apache.stratos.autoscaler.monitor.events.*; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.DeploymentPolicy; import org.apache.stratos.messaging.domain.applications.*; @@ -294,10 +294,10 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler if(deploymentPolicyName != null) { DeploymentPolicy deploymentPolicy = PolicyManager.getInstance() .getDeploymentPolicy(deploymentPolicyName); - PartitionGroup partitionGroup = deploymentPolicy. - getPartitionGroup(parentInstanceContext.getNetworkPartitionId()); + NetworkPartition networkPartition = deploymentPolicy. + getNetworkPartition(parentInstanceContext.getNetworkPartitionId()); - AutoscaleAlgorithm algorithm = this.getAutoscaleAlgorithm(partitionGroup.getPartitionAlgo()); + AutoscaleAlgorithm algorithm = this.getAutoscaleAlgorithm(networkPartition.getPartitionAlgo()); //Partition partition = algorithm.getNextScaleUpPartition(groupLevelNetworkPartitionContext, this.id); } instanceId = createGroupInstance(group, parentInstanceId); http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/NetworkPartition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/NetworkPartition.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/NetworkPartition.java new file mode 100644 index 0000000..75fa375 --- /dev/null +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/NetworkPartition.java @@ -0,0 +1,101 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + +package org.apache.stratos.autoscaler.partition; + +import java.io.Serializable; +import java.util.Arrays; + +import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; + +/** +* The model class for NetworkPartition definition. +*/ +public class NetworkPartition implements Serializable{ + + private static final long serialVersionUID = -8043298009352097370L; + private String id; + private boolean activeByDefault; + private String partitionAlgo; + private Partition[] partitions; + + /** + * Gets the value of the partitionAlgo property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPartitionAlgo() { + return partitionAlgo; + } + + /** + * Sets the value of the partitionAlgo property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPartitionAlgo(String value) { + this.partitionAlgo = value; + } + + public void setPartitions(Partition[] partitions) { + if(partitions == null) { + this.partitions = partitions; + } else { + this.partitions = Arrays.copyOf(partitions, partitions.length); + } + } + + /** + * Gets the value of the partitions. + */ + public Partition[] getPartitions() { + if (partitions == null) { + partitions = new Partition[0]; + } + return this.partitions; + } + + /** + * Gets the value of the id. + */ + public String getId() { + return id; + } + + /** + * sets the value of the id. + */ + public void setId(String id) { + this.id = id; + } + + public boolean isActiveByDefault() { + return activeByDefault; + } + + public void setActiveByDefault(boolean activeByDefault) { + this.activeByDefault = activeByDefault; + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java deleted file mode 100644 index 8e563f0..0000000 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.stratos.autoscaler.partition; - -import java.io.Serializable; -import java.util.Arrays; - -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; - -/** - * The model class for PartitionGroup definition. - */ -public class PartitionGroup implements Serializable{ - - private static final long serialVersionUID = -8043298009352097370L; - private String id; - private boolean activeByDefault; - private String partitionAlgo; - private Partition[] partitions; - - /** - * Gets the value of the partitionAlgo property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPartitionAlgo() { - return partitionAlgo; - } - - /** - * Sets the value of the partitionAlgo property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPartitionAlgo(String value) { - this.partitionAlgo = value; - } - - public void setPartitions(Partition[] partitions) { - if(partitions == null) { - this.partitions = partitions; - } else { - this.partitions = Arrays.copyOf(partitions, partitions.length); - } - } - - /** - * Gets the value of the partitions. - */ - public Partition[] getPartitions() { - if (partitions == null) { - partitions = new Partition[0]; - } - return this.partitions; - } - - /** - * Gets the value of the id. - */ - public String getId() { - return id; - } - - /** - * sets the value of the id. - */ - public void setId(String id) { - this.id = id; - } - - public boolean isActiveByDefault() { - return activeByDefault; - } - - public void setActiveByDefault(boolean activeByDefault) { - this.activeByDefault = activeByDefault; - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java index 6b40933..13d85e2 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java @@ -125,8 +125,8 @@ public class PartitionManager { public List<NetworkPartitionLbHolder> getNetworkPartitionLbHolders(DeploymentPolicy depPolicy) { List<NetworkPartitionLbHolder> lbHolders = new ArrayList<NetworkPartitionLbHolder>(); - for (PartitionGroup partitionGroup : depPolicy.getPartitionGroups()) { - String id = partitionGroup.getId(); + for (NetworkPartition networkPartition : depPolicy.getNetworkPartitions()) { + String id = networkPartition.getId(); NetworkPartitionLbHolder entry = networkPartitionLbHolders.get(id); if (entry != null) { lbHolders.add(entry); @@ -136,8 +136,8 @@ public class PartitionManager { } public void deployNewNetworkPartitions(DeploymentPolicy depPolicy) { - for (PartitionGroup partitionGroup : depPolicy.getPartitionGroups()) { - String id = partitionGroup.getId(); + for (NetworkPartition networkPartition : depPolicy.getNetworkPartitions()) { + String id = networkPartition.getId(); if (!networkPartitionLbHolders.containsKey(id)) { NetworkPartitionLbHolder networkPartitionLbHolder = new NetworkPartitionLbHolder(id); @@ -149,8 +149,8 @@ public class PartitionManager { } public void undeployNetworkPartitions(DeploymentPolicy depPolicy) { - for (PartitionGroup partitionGroup : depPolicy.getPartitionGroups()) { - String id = partitionGroup.getId(); + for (NetworkPartition networkPartition : depPolicy.getNetworkPartitions()) { + String id = networkPartition.getId(); if (networkPartitionLbHolders.containsKey(id)) { NetworkPartitionLbHolder netPartCtx = this.getNetworkPartitionLbHolder(id); // remove from information model http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/DeploymentPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/DeploymentPolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/DeploymentPolicy.java index 0676723..7be0ac8 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/DeploymentPolicy.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/DeploymentPolicy.java @@ -19,7 +19,7 @@ package org.apache.stratos.autoscaler.policy.model; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import java.io.Serializable; @@ -35,7 +35,7 @@ public class DeploymentPolicy implements Serializable{ private String id; private String description; private boolean isPublic; - private PartitionGroup[] partitionGroups; + private NetworkPartition[] networkPartitions; private int tenantId; /** @@ -126,18 +126,18 @@ public class DeploymentPolicy implements Serializable{ this.tenantId = tenantId; } - public void setPartitionGroups(PartitionGroup[] partitionGroups) { - if(partitionGroups == null) { - this.partitionGroups = new PartitionGroup[0]; + public void setNetworkPartitions(NetworkPartition[] networkPartitions) { + if(networkPartitions == null) { + this.networkPartitions = new NetworkPartition[0]; } else { - this.partitionGroups = Arrays.copyOf(partitionGroups, partitionGroups.length); + this.networkPartitions = Arrays.copyOf(networkPartitions, networkPartitions.length); } } public Partition[] getAllPartitions() { ArrayList<Partition> partitionsList = new ArrayList<Partition>(); - for (PartitionGroup partitionGroup : this.getPartitionGroups()) { - Partition[] partitions = partitionGroup.getPartitions(); + for (NetworkPartition networkPartition : this.getNetworkPartitions()) { + Partition[] partitions = networkPartition.getPartitions(); if(partitions != null) { partitionsList.addAll(Arrays.asList(partitions)); } @@ -156,13 +156,13 @@ public class DeploymentPolicy implements Serializable{ /** * Gets the value of the partition-groups. */ - public PartitionGroup[] getPartitionGroups() { + public NetworkPartition[] getNetworkPartitions() { - return this.partitionGroups; + return this.networkPartitions; } - public PartitionGroup getPartitionGroup(String partitionGrpId){ - for(PartitionGroup parGrp : this.getPartitionGroups()){ + public NetworkPartition getNetworkPartition(String partitionGrpId){ + for(NetworkPartition parGrp : this.getNetworkPartitions()){ if(parGrp.getId().equals(partitionGrpId)) return parGrp; http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java index b09f74f..9eac1da 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java @@ -21,9 +21,9 @@ package org.apache.stratos.autoscaler.rule; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext; -import org.apache.stratos.autoscaler.NetworkPartitionLbHolder; -import org.apache.stratos.autoscaler.partition.PartitionManager; +//import org.apache.stratos.autoscaler.partition.PartitionManager; +//import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext; +//import org.apache.stratos.autoscaler.NetworkPartitionLbHolder; import org.apache.stratos.common.constants.StratosConstants; import org.drools.KnowledgeBase; import org.drools.KnowledgeBaseFactory; @@ -214,26 +214,26 @@ public class AutoscalerRuleEvaluator { return ksession; } - public static String getLbClusterId(ClusterLevelPartitionContext clusterMonitorPartitionContext, String nwpartitionId) { - Properties props = clusterMonitorPartitionContext.getProperties(); - String value = - (String) props.get(org.apache.stratos.messaging.util.Constants.LOAD_BALANCER_REF); - - if (value == null){ - return null; - } - - String lbClusterId = null; - - NetworkPartitionLbHolder networkPartitionLbHolder = PartitionManager.getInstance().getNetworkPartitionLbHolder(nwpartitionId); - if (value.equals(org.apache.stratos.messaging.util.Constants.DEFAULT_LOAD_BALANCER)) { - lbClusterId = networkPartitionLbHolder.getDefaultLbClusterId(); - } else if (value.equals(org.apache.stratos.messaging.util.Constants.SERVICE_AWARE_LOAD_BALANCER)) { - String serviceName = clusterMonitorPartitionContext.getServiceName(); - lbClusterId = networkPartitionLbHolder.getLBClusterIdOfService(serviceName); - } - return lbClusterId; - } +// public static String getLbClusterId(ClusterLevelPartitionContext clusterMonitorPartitionContext, String nwpartitionId) { +// Properties props = clusterMonitorPartitionContext.getProperties(); +// String value = +// (String) props.get(org.apache.stratos.messaging.util.Constants.LOAD_BALANCER_REF); +// +// if (value == null){ +// return null; +// } +// +// String lbClusterId = null; +// +// NetworkPartitionLbHolder networkPartitionLbHolder = PartitionManager.getInstance().getNetworkPartitionLbHolder(nwpartitionId); +// if (value.equals(org.apache.stratos.messaging.util.Constants.DEFAULT_LOAD_BALANCER)) { +// lbClusterId = networkPartitionLbHolder.getDefaultLbClusterId(); +// } else if (value.equals(org.apache.stratos.messaging.util.Constants.SERVICE_AWARE_LOAD_BALANCER)) { +// String serviceName = clusterMonitorPartitionContext.getServiceName(); +// lbClusterId = networkPartitionLbHolder.getLBClusterIdOfService(serviceName); +// } +// return lbClusterId; +// } private static KnowledgeBase readKnowledgeBase(String drlFileName) { KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder(); http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/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 383f083..18b1dc4 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 @@ -113,7 +113,7 @@ public class AutoscalerUtil { deploymentPolicy, policy); clusterMonitor.setStatus(Status.Created); // partition group = network partition context - for (PartitionGroup partitionGroup : deploymentPolicy.getPartitionGroups()) { + for (NetworkPartition partitionGroup : deploymentPolicy.gNetworkPartitionups()) { NetworkPartitionLbHolder networkPartitionLbHolder = PartitionManager.getInstance() @@ -290,7 +290,7 @@ public class AutoscalerUtil { // new LbClusterMonitor(cluster.getClusterId(), // cluster.getServiceName(), // deploymentPolicy, policy); -// for (PartitionGroup partitionGroup: deploymentPolicy.getPartitionGroups()){ +// fNetworkPartitionroup partitionGroup: deploymentPoliNetworkPartitionnGroups()){ // // NetworkPartitionContext networkPartitionContext // = PartitionManager.getInstance().getNetworkPartitionLbHolder(partitionGroup.getNetworkPartitionId()); http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler-old.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler-old.drl b/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler-old.drl index 9531c4e..ae940b7 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler-old.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler-old.drl @@ -27,7 +27,7 @@ import org.apache.stratos.autoscaler.Constants; import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.messaging.domain.policy.Partition; -import org.apache.stratos.messaging.domain.policy.PartitionGroup; +import org.apache.stratos.messaging.domain.policy.NetworkPartition; import org.apache.stratos.messaging.domain.policy.DeploymentPolicy; import org.apache.stratos.autoscaler.policy.model.RequestsInFlight; import org.apache.stratos.autoscaler.policy.model.LoadThresholds; @@ -52,7 +52,7 @@ dialect "mvel" $service : Service () $cluster : Cluster () from $service.getClusters() $deploymentPolicy : DeploymentPolicy(id == $cluster.getDeploymentPolicyName() ) from $manager.getDeploymentPolicyList() - $partitionGroup : PartitionGroup () from $deploymentPolicy.getPartitionGroups() + $partitionGroup : NetworkPartition () from $deploymentPolicy.getNetworkPartitions() $partition : Partition () from $partitionGroup.getPartitions() $clusterContext : ClusterContext() from $context.getClusterContext($cluster.getClusterId()) eval($clusterContext.getMemberCount($partition.getId()) < $partition.getPartitionMembersMin()) @@ -72,7 +72,7 @@ dialect "mvel" $cluster : Cluster () from $service.getClusters() $autoScalingPolicy : AutoscalePolicy(id == $cluster.getAutoscalePolicyName() ) from $manager.getAutoscalePolicyList() $deploymentPolicy : DeploymentPolicy(id == $cluster.getDeploymentPolicyName() ) from $manager.getDeploymentPolicyList() - $partitionGroup : PartitionGroup () from $deploymentPolicy.getPartitionGroups() + $partitionGroup : NetworkPartition () from $deploymentPolicy.getNetworkPartitions() $clusterContext : ClusterContext() from $context.getClusterContext($cluster.getClusterId()) $loadThresholds :LoadThresholds() from $autoScalingPolicy.getLoadThresholds() @@ -100,7 +100,7 @@ dialect "mvel" $cluster : Cluster () from $service.getClusters() $autoScalingPolicy : AutoscalePolicy(id == $cluster.getAutoscalePolicyName() ) from $manager.getAutoscalePolicyList() $deploymentPolicy : DeploymentPolicy(id == $cluster.getDeploymentPolicyName() ) from $manager.getDeploymentPolicyList() - $partitionGroup : PartitionGroup () from $deploymentPolicy.getPartitionGroups() + $partitionGroup : NetworkPartition () from $deploymentPolicy.getNetworkPartitions() $clusterContext : ClusterContext() from $context.getClusterContext($cluster.getClusterId()) $loadThresholds :LoadThresholds() from $autoScalingPolicy.getLoadThresholds() http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl b/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl index cb01505..8022cab 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl @@ -37,7 +37,7 @@ import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.commons.logging.Log; import org.apache.stratos.autoscaler.policy.model.DeploymentPolicy; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/test/resources/minimum-autoscaler-rule.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/minimum-autoscaler-rule.drl b/components/org.apache.stratos.autoscaler/src/test/resources/minimum-autoscaler-rule.drl index c1b7f26..785e276 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/minimum-autoscaler-rule.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/minimum-autoscaler-rule.drl @@ -27,7 +27,7 @@ import org.apache.stratos.autoscaler.Constants; import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.messaging.domain.policy.Partition; -import org.apache.stratos.messaging.domain.policy.PartitionGroup; +import org.apache.stratos.messaging.domain.policy.NetworkPartition; import org.apache.stratos.messaging.domain.policy.DeploymentPolicy; import org.apache.stratos.autoscaler.policy.model.RequestsInFlight; import org.apache.stratos.autoscaler.policy.model.LoadThresholds; http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl b/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl index a13ec1a..73c1f48 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl @@ -36,7 +36,7 @@ import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.commons.logging.Log; import org.apache.stratos.autoscaler.policy.model.DeploymentPolicy; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl b/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl index 1302cae..c7cb35e 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl @@ -36,7 +36,7 @@ import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.commons.logging.Log; import org.apache.stratos.autoscaler.policy.model.DeploymentPolicy; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl index fd42c5b..9a17b27 100644 --- a/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl @@ -33,7 +33,7 @@ import org.apache.stratos.autoscaler.algorithm.OneAfterAnother; import org.apache.stratos.autoscaler.algorithm.RoundRobin; import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl index b1b7ee0..d79bffb 100755 --- a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl @@ -36,7 +36,7 @@ import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.commons.logging.Log; import org.apache.stratos.autoscaler.policy.model.DeploymentPolicy; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl b/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl index eac79aa..91ecf39 100755 --- a/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl @@ -36,7 +36,7 @@ import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.commons.logging.Log; import org.apache.stratos.autoscaler.policy.model.DeploymentPolicy; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; http://git-wip-us.apache.org/repos/asf/stratos/blob/40c3f5dc/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl index 8c4e83c..f10545b 100644 --- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl @@ -38,7 +38,7 @@ import org.apache.stratos.autoscaler.algorithm.OneAfterAnother; import org.apache.stratos.autoscaler.algorithm.RoundRobin; import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; -import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.partition.NetworkPartition; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext;
