changes due to autoscaler refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ffaaeeea Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ffaaeeea Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ffaaeeea Branch: refs/heads/master Commit: ffaaeeea8dacefb1c8604e69c3778aa6381cb131 Parents: 6902ff0 Author: Nirmal Fernando <[email protected]> Authored: Thu Nov 28 00:12:37 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Nov 28 00:12:37 2013 +0530 ---------------------------------------------------------------------- .../messaging/domain/policy/DeploymentPolicy.java | 14 ++++++++++++++ .../stratos/messaging/domain/policy/Partition.java | 13 +++++++++++++ .../stratos/messaging/domain/topology/Cluster.java | 2 +- .../messaging/event/topology/ClusterCreatedEvent.java | 9 +++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffaaeeea/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/policy/DeploymentPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/policy/DeploymentPolicy.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/policy/DeploymentPolicy.java index 53e8006..8f024b3 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/policy/DeploymentPolicy.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/policy/DeploymentPolicy.java @@ -64,6 +64,20 @@ public class DeploymentPolicy { return this.partitionGroups; } + /** + * Returns all the partitions referenced by this policy. + * @return List of {@link Partition} + */ + public List<Partition> getAllPartitions() { + List<Partition> partitions = new ArrayList<Partition>(); + for (PartitionGroup group : partitionGroups) { + if (group != null) { + partitions.addAll(group.getPartitions()); + } + } + return partitions; + } + public String toString() { return "Deployment Policy: "+this.id; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffaaeeea/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/policy/Partition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/policy/Partition.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/policy/Partition.java index e33899f..c400540 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/policy/Partition.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/policy/Partition.java @@ -113,5 +113,18 @@ public class Partition implements Serializable{ public String toString() { return "Partition Id: "+this.id+", Partition Provider: "+this.provider; } + + public boolean equals(Object obj) { + if(obj != null && obj instanceof Partition) { + return this.id.equals(((Partition) obj).getId()); + } + return false; + + } + + @Override + public int hashCode() { + return this.id.hashCode(); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffaaeeea/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java index a3fd9e8..5af1c04 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java @@ -37,7 +37,7 @@ public class Cluster implements Serializable { private String hostName; private String tenantRange; private String autoscalePolicyName; - private String deploymentPolicyName; + private String deploymentPolicyName = "economy-deployment"; private Cloud cloud; private Region region; private Zone zone; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffaaeeea/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterCreatedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterCreatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterCreatedEvent.java index b906fa1..2aeea1a 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterCreatedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterCreatedEvent.java @@ -35,6 +35,7 @@ public class ClusterCreatedEvent extends TopologyEvent implements Serializable { private String hostName; private String tenantRange; private String autoscalingPolicyName; + private String deploymentPolicyName; private Properties properties; public ClusterCreatedEvent(String serviceName, String clusterId, String hostName) { @@ -84,4 +85,12 @@ public class ClusterCreatedEvent extends TopologyEvent implements Serializable { public void setAutoscalingPolicyName(String autoscalingPolicyName) { this.autoscalingPolicyName = autoscalingPolicyName; } + + public String getDeploymentPolicyName() { + return deploymentPolicyName; + } + + public void setDeploymentPolicyName(String deploymentPolicyName) { + this.deploymentPolicyName = deploymentPolicyName; + } }
