Updated Branches: refs/heads/master 899e3308f -> 9e80103cb
Updated topology domain model Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9e80103c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9e80103c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9e80103c Branch: refs/heads/master Commit: 9e80103cbeaccf150cf77d900cdc79ec2747a24d Parents: 899e330 Author: Imesh Gunaratne <[email protected]> Authored: Wed Oct 16 00:34:57 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Oct 16 00:34:57 2013 +0530 ---------------------------------------------------------------------- .../messaging/domain/topology/Cluster.java | 42 ++++++++++++++++++-- .../messaging/domain/topology/Member.java | 19 +++++++++ .../messaging/domain/topology/Service.java | 5 ++- .../messaging/domain/topology/Topology.java | 14 +++---- 4 files changed, 65 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9e80103c/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 4ed5a53..a3ad0c7 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 @@ -26,8 +26,10 @@ import java.util.*; /** * Defines a cluster of a service. + * Key: serviceName, clusterId */ public class Cluster implements Serializable { + private String serviceName; private String clusterId; private String hostName; private String tenantRange; @@ -42,6 +44,14 @@ public class Cluster implements Serializable { this.memberMap = new HashMap<String, Member>(); } + public String getServiceName() { + return serviceName; + } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + public String getClusterId() { return clusterId; } @@ -67,6 +77,30 @@ public class Cluster implements Serializable { this.tenantRange = tenantRange; } + public Cloud getCloud() { + return cloud; + } + + public void setCloud(Cloud cloud) { + this.cloud = cloud; + } + + public Region getRegion() { + return region; + } + + public void setRegion(Region region) { + this.region = region; + } + + public Zone getZone() { + return zone; + } + + public void setZone(Zone zone) { + this.zone = zone; + } + public Collection<Member> getMembers() { return memberMap.values(); } @@ -79,14 +113,14 @@ public class Cluster implements Serializable { memberMap.remove(member.getMemberId()); } - public void removeMember(String memberId) { - memberMap.remove(memberId); - } - public Member getMember(String memberId) { return memberMap.get(memberId); } + public boolean memberExists(String memberId) { + return this.memberMap.containsKey(memberId); + } + public Properties getProperties() { return properties; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9e80103c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java index 8fd27b9..d3e0b1b 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java @@ -27,8 +27,11 @@ import java.util.Properties; /** * Defines a member node in a cluster. + * Key: serviceName, clusterId, memberId */ public class Member implements Serializable { + private String serviceName; + private String clusterId; private String memberId; private String hostName; private MemberStatus status; @@ -39,6 +42,22 @@ public class Member implements Serializable { this.portMap = new HashMap<String, Port>(); } + public String getServiceName() { + return serviceName; + } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + public String getClusterId() { + return clusterId; + } + + public void setClusterId(String clusterId) { + this.clusterId = clusterId; + } + public String getMemberId() { return memberId; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9e80103c/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 ef3a1d5..471c91a 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 @@ -23,6 +23,7 @@ import java.util.*; /** * Defines a service in the topology. A service represents a cartridge type. + * Key: serviceName */ public class Service { private String serviceName; @@ -58,8 +59,8 @@ public class Service { this.clusterMap.remove(clusterId); } - public boolean clusterExists(Cluster cluster) { - return this.clusterMap.containsKey(cluster.getClusterId()); + public boolean clusterExists(String clusterId) { + return this.clusterMap.containsKey(clusterId); } public Cluster getCluster(String clusterId) { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9e80103c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java index df4bb02..9e5268f 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java @@ -48,18 +48,14 @@ public class Topology implements Serializable { } public void removeService(Service service) { - this.serviceMap.remove(service.getDomainName()); - } - - public void removeService(String serviceName) { - this.serviceMap.remove(serviceName); - } - - public boolean serviceExists(Service service) { - return this.serviceMap.containsKey(service.getDomainName()); + this.serviceMap.remove(service.getServiceName()); } public Service getService(String serviceName) { return this.serviceMap.get(serviceName); } + + public boolean serviceExists(String serviceName) { + return this.serviceMap.containsKey(serviceName); + } }
