Adding instance id to member bean to be exposed by the application runtime and updating test cases
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/27ba632f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/27ba632f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/27ba632f Branch: refs/heads/stratos-4.1.x Commit: 27ba632f20af00806bf5b9aea8847a6d8c9d9faa Parents: 6a16dde Author: Imesh Gunaratne <[email protected]> Authored: Thu Oct 22 12:36:29 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Oct 22 12:40:54 2015 +0530 ---------------------------------------------------------------------- .../cartridge/agent/test/JavaCartridgeAgentTest.java | 4 +++- .../apache/stratos/common/beans/topology/MemberBean.java | 10 ++++++++++ .../rest/endpoint/util/converter/ObjectConverter.java | 2 ++ .../integration/tests/ADCMTAppTenantUserTestCase.java | 3 ++- .../agent/integration/tests/ADCMTAppTestCase.java | 3 ++- .../cartridge/agent/integration/tests/ADCTestCase.java | 4 +++- .../agent/integration/tests/AgentStartupTestCase.java | 3 ++- 7 files changed, 24 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/27ba632f/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java index 7db8f70..0427eb6 100644 --- a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java +++ b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java @@ -72,6 +72,7 @@ public class JavaCartridgeAgentTest { private static final String AUTOSCALING_POLICY_NAME = "autoscaling-policy-1"; private static final String APP_ID = "application-1"; private static final String MEMBER_ID = "php.member-1"; + private static final String INSTANCE_ID = "instance-1"; private static final String CLUSTER_INSTANCE_ID = "cluster-1-instance-1"; private static final String NETWORK_PARTITION_ID = "network-partition-1"; private static final String PARTITION_ID = "partition-1"; @@ -342,7 +343,8 @@ public class JavaCartridgeAgentTest { // Publish member initialized event log.info("Publishing member initialized event..."); MemberInitializedEvent memberInitializedEvent = new MemberInitializedEvent( - SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, PARTITION_ID + SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, + PARTITION_ID, INSTANCE_ID ); publishEvent(memberInitializedEvent); log.info("Member initialized event published"); http://git-wip-us.apache.org/repos/asf/stratos/blob/27ba632f/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java index 95c3d97..60787c0 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java @@ -33,6 +33,7 @@ public class MemberBean { private String networkPartitionId; private String partitionId; private String memberId; + private String instanceId; private String status; private String defaultPrivateIP; private List<String> memberPrivateIPs; @@ -82,6 +83,14 @@ public class MemberBean { this.memberId = memberId; } + public String getInstanceId() { + return instanceId; + } + + public void setInstanceId(String instanceId) { + this.instanceId = instanceId; + } + public List<String> getMemberPrivateIPs() { return memberPrivateIPs; } @@ -159,6 +168,7 @@ public class MemberBean { return "Member [serviceName=" + getServiceName() + ", clusterId=" + getClusterId() + ", memberId=" + getMemberId() + + ", instanceId=" + getInstanceId() + ", clusterInstanceId=" + getClusterInstanceId() + ", networkPartitionId=" + getNetworkPartitionId() + ", partitionId=" + getPartitionId() http://git-wip-us.apache.org/repos/asf/stratos/blob/27ba632f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 12600c7..d1307eb 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -650,6 +650,7 @@ public class ObjectConverter { memberBean.setServiceName(member.getServiceName()); memberBean.setClusterId(member.getClusterId()); memberBean.setMemberId(member.getMemberId()); + memberBean.setInstanceId(member.getInstanceId()); memberBean.setClusterInstanceId(member.getClusterInstanceId()); memberBean.setLbClusterId(member.getLbClusterId()); @@ -703,6 +704,7 @@ public class ObjectConverter { memberBean.setNetworkPartitionId(member.getNetworkPartitionId()); memberBean.setPartitionId(member.getPartitionId()); memberBean.setMemberId(member.getMemberId()); + memberBean.setInstanceId(member.getInstanceId()); memberBean.setClusterInstanceId(member.getClusterInstanceId()); memberBean.setDefaultPrivateIP(member.getDefaultPrivateIP()); memberBean.setDefaultPublicIP(member.getDefaultPublicIP()); http://git-wip-us.apache.org/repos/asf/stratos/blob/27ba632f/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCMTAppTenantUserTestCase.java ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCMTAppTenantUserTestCase.java b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCMTAppTenantUserTestCase.java index 87e216b..26c52d1 100644 --- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCMTAppTenantUserTestCase.java +++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCMTAppTenantUserTestCase.java @@ -46,6 +46,7 @@ public class ADCMTAppTenantUserTestCase extends PythonAgentIntegrationTest { private static final String AUTOSCALING_POLICY_NAME = "autoscaling-policy-4"; private static final String APP_ID = "application-4"; private static final String MEMBER_ID = "tomcat.member-1"; + private static final String INSTANCE_ID = "instance-1"; private static final String CLUSTER_INSTANCE_ID = "cluster-1-instance-1"; private static final String NETWORK_PARTITION_ID = "network-partition-1"; private static final String PARTITION_ID = "partition-1"; @@ -140,7 +141,7 @@ public class ADCMTAppTenantUserTestCase extends PythonAgentIntegrationTest { log.info("Publishing member initialized event..."); MemberInitializedEvent memberInitializedEvent = new MemberInitializedEvent( SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, - PARTITION_ID + PARTITION_ID, INSTANCE_ID ); publishEvent(memberInitializedEvent); log.info("Member initialized event published"); http://git-wip-us.apache.org/repos/asf/stratos/blob/27ba632f/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCMTAppTestCase.java ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCMTAppTestCase.java b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCMTAppTestCase.java index c07aecb..f677629 100644 --- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCMTAppTestCase.java +++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCMTAppTestCase.java @@ -47,6 +47,7 @@ public class ADCMTAppTestCase extends PythonAgentIntegrationTest { private static final String AUTOSCALING_POLICY_NAME = "autoscaling-policy-3"; private static final String APP_ID = "application-3"; private static final String MEMBER_ID = "tomcat.member-1"; + private static final String INSTANCE_ID = "instance-1"; private static final String CLUSTER_INSTANCE_ID = "cluster-1-instance-1"; private static final String NETWORK_PARTITION_ID = "network-partition-1"; private static final String PARTITION_ID = "partition-1"; @@ -142,7 +143,7 @@ public class ADCMTAppTestCase extends PythonAgentIntegrationTest { log.info("Publishing member initialized event..."); MemberInitializedEvent memberInitializedEvent = new MemberInitializedEvent( SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, - PARTITION_ID + PARTITION_ID, INSTANCE_ID ); publishEvent(memberInitializedEvent); log.info("Member initialized event published"); http://git-wip-us.apache.org/repos/asf/stratos/blob/27ba632f/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCTestCase.java ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCTestCase.java b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCTestCase.java index 2c6cbcc..14797e4 100755 --- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCTestCase.java +++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/ADCTestCase.java @@ -51,6 +51,7 @@ public class ADCTestCase extends PythonAgentIntegrationTest { private static final String AUTOSCALING_POLICY_NAME = "autoscaling-policy-2"; private static final String APP_ID = "application-2"; private static final String MEMBER_ID = "tomcat.member-1"; + private static final String INSTANCE_ID = "instance-1"; private static final String CLUSTER_INSTANCE_ID = "cluster-1-instance-1"; private static final String NETWORK_PARTITION_ID = "network-partition-1"; private static final String PARTITION_ID = "partition-1"; @@ -198,7 +199,8 @@ public class ADCTestCase extends PythonAgentIntegrationTest { // Publish member initialized event log.info("Publishing member initialized event..."); MemberInitializedEvent memberInitializedEvent = new MemberInitializedEvent(SERVICE_NAME, - CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, PARTITION_ID); + CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, PARTITION_ID, + INSTANCE_ID); publishEvent(memberInitializedEvent); log.info("Member initialized event published"); } http://git-wip-us.apache.org/repos/asf/stratos/blob/27ba632f/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/AgentStartupTestCase.java ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/AgentStartupTestCase.java b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/AgentStartupTestCase.java index ba8e8ec..8f80013 100755 --- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/AgentStartupTestCase.java +++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/AgentStartupTestCase.java @@ -47,6 +47,7 @@ public class AgentStartupTestCase extends PythonAgentIntegrationTest { private static final String AUTOSCALING_POLICY_NAME = "autoscaling-policy-1"; private static final String APP_ID = "application-1"; private static final String MEMBER_ID = "php.member-1"; + private static final String INSTANCE_ID = "instance-1"; private static final String CLUSTER_INSTANCE_ID = "cluster-1-instance-1"; private static final String NETWORK_PARTITION_ID = "network-partition-1"; private static final String PARTITION_ID = "partition-1"; @@ -110,7 +111,7 @@ public class AgentStartupTestCase extends PythonAgentIntegrationTest { log.info("Publishing member initialized event..."); MemberInitializedEvent memberInitializedEvent = new MemberInitializedEvent( SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, - PARTITION_ID + PARTITION_ID, INSTANCE_ID ); publishEvent(memberInitializedEvent); log.info("Member initialized event published");
