Updated Branches: refs/heads/master f7daf5633 -> 469b8c6a0
deploymentPolicy added to cluster removed event and adding new properties volume.required and volume.size.gb Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4167469a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4167469a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4167469a Branch: refs/heads/master Commit: 4167469a73af6635d731c66a9ca7c8407f859a7e Parents: c257ac8 Author: Nirmal Fernando <[email protected]> Authored: Tue Feb 11 15:16:47 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Tue Feb 11 15:16:47 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/messaging/domain/topology/Service.java | 4 ++-- .../messaging/event/topology/ClusterRemovedEvent.java | 8 +++++++- .../java/org/apache/stratos/messaging/util/Constants.java | 9 +++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4167469a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java index b37de11..21cc5e7 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java @@ -64,8 +64,8 @@ public class Service implements Serializable{ this.clusterIdClusterMap.remove(cluster.getClusterId()); } - public void removeCluster(String clusterId) { - this.clusterIdClusterMap.remove(clusterId); + public Cluster removeCluster(String clusterId) { + return this.clusterIdClusterMap.remove(clusterId); } public boolean clusterExists(String clusterId) { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4167469a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java index 2a483fa..43ba836 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java @@ -29,12 +29,14 @@ public class ClusterRemovedEvent extends TopologyEvent implements Serializable { private final String serviceName; private final String clusterId; + private final String deploymentPolicy; private final boolean isLbCluster; - public ClusterRemovedEvent(String serviceName, String clusterId, boolean isLbCluster) { + public ClusterRemovedEvent(String serviceName, String clusterId, String deploymentPolicy, boolean isLbCluster) { this.serviceName = serviceName; this.clusterId = clusterId; this.isLbCluster = isLbCluster; + this.deploymentPolicy = deploymentPolicy; } public String getServiceName() { @@ -48,4 +50,8 @@ public class ClusterRemovedEvent extends TopologyEvent implements Serializable { public boolean isLbCluster() { return isLbCluster; } + + public String getDeploymentPolicy() { + return deploymentPolicy; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4167469a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java index 959f6e1..68b119f 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java @@ -43,6 +43,8 @@ public class Constants { public static final String TOPOLOGY_MEMBER_FILTER = "stratos.topology.member.filter"; public static final String TOPOLOGY_MEMBER_FILTER_LB_CLUSTER_ID = "lb-cluster-id"; + public static final String REQUEST_BASE_CONTEXT = "org.wso2.carbon.context.RequestBaseContext"; + // to identify a lb cluster public static final String IS_LOAD_BALANCER = "load.balancer"; public static final String LOAD_BALANCER_REF = "load.balancer.ref"; @@ -51,6 +53,9 @@ public class Constants { public static final String NO_LOAD_BALANCER = "no.load.balancer"; public static final String EXISTING_LOAD_BALANCERS = "existing.load.balancers"; public static final String LOAD_BALANCED_SERVICE_TYPE = "load.balanced.service.type"; - - public static final String REQUEST_BASE_CONTEXT = "org.wso2.carbon.context.RequestBaseContext"; + + // volume + public static final String IS_VOLUME_REQUIRED = "volume.required"; + public static final String VOLUME_SIZE = "volume.size.gb"; + }
