Repository: stratos Updated Branches: refs/heads/master 9d474679f -> 50214f8ae
Move the NetworkPartition to network package Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/50214f8a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/50214f8a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/50214f8a Branch: refs/heads/master Commit: 50214f8ae2a519ccff1a30ed0ca05adbf84e6978 Parents: 9d47467 Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Nov 28 19:24:55 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Nov 28 19:28:17 2014 +0530 ---------------------------------------------------------------------- .../algorithm/AutoscaleAlgorithm.java | 4 +- .../autoscaler/api/AutoScalerServiceImpl.java | 3 +- .../context/cluster/ClusterContextFactory.java | 3 +- .../interfaces/AutoScalerServiceInterface.java | 3 +- .../monitor/component/ApplicationMonitor.java | 2 +- .../monitor/component/GroupMonitor.java | 2 +- .../autoscaler/partition/NetworkPartition.java | 101 ------------------- .../partition/network/NetworkPartition.java | 101 +++++++++++++++++++ .../policy/model/DeploymentPolicy.java | 2 +- .../src/test/resources/autoscaler.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 +- 16 files changed, 116 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/50214f8a/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 5c2640e..685c0b4 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 @@ -44,7 +44,7 @@ public interface AutoscaleAlgorithm { public boolean scaleDownPartitionAvailable(String clusterId); /** - * Returns a {@link Partition} to scale up from the given {@link org.apache.stratos.autoscaler.partition.NetworkPartition} according to algorithm + * Returns a {@link Partition} to scale up from the given {@link org.apache.stratos.autoscaler.partition.network.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 @@ -53,7 +53,7 @@ public interface AutoscaleAlgorithm { /** - * Returns a {@link Partition} to scale down from the given {@link org.apache.stratos.autoscaler.partition.NetworkPartition} according to algorithm + * Returns a {@link Partition} to scale down from the given {@link org.apache.stratos.autoscaler.partition.network.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/50214f8a/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 219fe08..38224ef 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 @@ -30,7 +30,6 @@ import org.apache.stratos.autoscaler.applications.topic.ApplicationBuilder; import org.apache.stratos.autoscaler.client.CloudControllerClient; import org.apache.stratos.autoscaler.exception.*; import org.apache.stratos.autoscaler.exception.application.ApplicationDefinitionException; -import org.apache.stratos.autoscaler.exception.cartridge.NonExistingLBException; import org.apache.stratos.autoscaler.exception.kubernetes.*; import org.apache.stratos.autoscaler.exception.partition.InvalidPartitionException; import org.apache.stratos.autoscaler.exception.partition.PartitionValidationException; @@ -38,7 +37,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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.NetworkPartition; import org.apache.stratos.autoscaler.partition.PartitionManager; import org.apache.stratos.autoscaler.pojo.Dependencies; import org.apache.stratos.autoscaler.pojo.ServiceGroup; http://git-wip-us.apache.org/repos/asf/stratos/blob/50214f8a/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 a4c5e28..2ea242d 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 @@ -21,14 +21,13 @@ package org.apache.stratos.autoscaler.context.cluster; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.*; import org.apache.stratos.autoscaler.client.CloudControllerClient; import org.apache.stratos.autoscaler.context.member.MemberStatsContext; import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext; 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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.NetworkPartition; //import org.apache.stratos.autoscaler.partition.PartitionManager; import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; http://git-wip-us.apache.org/repos/asf/stratos/blob/50214f8a/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 749d6d0..564ca6a 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 @@ -28,8 +28,7 @@ import org.apache.stratos.autoscaler.exception.*; import org.apache.stratos.autoscaler.exception.application.ApplicationDefinitionException; 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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.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; http://git-wip-us.apache.org/repos/asf/stratos/blob/50214f8a/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 e845e8e..3cff7fd 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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.NetworkPartition; import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.DeploymentPolicy; import org.apache.stratos.messaging.domain.applications.Application; http://git-wip-us.apache.org/repos/asf/stratos/blob/50214f8a/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 d357946..496e143 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 @@ -36,7 +36,7 @@ import org.apache.stratos.autoscaler.monitor.events.GroupStatusEvent; import org.apache.stratos.autoscaler.monitor.events.MonitorScalingEvent; import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent; import org.apache.stratos.autoscaler.monitor.events.builder.MonitorStatusEventBuilder; -import org.apache.stratos.autoscaler.partition.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.NetworkPartition; import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.DeploymentPolicy; import org.apache.stratos.messaging.domain.applications.Application; http://git-wip-us.apache.org/repos/asf/stratos/blob/50214f8a/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 deleted file mode 100644 index 75fa375..0000000 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/NetworkPartition.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 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/50214f8a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/network/NetworkPartition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/network/NetworkPartition.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/network/NetworkPartition.java new file mode 100644 index 0000000..7e9bc62 --- /dev/null +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/network/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.network; + +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/50214f8a/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 7be0ac8..1f312e7 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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.NetworkPartition; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/stratos/blob/50214f8a/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 8022cab..2ed0883 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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.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/50214f8a/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 73c1f48..fc7d070 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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.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/50214f8a/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 c7cb35e..7ee8a16 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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.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/50214f8a/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 9a17b27..1a56bfe 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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.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/50214f8a/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 d79bffb..6b1ca02 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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.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/50214f8a/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 91ecf39..7642376 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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.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/50214f8a/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 f10545b..03f5d95 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.NetworkPartition; +import org.apache.stratos.autoscaler.partition.network.NetworkPartition; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext;
