adding group startup order samples
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a022edde Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a022edde Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a022edde Branch: refs/heads/master Commit: a022edde00aafec2c05190e9f2a704b366ddf13d Parents: e3ba647 Author: reka <[email protected]> Authored: Mon Aug 17 23:12:56 2015 +0530 Committer: reka <[email protected]> Committed: Tue Aug 18 17:06:50 2015 +0530 ---------------------------------------------------------------------- .../application/GroupStartupOrderTest.java | 345 ++++-- ...cation-policy-application-bursting-test.json | 18 - ...ication-policy-group-startup-order-test.json | 18 + .../app-bursting-single-cartriddge-group.json | 148 --- .../applications/group-startup-order-test.json | 148 +++ ...caling-policy-application-bursting-test.json | 14 - ...scaling-policy-group-startup-order-test.json | 14 + ...esb-php-group-application-bursting-test.json | 19 - .../esb-php-group-startup-order-test.json | 19 + .../group6-group-startup-order-test.json | 19 + .../group6-start-order-test.json | 19 - .../mock/esb-application-bursting-test.json | 50 - .../mock/esb-group-startup-order-test.json | 50 + .../mock/group-8-group-startup-order-test.json | 18 - .../mock/group8-group-startup-order-test.json | 18 + .../mock/php-application-bursting-test.json | 51 - .../mock/php-group-startup-order-test.json | 51 + .../mock/tomcat-application-bursting-test.json | 53 - .../mock/tomcat-group-startup-order-test.json | 6 +- ...oyment-policy-application-bursting-test.json | 32 - ...loyment-policy-group-startup-order-test.json | 18 + ...k-partition-application-bursting-test-1.json | 15 - ...k-partition-application-bursting-test-2.json | 24 - ...rk-partition-group-startup-order-test-1.json | 15 + ...rk-partition-group-startup-order-test-2.json | 24 + .../RegionOne.json | 17 - .../application-martin.json | 100 -- .../application-policy-1.json | 17 - .../application-s-g-c1-c2-c3-s.json | 130 --- .../application.json | 108 -- .../application.json.orig | 89 -- .../startup-order-termination-behavior/c1.json | 45 - .../startup-order-termination-behavior/c2.json | 45 - .../startup-order-termination-behavior/c3.json | 45 - .../startup-order-termination-behavior/c4.json | 45 - .../startup-order-termination-behavior/c5.json | 132 --- .../cartridge-groups-s-g-c1-c2-c3-s.json | 26 - .../cartridge-groups-working.json | 34 - .../cartridge-groups.json | 77 -- .../cartridge-groups.json.back | 53 - .../deploy.sh | 43 - .../economy-policy.json | 15 - .../static-1.json | 17 - .../wso2carbon 2.log | 992 ----------------- .../wso2carbon-working 2.log | 1053 ------------------ .../wso2carbon-working.log | 1053 ------------------ .../wso2carbon.log | 992 ----------------- 47 files changed, 653 insertions(+), 5681 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java index 7cd8e9f..4148a52 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/GroupStartupOrderTest.java @@ -29,94 +29,133 @@ import org.apache.stratos.integration.tests.TopologyHandler; import org.apache.stratos.messaging.domain.application.ApplicationStatus; import org.testng.annotations.Test; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import static junit.framework.Assert.*; +import static junit.framework.Assert.assertFalse; /** * Handling the startup order of the group */ public class GroupStartupOrderTest extends StratosTestServerManager { private static final Log log = LogFactory.getLog(SampleApplicationsTest.class); - private static final String RESOURCES_PATH = "/application-bursting-test"; + private static final String RESOURCES_PATH = "/group-startup-order-test"; + private static final int GROUP_ACTIVE_TIMEOUT = 300000; + @Test - public void testApplicationBusting() { + public void testTerminationBehavior() { try { - log.info("-------------------------------Started application Bursting test case-------------------------------"); + log.info("-------------------------------Started application startup order test case-------------------------------"); + + String autoscalingPolicyId = "autoscaling-policy-group-startup-order-test"; TopologyHandler topologyHandler = TopologyHandler.getInstance(); - String autoscalingPolicyId = "autoscaling-policy-application-bursting-test"; boolean addedScalingPolicy = restClient.addEntity(RESOURCES_PATH + RestConstants.AUTOSCALING_POLICIES_PATH + "/" + autoscalingPolicyId + ".json", RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME); - assertEquals(addedScalingPolicy, true); + assertTrue(addedScalingPolicy); + + boolean addedC1 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGES_PATH + "/" + "esb-group-startup-order-test.json", + RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); + assertTrue(addedC1); - boolean addedC1 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGES_PATH + "/" + "esb-application-bursting-test.json", + boolean addedC2 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGES_PATH + "/" + "php-group-startup-order-test.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); - assertEquals(addedC1, true); + assertTrue(addedC2); - boolean addedC2 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGES_PATH + "/" + "php-application-bursting-test.json", + boolean addedC3 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGES_PATH + "/" + "stratos-lb-group-startup-order-test.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); - assertEquals(addedC2, true); + assertTrue(addedC3); - boolean addedC3 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGES_PATH + "/" + "tomcat-application-bursting-test.json", + boolean addedC4 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGES_PATH + "/" + "group8-group-startup-order-test.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); - assertEquals(addedC3, true); + assertTrue(addedC4); + + boolean addedC5 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGES_PATH + "/" + "tomcat1-group-startup-order-test.json", + RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); + assertTrue(addedC5); + + boolean addedC6 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGES_PATH + "/" + "tomcat2-group-startup-order-test.json", + RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); + assertTrue(addedC6); + + boolean addedC7 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGES_PATH + "/" + "tomcat3-group-startup-order-test.json", + RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); + assertTrue(addedC7); + + boolean addedC8 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGES_PATH + "/" + "tomcat-group-startup-order-test.json", + RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); + assertTrue(addedC8); boolean addedG1 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGE_GROUPS_PATH + - "/" + "esb-php-group-application-bursting-test.json", RestConstants.CARTRIDGE_GROUPS, + "/" + "esb-php-group-startup-order-test.json", RestConstants.CARTRIDGE_GROUPS, RestConstants.CARTRIDGE_GROUPS_NAME); - assertEquals(addedG1, true); + assertTrue(addedG1); - CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient. - getEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group-application-bursting-test", - CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME); - assertEquals(beanG1.getName(), "esb-php-group-application-bursting-test"); + boolean addedG2 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGE_GROUPS_PATH + + "/" + "group6-group-startup-order-test.json", RestConstants.CARTRIDGE_GROUPS, + RestConstants.CARTRIDGE_GROUPS_NAME); + assertTrue(addedG2); - boolean addedN1 = restClient.addEntity(RESOURCES_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + - "network-partition-application-bursting-test-1.json", - RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); - assertEquals(addedN1, true); + boolean addedG3 = restClient.addEntity(RESOURCES_PATH + RestConstants.CARTRIDGE_GROUPS_PATH + + "/" + "group-8-group-startup-order-test.json", RestConstants.CARTRIDGE_GROUPS, + RestConstants.CARTRIDGE_GROUPS_NAME); + assertTrue(addedG3); - boolean addedN2 = restClient.addEntity(RESOURCES_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + - "network-partition-application-bursting-test-2.json", + boolean addedN1 = restClient.addEntity(RESOURCES_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + + "network-partition-group-startup-order-test-1.json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); - assertEquals(addedN2, true); + assertTrue(addedN1); boolean addedDep = restClient.addEntity(RESOURCES_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" + - "deployment-policy-application-bursting-test.json", + "deployment-policy-group-startup-order-test.json", RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME); - assertEquals(addedDep, true); + assertTrue(addedDep); boolean added = restClient.addEntity(RESOURCES_PATH + RestConstants.APPLICATIONS_PATH + "/" + - "app-bursting-single-cartriddge-group.json", RestConstants.APPLICATIONS, + "group-startup-order-test.json", RestConstants.APPLICATIONS, RestConstants.APPLICATIONS_NAME); - assertEquals(added, true); + assertTrue(added); ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS, - "application-bursting-test", ApplicationBean.class, RestConstants.APPLICATIONS_NAME); - assertEquals(bean.getApplicationId(), "application-bursting-test"); + "group-startup-order-test", ApplicationBean.class, RestConstants.APPLICATIONS_NAME); + assertEquals(bean.getApplicationId(), "group-startup-order-test"); boolean addAppPolicy = restClient.addEntity(RESOURCES_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" + - "application-policy-application-bursting-test.json", RestConstants.APPLICATION_POLICIES, - RestConstants.APPLICATION_POLICIES_NAME); - assertEquals(addAppPolicy, true); - - ApplicationPolicyBean policyBean = (ApplicationPolicyBean) restClient.getEntity( - RestConstants.APPLICATION_POLICIES, - "application-policy-application-bursting-test", ApplicationPolicyBean.class, + "application-policy-group-startup-order-test.json", RestConstants.APPLICATION_POLICIES, RestConstants.APPLICATION_POLICIES_NAME); + assertTrue(addAppPolicy); //deploy the application - String resourcePath = RestConstants.APPLICATIONS + "/" + "application-bursting-test" + - RestConstants.APPLICATIONS_DEPLOY + "/" + "application-policy-application-bursting-test"; + String resourcePath = RestConstants.APPLICATIONS + "/" + "group-startup-order-test" + + RestConstants.APPLICATIONS_DEPLOY + "/" + "application-policy-group-startup-order-test"; boolean deployed = restClient.deployEntity(resourcePath, RestConstants.APPLICATIONS_NAME); - assertEquals(deployed, true); + assertTrue(deployed); //Application active handling topologyHandler.assertApplicationStatus(bean.getApplicationId(), ApplicationStatus.Active); + String groupId = topologyHandler.generateId(bean.getApplicationId(), + "g-G1-1x0-group-startup-order-test", bean.getApplicationId() + "-1"); + + String clusterIdC3 = topologyHandler. + getClusterIdFromAlias(bean.getApplicationId(), + "c3-1x0-group-startup-order-test"); + + String clusterIdC4 = topologyHandler. + getClusterIdFromAlias(bean.getApplicationId(), + "c4-1x0-group-startup-order-test"); + + String clusterIdC2 = topologyHandler. + getClusterIdFromAlias(bean.getApplicationId(), + "c2-1x0-group-startup-order-test"); + + /*assertCreationOfNodes(groupId, clusterIdC2); + assertCreationOfNodes(clusterIdC3, clusterIdC4); //Group active handling topologyHandler.assertGroupActivation(bean.getApplicationId()); @@ -124,103 +163,231 @@ public class GroupStartupOrderTest extends StratosTestServerManager { //Cluster active handling topologyHandler.assertClusterActivation(bean.getApplicationId()); - boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group-application-bursting-test", + List<String> clusterIds = new ArrayList<String>(); + clusterIds.add(clusterIdC3); + clusterIds.add(clusterIdC4); + clusterIds.add(clusterIdC2); + + assertGroupInactive(groupId, clusterIdC3); + + assertTerminatingOfNodes(groupId, clusterIds); + + assertTerminationOfNodes(groupId, clusterIds); + + //Application active handling + topologyHandler.assertApplicationStatus(bean.getApplicationId(), + ApplicationStatus.Active); + + assertCreationOfNodes(groupId, clusterIdC2); + + assertCreationOfNodes(clusterIdC3, clusterIdC4); + + //Group active handling + topologyHandler.assertGroupActivation(bean.getApplicationId()); + + //Cluster active handling + topologyHandler.assertClusterActivation(bean.getApplicationId());*/ + + boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, + "g-sc-G4-group-startup-order-test", RestConstants.CARTRIDGE_GROUPS_NAME); - assertEquals(removedGroup, false); + assertFalse(removedGroup); boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES, autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME); - assertEquals(removedAuto, false); + assertFalse(removedAuto); boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, - "network-partition-application-bursting-test-1", + "network-partition-group-startup-order-test-1", RestConstants.NETWORK_PARTITIONS_NAME); //Trying to remove the used network partition - assertEquals(removedNet, false); + assertFalse(removedNet); boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES, - "deployment-policy-application-bursting-test", RestConstants.DEPLOYMENT_POLICIES_NAME); - assertEquals(removedDep, false); + "deployment-policy-group-startup-order-test", RestConstants.DEPLOYMENT_POLICIES_NAME); + assertFalse(removedDep); //Un-deploying the application - String resourcePathUndeploy = RestConstants.APPLICATIONS + "/" + "application-bursting-test" + + String resourcePathUndeploy = RestConstants.APPLICATIONS + "/" + "group-startup-order-test" + RestConstants.APPLICATIONS_UNDEPLOY; boolean unDeployed = restClient.undeployEntity(resourcePathUndeploy, RestConstants.APPLICATIONS_NAME); - assertEquals(unDeployed, true); + assertTrue(unDeployed); - boolean undeploy = topologyHandler.assertApplicationUndeploy("application-bursting-test"); + boolean undeploy = topologyHandler.assertApplicationUndeploy("group-startup-order-test"); if (!undeploy) { //Need to forcefully undeploy the application - log.info("Force undeployment is going to start for the [application] " + "application-bursting-test"); + log.info("Force undeployment is going to start for the [application] " + "group-startup-order-test"); - restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "application-bursting-test" + + restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "group-startup-order-test" + RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS); - boolean forceUndeployed = topologyHandler.assertApplicationUndeploy("application-bursting-test"); - assertEquals(String.format("Forceful undeployment failed for the application %s", - "application-bursting-test"), forceUndeployed, true); + boolean forceUndeployed = topologyHandler.assertApplicationUndeploy("group-startup-order-test"); + assertTrue(String.format("Forceful undeployment failed for the application %s", + "group-startup-order-test"), forceUndeployed); } - boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "application-bursting-test", + boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "group-startup-order-test", RestConstants.APPLICATIONS_NAME); - assertEquals(removed, true); + assertTrue(removed); ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS, - "application-bursting-test", ApplicationBean.class, RestConstants.APPLICATIONS_NAME); - assertEquals(beanRemoved, null); + "group-startup-order-test", ApplicationBean.class, RestConstants.APPLICATIONS_NAME); + assertNull(beanRemoved); - removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group-application-bursting-test", + removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, + "g-sc-G4-group-startup-order-test", RestConstants.CARTRIDGE_GROUPS_NAME); - assertEquals(removedGroup, true); + assertTrue(removedGroup); + + boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "c1-group-startup-order-test", + RestConstants.CARTRIDGES_NAME); + assertTrue(removedC1); - boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "esb-application-bursting-test", + boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "c2-group-startup-order-test", RestConstants.CARTRIDGES_NAME); - assertEquals(removedC1, true); + assertTrue(removedC2); - boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "php-application-bursting-test", + boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "c3-group-startup-order-test", RestConstants.CARTRIDGES_NAME); - assertEquals(removedC2, true); + assertTrue(removedC3); - boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "tomcat-application-bursting-test", + boolean removedC4 = restClient.removeEntity(RestConstants.CARTRIDGES, "c4-group-startup-order-test", RestConstants.CARTRIDGES_NAME); - assertEquals(removedC3, true); + assertTrue(removedC4); removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES, autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME); - assertEquals(removedAuto, true); + assertTrue(removedAuto); removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES, - "deployment-policy-application-bursting-test", RestConstants.DEPLOYMENT_POLICIES_NAME); - assertEquals(removedDep, true); + "deployment-policy-group-startup-order-test", RestConstants.DEPLOYMENT_POLICIES_NAME); + assertTrue(removedDep); removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, - "network-partition-application-bursting-test-1", RestConstants.NETWORK_PARTITIONS_NAME); - assertEquals(removedNet, false); - - boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, - "network-partition-application-bursting-test-2", RestConstants.NETWORK_PARTITIONS_NAME); - assertEquals(removedN2, false); + "network-partition-group-startup-order-test-1", RestConstants.NETWORK_PARTITIONS_NAME); + assertFalse(removedNet); boolean removeAppPolicy = restClient.removeEntity(RestConstants.APPLICATION_POLICIES, - "application-policy-application-bursting-test", RestConstants.APPLICATION_POLICIES_NAME); - assertEquals(removeAppPolicy, true); + "application-policy-group-startup-order-test", RestConstants.APPLICATION_POLICIES_NAME); + assertTrue(removeAppPolicy); removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, - "network-partition-application-bursting-test-1", RestConstants.NETWORK_PARTITIONS_NAME); - assertEquals(removedNet, true); - - removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, - "network-partition-application-bursting-test-2", RestConstants.NETWORK_PARTITIONS_NAME); - assertEquals(removedN2, true); + "network-partition-group-startup-order-test-1", RestConstants.NETWORK_PARTITIONS_NAME); + assertTrue(removedNet); - log.info("-------------------------------Ended application bursting test case-------------------------------"); + log.info("-------------------------------Ended application termination behavior test case-------------------------------"); } catch (Exception e) { - log.error("An error occurred while handling application bursting", e); - assertTrue("An error occurred while handling application bursting", false); + log.error("An error occurred while handling application termination behavior", e); + assertTrue("An error occurred while handling application termination behavior", false); } } + + private void assertGroupInactive(String groupId, String clusterId) { + long startTime = System.currentTimeMillis(); + Map<String, Long> inActiveMap = TopologyHandler.getInstance().getInActiveMembers(); + + while (!inActiveMap.containsKey(clusterId)) { + try { + Thread.sleep(1000); + } catch (InterruptedException ignore) { + } + inActiveMap = TopologyHandler.getInstance().getInActiveMembers(); + if ((System.currentTimeMillis() - startTime) > GROUP_ACTIVE_TIMEOUT) { + break; + } + } + assertTrue(inActiveMap.containsKey(clusterId)); + + while (!inActiveMap.containsKey(groupId)) { + try { + Thread.sleep(1000); + } catch (InterruptedException ignore) { + } + inActiveMap = TopologyHandler.getInstance().getInActiveMembers(); + if ((System.currentTimeMillis() - startTime) > GROUP_ACTIVE_TIMEOUT) { + break; + } + } + assertTrue(inActiveMap.containsKey(groupId)); + + } + + private void assertTerminatingOfNodes(String groupId, List<String> clusterIds) { + Map<String, Long> terminatingMembers = TopologyHandler.getInstance().getTerminatingMembers(); + for (String clusterId : clusterIds) { + long startTime = System.currentTimeMillis(); + while (!terminatingMembers.containsKey(clusterId)) { + try { + Thread.sleep(1000); + } catch (InterruptedException ignore) { + } + terminatingMembers = TopologyHandler.getInstance().getTerminatingMembers(); + if ((System.currentTimeMillis() - startTime) > GROUP_ACTIVE_TIMEOUT) { + break; + } + } + assertTrue(terminatingMembers.containsKey(groupId)); + } + long startTime = System.currentTimeMillis(); + while (!terminatingMembers.containsKey(groupId)) { + try { + Thread.sleep(1000); + } catch (InterruptedException ignore) { + } + terminatingMembers = TopologyHandler.getInstance().getTerminatingMembers(); + if ((System.currentTimeMillis() - startTime) > GROUP_ACTIVE_TIMEOUT) { + break; + } + } + assertTrue(terminatingMembers.containsKey(groupId)); + + } + + private void assertTerminationOfNodes(String groupId, List<String> clusterIds) { + long startTime = System.currentTimeMillis(); + Map<String, Long> terminatedMembers = TopologyHandler.getInstance().getTerminatedMembers(); + + for (String clusterId : clusterIds) { + while (!terminatedMembers.containsKey(clusterId)) { + try { + Thread.sleep(1000); + } catch (InterruptedException ignore) { + } + terminatedMembers = TopologyHandler.getInstance().getTerminatedMembers(); + if ((System.currentTimeMillis() - startTime) > GROUP_ACTIVE_TIMEOUT) { + break; + } + } + assertTrue(terminatedMembers.containsKey(clusterId)); + } + + while (!terminatedMembers.containsKey(groupId)) { + try { + Thread.sleep(1000); + } catch (InterruptedException ignore) { + } + terminatedMembers = TopologyHandler.getInstance().getTerminatedMembers(); + if ((System.currentTimeMillis() - startTime) > GROUP_ACTIVE_TIMEOUT) { + break; + } + } + + assertTrue(terminatedMembers.containsKey(groupId)); + } + + private void assertCreationOfNodes(String firstNodeId, String secondNodeId) { + //group1 started first, then cluster started later + + Map<String, Long> activeMembers = TopologyHandler.getInstance().getActivateddMembers(); + Map<String, Long> createdMembers = TopologyHandler.getInstance().getCreatedMembers(); + //Active member should be available at the time cluster is started to create. + assertTrue(activeMembers.containsKey(firstNodeId)); + assertTrue(createdMembers.containsKey(secondNodeId)); + + assertTrue(createdMembers.get(secondNodeId) > activeMembers.get(firstNodeId)); + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-application-bursting-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-application-bursting-test.json deleted file mode 100644 index 7bc9c2d..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-application-bursting-test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "application-policy-group-startup-order-test", - "algorithm": "one-after-another", - "networkPartitions": [ - "network-partition-group-startup-order-test-1", - "network-partition-group-startup-order-test-2" - ], - "properties": [ - { - "name": "networkPartitionGroups", - "value": "network-partition-group-startup-order-test-1|network-partition-group-startup-order-test-2" - }, - { - "name": "key-2", - "value": "value-2" - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-group-startup-order-test.json new file mode 100644 index 0000000..7bc9c2d --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-group-startup-order-test.json @@ -0,0 +1,18 @@ +{ + "id": "application-policy-group-startup-order-test", + "algorithm": "one-after-another", + "networkPartitions": [ + "network-partition-group-startup-order-test-1", + "network-partition-group-startup-order-test-2" + ], + "properties": [ + { + "name": "networkPartitionGroups", + "value": "network-partition-group-startup-order-test-1|network-partition-group-startup-order-test-2" + }, + { + "name": "key-2", + "value": "value-2" + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json deleted file mode 100644 index 8689fd8..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "applicationId": "group-startup-order-test", - "alias": "group-startup-order-test", - "components": { - "groups": [ - { - "name": "group6-group-startup-order-test", - "alias": "my-group6-group-startup-order-test", - "groupMinInstances": 1, - "groupMaxInstances": 1, - "deploymentPolicy": "deployment-policy-group-startup-order-test", - "groups": [ - { - "name": "group7-group-startup-order-test", - "alias": "my-group7-group-startup-order-test", - "groupMinInstances": 1, - "groupMaxInstances": 1, - "cartridges": [ - { - "type": "tomcat1", - "cartridgeMin": 1, - "cartridgeMax": 2, - "subscribableInfo": { - "alias": "my-tomcat1-group7", - "autoscalingPolicy": "autoscaling-policy-1", - "artifactRepository": { - "privateRepo": false, - "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git";, - "repoUsername": "", - "repoPassword": "" - } - } - } - ] - } - ], - "cartridges": [ - { - "type": "tomcat2", - "cartridgeMin": 1, - "cartridgeMax": 2, - "subscribableInfo": { - "alias": "my-tomcat2-group6", - "autoscalingPolicy": "autoscaling-policy-1", - "artifactRepository": { - "privateRepo": false, - "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git";, - "repoUsername": "", - "repoPassword": "" - } - } - } - ] - }, - { - "name": "group8", - "alias": "my-group8", - "groupMinInstances": 1, - "groupMaxInstances": 1, - "deploymentPolicy": "deployment-policy-1", - "groups": [ - { - "name": "group9", - "alias": "my-group9", - "groupMinInstances": 1, - "groupMaxInstances": 1, - "cartridges": [ - { - "type": "tomcat1", - "cartridgeMin": 1, - "cartridgeMax": 2, - "subscribableInfo": { - "alias": "my-tomcat1-group9", - "autoscalingPolicy": "autoscaling-policy-1", - "artifactRepository": { - "privateRepo": false, - "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git";, - "repoUsername": "", - "repoPassword": "" - } - } - } - ] - } - ], - "cartridges": [ - { - "type": "tomcat2", - "cartridgeMin": 1, - "cartridgeMax": 2, - "subscribableInfo": { - "alias": "my-tomcat2-group8", - "autoscalingPolicy": "autoscaling-policy-1", - "artifactRepository": { - "privateRepo": false, - "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git";, - "repoUsername": "", - "repoPassword": "" - } - } - } - ] - } - ], - "cartridges": [ - { - "type": "stratos-lb", - "cartridgeMin": 1, - "cartridgeMax": 2, - "subscribableInfo": { - "alias": "my-stratos-lb", - "autoscalingPolicy": "autoscaling-policy-1", - "deploymentPolicy": "deployment-policy-1" - } - }, - { - "type": "tomcat", - "cartridgeMin": 1, - "cartridgeMax": 2, - "subscribableInfo": { - "alias": "my-tomcat", - "autoscalingPolicy": "autoscaling-policy-1", - "deploymentPolicy": "deployment-policy-1", - "artifactRepository": { - "privateRepo": false, - "repoUrl": "https://github.com/imesh/stratos-tomcat-applications.git";, - "repoUsername": "", - "repoPassword": "" - } - } - } - ], - "dependencies": { - "startupOrders": [ - { - "aliases": [ - "cartridge.my-tomcat", - "cartridge.my-stratos-lb", - "group.my-group6", - "group.my-group8" - ] - } - ], - "terminationBehaviour": "terminate-all" - } - } -} - http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/group-startup-order-test.json new file mode 100644 index 0000000..8689fd8 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/group-startup-order-test.json @@ -0,0 +1,148 @@ +{ + "applicationId": "group-startup-order-test", + "alias": "group-startup-order-test", + "components": { + "groups": [ + { + "name": "group6-group-startup-order-test", + "alias": "my-group6-group-startup-order-test", + "groupMinInstances": 1, + "groupMaxInstances": 1, + "deploymentPolicy": "deployment-policy-group-startup-order-test", + "groups": [ + { + "name": "group7-group-startup-order-test", + "alias": "my-group7-group-startup-order-test", + "groupMinInstances": 1, + "groupMaxInstances": 1, + "cartridges": [ + { + "type": "tomcat1", + "cartridgeMin": 1, + "cartridgeMax": 2, + "subscribableInfo": { + "alias": "my-tomcat1-group7", + "autoscalingPolicy": "autoscaling-policy-1", + "artifactRepository": { + "privateRepo": false, + "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git";, + "repoUsername": "", + "repoPassword": "" + } + } + } + ] + } + ], + "cartridges": [ + { + "type": "tomcat2", + "cartridgeMin": 1, + "cartridgeMax": 2, + "subscribableInfo": { + "alias": "my-tomcat2-group6", + "autoscalingPolicy": "autoscaling-policy-1", + "artifactRepository": { + "privateRepo": false, + "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git";, + "repoUsername": "", + "repoPassword": "" + } + } + } + ] + }, + { + "name": "group8", + "alias": "my-group8", + "groupMinInstances": 1, + "groupMaxInstances": 1, + "deploymentPolicy": "deployment-policy-1", + "groups": [ + { + "name": "group9", + "alias": "my-group9", + "groupMinInstances": 1, + "groupMaxInstances": 1, + "cartridges": [ + { + "type": "tomcat1", + "cartridgeMin": 1, + "cartridgeMax": 2, + "subscribableInfo": { + "alias": "my-tomcat1-group9", + "autoscalingPolicy": "autoscaling-policy-1", + "artifactRepository": { + "privateRepo": false, + "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git";, + "repoUsername": "", + "repoPassword": "" + } + } + } + ] + } + ], + "cartridges": [ + { + "type": "tomcat2", + "cartridgeMin": 1, + "cartridgeMax": 2, + "subscribableInfo": { + "alias": "my-tomcat2-group8", + "autoscalingPolicy": "autoscaling-policy-1", + "artifactRepository": { + "privateRepo": false, + "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git";, + "repoUsername": "", + "repoPassword": "" + } + } + } + ] + } + ], + "cartridges": [ + { + "type": "stratos-lb", + "cartridgeMin": 1, + "cartridgeMax": 2, + "subscribableInfo": { + "alias": "my-stratos-lb", + "autoscalingPolicy": "autoscaling-policy-1", + "deploymentPolicy": "deployment-policy-1" + } + }, + { + "type": "tomcat", + "cartridgeMin": 1, + "cartridgeMax": 2, + "subscribableInfo": { + "alias": "my-tomcat", + "autoscalingPolicy": "autoscaling-policy-1", + "deploymentPolicy": "deployment-policy-1", + "artifactRepository": { + "privateRepo": false, + "repoUrl": "https://github.com/imesh/stratos-tomcat-applications.git";, + "repoUsername": "", + "repoPassword": "" + } + } + } + ], + "dependencies": { + "startupOrders": [ + { + "aliases": [ + "cartridge.my-tomcat", + "cartridge.my-stratos-lb", + "group.my-group6", + "group.my-group8" + ] + } + ], + "terminationBehaviour": "terminate-all" + } + } +} + http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json deleted file mode 100644 index 0c6ec97..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "autoscaling-policy-group-startup-order-test", - "loadThresholds": { - "requestsInFlight": { - "threshold": 35 - }, - "memoryConsumption": { - "threshold": 45 - }, - "loadAverage": { - "threshold": 25 - } - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-group-startup-order-test.json new file mode 100644 index 0000000..0c6ec97 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-group-startup-order-test.json @@ -0,0 +1,14 @@ +{ + "id": "autoscaling-policy-group-startup-order-test", + "loadThresholds": { + "requestsInFlight": { + "threshold": 35 + }, + "memoryConsumption": { + "threshold": 45 + }, + "loadAverage": { + "threshold": 25 + } + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-application-bursting-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-application-bursting-test.json deleted file mode 100644 index 9c7d997..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-application-bursting-test.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "esb-php-group-group-startup-order-test", - "cartridges": [ - "esb-group-startup-order-test", - "php-group-startup-order-test" - ], - "dependencies": { - "startupOrders": [ - { - "aliases": [ - "cartridge.my-esb-group-startup-order-test", - "cartridge.my-php-group-startup-order-test" - ] - } - ], - "terminationBehaviour": "terminate-none" - } -} - http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-startup-order-test.json new file mode 100644 index 0000000..9c7d997 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-startup-order-test.json @@ -0,0 +1,19 @@ +{ + "name": "esb-php-group-group-startup-order-test", + "cartridges": [ + "esb-group-startup-order-test", + "php-group-startup-order-test" + ], + "dependencies": { + "startupOrders": [ + { + "aliases": [ + "cartridge.my-esb-group-startup-order-test", + "cartridge.my-php-group-startup-order-test" + ] + } + ], + "terminationBehaviour": "terminate-none" + } +} + http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-group-startup-order-test.json new file mode 100644 index 0000000..6601222 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-group-startup-order-test.json @@ -0,0 +1,19 @@ +{ + "name": "group6-group-startup-order-test", + "cartridges": [ + "tomcat2-group-startup-order-test", + "tomcat1-group-startup-order-test" + ], + "dependencies": { + "startupOrders": [ + { + "aliases": [ + "cartridge.my-tomcat2-group-startup-order-test", + "cartridge.my-tomcat1-group-startup-order-test" + ] + } + ], + "terminationBehaviour": "terminate-all" + } +} + http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-start-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-start-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-start-order-test.json deleted file mode 100644 index 6601222..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-start-order-test.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "group6-group-startup-order-test", - "cartridges": [ - "tomcat2-group-startup-order-test", - "tomcat1-group-startup-order-test" - ], - "dependencies": { - "startupOrders": [ - { - "aliases": [ - "cartridge.my-tomcat2-group-startup-order-test", - "cartridge.my-tomcat1-group-startup-order-test" - ] - } - ], - "terminationBehaviour": "terminate-all" - } -} - http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-application-bursting-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-application-bursting-test.json deleted file mode 100755 index b6f428e..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-application-bursting-test.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "type": "esb-group-startup-order-test", - "provider": "apache", - "host": "stratos.apache.org", - "category": "framework", - "displayName": "esb-group-startup-order-test", - "description": "esb-group-startup-order-test Cartridge", - "version": "7", - "multiTenant": "false", - "portMapping": [ - { - "name": "http-22", - "protocol": "http", - "port": "22", - "proxyPort": "8280" - } - ], - "deployment": { - }, - "iaasProvider": [ - { - "type": "mock", - "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e", - "networkInterfaces": [ - { - "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" - } - ], - "property": [ - { - "name": "instanceType", - "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" - }, - { - "name": "keyPair", - "value": "vishanth-key" - }, - { - "name": "securityGroups", - "value": "default" - } - ] - } - ], - "metadataKeys": [ - "server_ip", - "username", - "password" - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-group-startup-order-test.json new file mode 100755 index 0000000..b6f428e --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-group-startup-order-test.json @@ -0,0 +1,50 @@ +{ + "type": "esb-group-startup-order-test", + "provider": "apache", + "host": "stratos.apache.org", + "category": "framework", + "displayName": "esb-group-startup-order-test", + "description": "esb-group-startup-order-test Cartridge", + "version": "7", + "multiTenant": "false", + "portMapping": [ + { + "name": "http-22", + "protocol": "http", + "port": "22", + "proxyPort": "8280" + } + ], + "deployment": { + }, + "iaasProvider": [ + { + "type": "mock", + "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e", + "networkInterfaces": [ + { + "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" + } + ], + "property": [ + { + "name": "instanceType", + "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" + }, + { + "name": "keyPair", + "value": "vishanth-key" + }, + { + "name": "securityGroups", + "value": "default" + } + ] + } + ], + "metadataKeys": [ + "server_ip", + "username", + "password" + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group-8-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group-8-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group-8-group-startup-order-test.json deleted file mode 100644 index 9bd63d9..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group-8-group-startup-order-test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "group8-group-startup-order-test", - "groups": [ - { - "name": "group9-group-startup-order-test", - "cartridges": [ - "tomcat1-group-startup-order-test" - ] - } - ], - "cartridges": [ - "tomcat2-group-startup-order-test" - ], - "dependencies": { - "terminationBehaviour": "terminate-all" - } -} - http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group8-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group8-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group8-group-startup-order-test.json new file mode 100644 index 0000000..9bd63d9 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group8-group-startup-order-test.json @@ -0,0 +1,18 @@ +{ + "name": "group8-group-startup-order-test", + "groups": [ + { + "name": "group9-group-startup-order-test", + "cartridges": [ + "tomcat1-group-startup-order-test" + ] + } + ], + "cartridges": [ + "tomcat2-group-startup-order-test" + ], + "dependencies": { + "terminationBehaviour": "terminate-all" + } +} + http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-application-bursting-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-application-bursting-test.json deleted file mode 100755 index 95f78a5..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-application-bursting-test.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "type": "php-group-startup-order-test", - "provider": "apache", - "category": "framework", - "host": "php.stratos.org", - "displayName": "php-group-startup-order-test", - "description": "php-group-startup-order-test Cartridge", - "version": "7", - "multiTenant": "false", - "portMapping": [ - { - "name": "http-80", - "protocol": "http", - "port": "8080", - "proxyPort": "8280" - }, - { - "name": "http-22", - "protocol": "tcp", - "port": "22", - "proxyPort": "8222" - } - ], - "deployment": { - }, - "iaasProvider": [ - { - "type": "mock", - "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e", - "networkInterfaces": [ - { - "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" - } - ], - "property": [ - { - "name": "instanceType", - "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" - }, - { - "name": "keyPair", - "value": "reka" - }, - { - "name": "securityGroups", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-group-startup-order-test.json new file mode 100755 index 0000000..95f78a5 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-group-startup-order-test.json @@ -0,0 +1,51 @@ +{ + "type": "php-group-startup-order-test", + "provider": "apache", + "category": "framework", + "host": "php.stratos.org", + "displayName": "php-group-startup-order-test", + "description": "php-group-startup-order-test Cartridge", + "version": "7", + "multiTenant": "false", + "portMapping": [ + { + "name": "http-80", + "protocol": "http", + "port": "8080", + "proxyPort": "8280" + }, + { + "name": "http-22", + "protocol": "tcp", + "port": "22", + "proxyPort": "8222" + } + ], + "deployment": { + }, + "iaasProvider": [ + { + "type": "mock", + "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e", + "networkInterfaces": [ + { + "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" + } + ], + "property": [ + { + "name": "instanceType", + "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" + }, + { + "name": "keyPair", + "value": "reka" + }, + { + "name": "securityGroups", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-application-bursting-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-application-bursting-test.json deleted file mode 100755 index 7cf895a..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-application-bursting-test.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "type": "tomcat-group-startup-order-test", - "provider": "apache", - "host": "tomcat.stratos.org", - "category": "framework", - "displayName": "tomcat-group-startup-order-test", - "description": "tomcat-group-startup-order-test Cartridge", - "version": "7", - "multiTenant": "false", - "portMapping": [ - { - "name": "http-22", - "protocol": "http", - "port": "22", - "proxyPort": "8280" - }, - { - "protocol": "http", - "port": "8080", - "proxyPort": "80" - } - ], - "deployment": { - }, - "iaasProvider": [ - { - "type": "mock", - "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e", - "networkInterfaces": [ - { - "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" - } - ], - "property": [ - { - "name": "instanceType", - "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" - }, - { - "name": "keyPair", - "value": "vishanth-key" - }, - { - "name": "securityGroups", - "value": "default" - } - ] - } - ], - "metadataKeys": [ - "url" - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json index 395687d..7cf895a 100755 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json @@ -1,10 +1,10 @@ { - "type": "tomcat", + "type": "tomcat-group-startup-order-test", "provider": "apache", "host": "tomcat.stratos.org", "category": "framework", - "displayName": "tomcat", - "description": "tomcat Cartridge", + "displayName": "tomcat-group-startup-order-test", + "description": "tomcat-group-startup-order-test Cartridge", "version": "7", "multiTenant": "false", "portMapping": [ http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/deployment-policies/deployment-policy-application-bursting-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/deployment-policies/deployment-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/deployment-policies/deployment-policy-application-bursting-test.json deleted file mode 100644 index 3813435..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/deployment-policies/deployment-policy-application-bursting-test.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "id": "deployment-policy-group-startup-order-test", - "networkPartitions": [ - { - "id": "network-partition-group-startup-order-test-1", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 4 - } - ] - }, - { - "id": "network-partition-group-startup-order-test-2", - "partitionAlgo": "round-robin", - "partitions": [ - { - "id": "network-partition-10-partition-1", - "partitionMax": 4 - }, - { - "id": "network-partition-10-partition-2", - "partitionMax": 4 - } - ] - } - ] -} - - - http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/deployment-policies/deployment-policy-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/deployment-policies/deployment-policy-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/deployment-policies/deployment-policy-group-startup-order-test.json new file mode 100644 index 0000000..72f24fc --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/deployment-policies/deployment-policy-group-startup-order-test.json @@ -0,0 +1,18 @@ +{ + "id": "deployment-policy-group-startup-order-test", + "networkPartitions": [ + { + "id": "network-partition-group-startup-order-test-1", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 4 + } + ] + } + ] +} + + + http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-application-bursting-test-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-application-bursting-test-1.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-application-bursting-test-1.json deleted file mode 100644 index 238f640..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-application-bursting-test-1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "network-partition-group-startup-order-test-1", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-application-bursting-test-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-application-bursting-test-2.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-application-bursting-test-2.json deleted file mode 100644 index 7372b78..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-application-bursting-test-2.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "id": "network-partition-group-startup-order-test-2", - "provider": "mock", - "partitions": [ - { - "id": "network-partition-10-partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - }, - { - "id": "network-partition-10-partition-2", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-group-startup-order-test-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-group-startup-order-test-1.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-group-startup-order-test-1.json new file mode 100644 index 0000000..238f640 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-group-startup-order-test-1.json @@ -0,0 +1,15 @@ +{ + "id": "network-partition-group-startup-order-test-1", + "provider": "mock", + "partitions": [ + { + "id": "partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-group-startup-order-test-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-group-startup-order-test-2.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-group-startup-order-test-2.json new file mode 100644 index 0000000..7372b78 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/network-partitions/mock/network-partition-group-startup-order-test-2.json @@ -0,0 +1,24 @@ +{ + "id": "network-partition-group-startup-order-test-2", + "provider": "mock", + "partitions": [ + { + "id": "network-partition-10-partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + }, + { + "id": "network-partition-10-partition-2", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/RegionOne.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/RegionOne.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/RegionOne.json deleted file mode 100755 index 47832db..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/RegionOne.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "RegionOne", - "provider": "mock", - "partitions": - [ - { - "id": "whole-region", - "property": - [ - { - "name": "region", - "value": "RegionOne" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-martin.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-martin.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-martin.json deleted file mode 100644 index 30cd6d0..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-martin.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "alias": "sub-G1-G2-G3-1-G4", - "applicationId": "sub-G1-G2-G3-1-G4", - "components": { - "cartridges": [], - "groups": [ - { - "name": "sub-G1-G2-G3-1", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "sub-G1-G2-G3-1", - "cartridges": [], - "groups": [ - { - "name": "multiple-groups-no-startup-G1-1", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "multiple-groups-no-startup-G1-1-0x0", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 1, - "type": "c1", - "subscribableInfo": { - "alias": "c1-1x0", - "deploymentPolicy": "static-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://octl.qmog.cisco.com:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "economyPolicy" - } - }, - { - "cartridgeMin": 1, - "cartridgeMax": 1, - "type": "c2", - "subscribableInfo": { - "alias": "c2-1x0", - "deploymentPolicy": "static-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://octl.qmog.cisco.com:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "economyPolicy" - } - } - ], - "groups": [] - }, - { - "name": "multiple-groups-no-startup-G2-1", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "multiple-groups-no-startup-G2-1-0x0", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 1, - "type": "c3", - "subscribableInfo": { - "alias": "c3-1x1", - "deploymentPolicy": "static-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://octl.qmog.cisco.com:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "economyPolicy" - } - }, - { - "cartridgeMin": 1, - "cartridgeMax": 1, - "type": "c4", - "subscribableInfo": { - "alias": "c4-1x1", - "deploymentPolicy": "static-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://octl.qmog.cisco.com:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "economyPolicy" - } - } - ], - "groups": [] - } - ] - } - ] - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-policy-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-policy-1.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-policy-1.json deleted file mode 100644 index 8fe4193..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-policy-1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "application-policy-1", - "algorithm": "one-after-another", - "networkPartitions": [ - "RegionOne" - ], - "properties": [ - { - "name": "key-1", - "value": "value-1" - }, - { - "name": "key-2", - "value": "value-2" - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/a022edde/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-s-g-c1-c2-c3-s.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-s-g-c1-c2-c3-s.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-s-g-c1-c2-c3-s.json deleted file mode 100644 index 600d291..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/startup-order-termination-behavior/application-s-g-c1-c2-c3-s.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "alias": "s-g-c1-c2-c3-s", - "applicationId": "s-g-c1-c2-c3-s", - "components": { - "cartridges": [], - "groups": [ - { - "name": "g-sc-G4", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "g-sc-G4-x0x", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 1, - "type": "c1", - "subscribableInfo": { - "alias": "c1-1x0", - "deploymentPolicy": "static-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://octl.qmog.cisco.com:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "economyPolicy" - } - } - ], - "groups": [ - { - "name": "g-G3", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "g-G3-1x0", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 1, - "type": "c2", - "subscribableInfo": { - "alias": "c2-1x0", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://octl.qmog.cisco.com:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "deploymentPolicy": "static-1", - - "autoscalingPolicy": "economyPolicy" - } - } - ], - "groups": [ - { - "name": "g-G2", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "g-G2-1x0", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 1, - "type": "c3", - "subscribableInfo": { - "alias": "c3-1x0", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://octl.qmog.cisco.com:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "deploymentPolicy": "static-1", - "autoscalingPolicy": "economyPolicy" - } - } - ], - "groups": [ - { - "deploymentPolicy": "static-1", - "name": "g-G1", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "g-G1-1x0", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 1, - "type": "c4", - "subscribableInfo": { - "alias": "c4-1x0", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://octl.qmog.cisco.com:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "economyPolicy" - } - }, - { - "cartridgeMin": 1, - "cartridgeMax": 1, - "type": "c5", - "subscribableInfo": { - "alias": "c5-1x0", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://octl.qmog.cisco.com:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "economyPolicy" - } - } - ], - "groups": [ - ] - } - ] - } - ] - } - - ] - } - ] - } -}
