Updated Branches: refs/heads/master 71e3b1b6c -> 96db3160a
cleaning up Topology POJOs Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/12dbd29a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/12dbd29a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/12dbd29a Branch: refs/heads/master Commit: 12dbd29a7e30e100a527eeb6a6b3afdbb6cb0370 Parents: faca016 Author: Nirmal Fernando <[email protected]> Authored: Sat Nov 30 20:23:42 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Sat Nov 30 20:23:42 2013 +0530 ---------------------------------------------------------------------- .../messaging/domain/topology/Cluster.java | 18 ------------- .../messaging/domain/topology/Member.java | 28 ++++---------------- .../event/topology/InstanceSpawnedEvent.java | 21 ++++++++------- 3 files changed, 16 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/12dbd29a/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 5af1c04..16ec972 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 @@ -45,14 +45,12 @@ public class Cluster implements Serializable { // Key: Member.memberId private Map<String, Member> memberMap; private Properties properties; - private Map<String, Member> membertoNodeIdMap; public Cluster(String serviceName, String clusterId, String autoscalePolicyName) { this.serviceName = serviceName; this.clusterId = clusterId; this.autoscalePolicyName = autoscalePolicyName; this.memberMap = new HashMap<String, Member>(); - this.membertoNodeIdMap = new HashMap<String, Member>(); } public String getServiceName() { @@ -140,22 +138,6 @@ public class Cluster implements Serializable { this.autoscalePolicyName = autoscalePolicyName; } - public void addMemberToIaasNodeId(Member member) { - membertoNodeIdMap.put(member.getIaasNodeId(), member); - } - - public void removeMemberFromIaasNodeId(Member member) { - membertoNodeIdMap.remove(member.getIaasNodeId()); - } - - public Member getMemberFromIaasNodeId(String iaasNodeId) { - return membertoNodeIdMap.get(iaasNodeId); - } - - public boolean memberExistsFromIaasNodeId(String iaasNodeId) { - return this.membertoNodeIdMap.containsKey(iaasNodeId); - } - public String getDeploymentPolicyName() { return deploymentPolicyName; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/12dbd29a/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 98f08c4..dfe9ec5 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 @@ -35,12 +35,10 @@ public class Member implements Serializable { private String clusterId; private String memberId; private MemberStatus status; - private float loadAverage; - private float memoryConsumption; private String memberIp; private Map<String, Port> portMap; private Properties properties; - private String iaasNodeId; + private String partitionId; public Member(String serviceName, String clusterId, String memberId) { this.serviceName = serviceName; @@ -119,28 +117,12 @@ public class Member implements Serializable { this.memberIp = memberIp; } - public float getLoadAverage() { - return loadAverage; + public String getPartitionId() { + return partitionId; } - public void setLoadAverage(float loadAverage) { - this.loadAverage = loadAverage; - } - - public float getMemoryConsumption() { - return memoryConsumption; - } - - public void setMemoryConsumption(float memoryConsumption) { - this.memoryConsumption = memoryConsumption; - } - - public String getIaasNodeId() { - return iaasNodeId; - } - - public void setIaasNodeId(String iaasNodeId) { - this.iaasNodeId = iaasNodeId; + public void setPartitionId(String partitionId) { + this.partitionId = partitionId; } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/12dbd29a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java index 4b872a8..153f78c 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java @@ -30,13 +30,22 @@ public class InstanceSpawnedEvent extends TopologyEvent implements Serializable private String serviceName; private String clusterId; private String memberId; - private String iaasNodeId; + private String partitionId; + public InstanceSpawnedEvent(String serviceName, String clusterId, String memberId, String iaasNodeId) { this.serviceName = serviceName; this.clusterId = clusterId; this.memberId = memberId; - this.iaasNodeId = iaasNodeId; + this.partitionId = iaasNodeId; + } + + public String getPartitionId() { + return partitionId; + } + + public void setPartitionId(String partitionId) { + this.partitionId = partitionId; } public String getServiceName() { @@ -51,12 +60,4 @@ public class InstanceSpawnedEvent extends TopologyEvent implements Serializable return memberId; } - public String getIaasNodeId() { - return iaasNodeId; - } - - public void setIaasNodeId(String iaasNodeId) { - this.iaasNodeId = iaasNodeId; - } - }
