fixing startup order test samples
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/27a6d761 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/27a6d761 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/27a6d761 Branch: refs/heads/master Commit: 27a6d7613e5778eec44a1e719e2680be9135585b Parents: a022edd Author: reka <[email protected]> Authored: Tue Aug 18 17:04:57 2015 +0530 Committer: reka <[email protected]> Committed: Tue Aug 18 17:06:50 2015 +0530 ---------------------------------------------------------------------- .../applications/group-startup-order-test.json | 94 ++++++++++++++------ .../esb-php-group-startup-order-test.json | 2 +- .../group-8-group-startup-order-test.json | 18 ---- .../group6-group-startup-order-test.json | 51 ++++++++--- .../group8-group-startup-order-test.json | 18 ++++ .../mock/group8-group-startup-order-test.json | 18 ---- .../stratos-lb-group-startup-order-test.json | 2 +- .../mock/tomcat1-group-startup-order-test.json | 8 +- .../mock/tomcat2-group-startup-order-test.json | 8 +- .../mock/tomcat3-group-startup-order-test.json | 2 +- .../src/test/resources/mock-iaas.xml | 22 ++--- .../src/test/resources/stratos-testing.xml | 9 +- 12 files changed, 150 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/27a6d761/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 index 8689fd8..156553f 100644 --- 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 @@ -17,12 +17,27 @@ "groupMaxInstances": 1, "cartridges": [ { - "type": "tomcat1", + "type": "tomcat-group-startup-order-test", "cartridgeMin": 1, "cartridgeMax": 2, "subscribableInfo": { - "alias": "my-tomcat1-group7", - "autoscalingPolicy": "autoscaling-policy-1", + "alias": "my-group7-tomcat-group-startup-order-test", + "autoscalingPolicy": "autoscaling-policy-group-startup-order-test", + "artifactRepository": { + "privateRepo": false, + "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git";, + "repoUsername": "", + "repoPassword": "" + } + } + }, + { + "type": "tomcat1-group-startup-order-test", + "cartridgeMin": 1, + "cartridgeMax": 2, + "subscribableInfo": { + "alias": "my-group7-tomcat1-group-startup-order-test", + "autoscalingPolicy": "autoscaling-policy-group-startup-order-test", "artifactRepository": { "privateRepo": false, "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git";, @@ -36,12 +51,27 @@ ], "cartridges": [ { - "type": "tomcat2", + "type": "tomcat2-group-startup-order-test", + "cartridgeMin": 1, + "cartridgeMax": 2, + "subscribableInfo": { + "alias": "my-group-tom2-tomcat2-group-startup-order-test", + "autoscalingPolicy": "autoscaling-policy-group-startup-order-test", + "artifactRepository": { + "privateRepo": false, + "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git";, + "repoUsername": "", + "repoPassword": "" + } + } + }, + { + "type": "tomcat3-group-startup-order-test", "cartridgeMin": 1, "cartridgeMax": 2, "subscribableInfo": { - "alias": "my-tomcat2-group6", - "autoscalingPolicy": "autoscaling-policy-1", + "alias": "my-group-tom2-tomcat3-group-startup-order-test", + "autoscalingPolicy": "autoscaling-policy-group-startup-order-test", "artifactRepository": { "privateRepo": false, "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git";, @@ -53,25 +83,25 @@ ] }, { - "name": "group8", - "alias": "my-group8", + "name": "group8-group-startup-order-test", + "alias": "my-group8-group-startup-order-test", "groupMinInstances": 1, "groupMaxInstances": 1, - "deploymentPolicy": "deployment-policy-1", + "deploymentPolicy": "deployment-policy-group-startup-order-test", "groups": [ { - "name": "group9", - "alias": "my-group9", + "name": "group9-group-startup-order-test", + "alias": "my-group9-group-startup-order-test", "groupMinInstances": 1, "groupMaxInstances": 1, "cartridges": [ { - "type": "tomcat1", + "type": "tomcat1-group-startup-order-test", "cartridgeMin": 1, "cartridgeMax": 2, "subscribableInfo": { - "alias": "my-tomcat1-group9", - "autoscalingPolicy": "autoscaling-policy-1", + "alias": "my-tomcat1-group9-group-startup-order-test", + "autoscalingPolicy": "autoscaling-policy-group-startup-order-test", "artifactRepository": { "privateRepo": false, "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git";, @@ -85,12 +115,12 @@ ], "cartridges": [ { - "type": "tomcat2", + "type": "tomcat2-group-startup-order-test", "cartridgeMin": 1, "cartridgeMax": 2, "subscribableInfo": { - "alias": "my-tomcat2-group8", - "autoscalingPolicy": "autoscaling-policy-1", + "alias": "my-tomcat2-group8-group-startup-order-test", + "autoscalingPolicy": "autoscaling-policy-group-startup-order-test", "artifactRepository": { "privateRepo": false, "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git";, @@ -104,23 +134,23 @@ ], "cartridges": [ { - "type": "stratos-lb", + "type": "stratos-lb-group-startup-order-test", "cartridgeMin": 1, "cartridgeMax": 2, "subscribableInfo": { - "alias": "my-stratos-lb", - "autoscalingPolicy": "autoscaling-policy-1", - "deploymentPolicy": "deployment-policy-1" + "alias": "my-stratos-lb-group-startup-order-test", + "autoscalingPolicy": "autoscaling-policy-group-startup-order-test", + "deploymentPolicy": "deployment-policy-group-startup-order-test" } }, { - "type": "tomcat", + "type": "tomcat-group-startup-order-test", "cartridgeMin": 1, "cartridgeMax": 2, "subscribableInfo": { - "alias": "my-tomcat", - "autoscalingPolicy": "autoscaling-policy-1", - "deploymentPolicy": "deployment-policy-1", + "alias": "my-tomcat-group-startup-order-test", + "autoscalingPolicy": "autoscaling-policy-group-startup-order-test", + "deploymentPolicy": "deployment-policy-group-startup-order-test", "artifactRepository": { "privateRepo": false, "repoUrl": "https://github.com/imesh/stratos-tomcat-applications.git";, @@ -134,10 +164,16 @@ "startupOrders": [ { "aliases": [ - "cartridge.my-tomcat", - "cartridge.my-stratos-lb", - "group.my-group6", - "group.my-group8" + "cartridge.my-stratos-lb-group-startup-order-test", + "cartridge.my-tomcat-group-startup-order-test", + "group.my-group8-group-startup-order-test" + ] + }, + { + "aliases": [ + "cartridge.my-stratos-lb-group-startup-order-test", + "cartridge.my-tomcat-group-startup-order-test", + "group.my-group6-group-startup-order-test" ] } ], http://git-wip-us.apache.org/repos/asf/stratos/blob/27a6d761/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 index 9c7d997..0079c66 100644 --- 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 @@ -1,5 +1,5 @@ { - "name": "esb-php-group-group-startup-order-test", + "name": "esb-php-group-startup-order-test", "cartridges": [ "esb-group-startup-order-test", "php-group-startup-order-test" http://git-wip-us.apache.org/repos/asf/stratos/blob/27a6d761/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group-8-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group-8-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/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-groups/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/27a6d761/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 index 6601222..75d71fb 100644 --- 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 @@ -1,19 +1,44 @@ { "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" + "groups": [ + { + "name": "group7-group-startup-order-test", + "cartridges": [ + "tomcat-group-startup-order-test", + "tomcat1-group-startup-order-test" + ], + "dependencies": { + "terminationBehaviour": "terminate-none", + "startupOrders": [ + { + "aliases": [ + "cartridge.my-group7-tomcat-group-startup-order-test", + "cartridge.my-group7-tomcat1-group-startup-order-test" + ] + } ] } - ], - "terminationBehaviour": "terminate-all" - } + }, + { + "name": "group-tom2-group-startup-order-test", + "dependencies": { + "terminationBehaviour": "terminate-none", + "startupOrders": [ + { + "aliases": [ + "cartridge.my-group-tom2-tomcat2-group-startup-order-test", + "cartridge.my-group-tom2-tomcat3-group-startup-order-test" + ] + } + ] + }, + "cartridges": [ + "tomcat2-group-startup-order-test", + "tomcat3-group-startup-order-test" + ] + } + ] } + + http://git-wip-us.apache.org/repos/asf/stratos/blob/27a6d761/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group8-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group8-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/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-groups/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/27a6d761/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 deleted file mode 100644 index 9bd63d9..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group8-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/27a6d761/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json index 8ee5d7e..1c665b7 100755 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json @@ -1,5 +1,5 @@ { - "type": "stratos-lb", + "type": "stratos-lb-group-startup-order-test", "provider": "stratos", "category": "load-balancer", "host": "complex-app-with-lb", http://git-wip-us.apache.org/repos/asf/stratos/blob/27a6d761/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat1-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat1-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat1-group-startup-order-test.json index 0f2141e..02a1cfd 100755 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat1-group-startup-order-test.json +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat1-group-startup-order-test.json @@ -1,10 +1,10 @@ { - "type": "tomcat1", + "type": "tomcat1-group-startup-order-test", "provider": "apache", "category": "framework", - "host": "tomcat1.stratos.org", - "displayName": "tomcat1", - "description": "tomcat1 Cartridge", + "host": "tomcat1-group-startup-order-test.stratos.org", + "displayName": "tomcat1-group-startup-order-test", + "description": "tomcat1-group-startup-order-test Cartridge", "version": "7", "multiTenant": "false", "portMapping": [ http://git-wip-us.apache.org/repos/asf/stratos/blob/27a6d761/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat2-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat2-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat2-group-startup-order-test.json index 13db35e..0d2055f 100755 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat2-group-startup-order-test.json +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat2-group-startup-order-test.json @@ -1,10 +1,10 @@ { - "type": "tomcat2", + "type": "tomcat2-group-startup-order-test", "provider": "apache", "category": "framework", - "host": "tomcat2.stratos.org", - "displayName": "tomcat2", - "description": "tomcat2 Cartridge", + "host": "tomcat2-group-startup-order-test.stratos.org", + "displayName": "tomcat2-group-startup-order-test", + "description": "tomcat2-group-startup-order-test Cartridge", "version": "7", "multiTenant": "false", "portMapping": [ http://git-wip-us.apache.org/repos/asf/stratos/blob/27a6d761/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat3-group-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat3-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat3-group-startup-order-test.json index 6ea62a3..b4397cb 100755 --- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat3-group-startup-order-test.json +++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat3-group-startup-order-test.json @@ -1,5 +1,5 @@ { - "type": "tomcat3", + "type": "tomcat3-group-startup-order-test", "provider": "apache", "host": "tomcat.stratos.org", "category": "framework", http://git-wip-us.apache.org/repos/asf/stratos/blob/27a6d761/products/stratos/modules/integration/src/test/resources/mock-iaas.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/mock-iaas.xml b/products/stratos/modules/integration/src/test/resources/mock-iaas.xml index 37051b6..6b74dc8 100644 --- a/products/stratos/modules/integration/src/test/resources/mock-iaas.xml +++ b/products/stratos/modules/integration/src/test/resources/mock-iaas.xml @@ -79,26 +79,26 @@ <sampleDuration>30</sampleDuration> </pattern> </cartridge> - <cartridge type="c3-group-termination-behavior-test"> - <!-- factor:memory-consumption|load-average|requests-in-flight--> - <!-- mode:loop|continue|stop --> - <!-- Mode defines the action needs to be taken after the last sample value: + <!--<cartridge type="c3-group-termination-behavior-test"> + <!– factor:memory-consumption|load-average|requests-in-flight–> + <!– mode:loop|continue|stop –> + <!– Mode defines the action needs to be taken after the last sample value: loop: start from beginning continue: continue the last sample value - stop: stop publishing statistics --> + stop: stop publishing statistics –> <pattern factor="memory-consumption" mode="stop"> - <!-- Sample values --> - <sampleValues>20,20,20</sampleValues> - <!-- Duration of each sample value in seconds --> + <!– Sample values –> + <sampleValues>20,20,20,</sampleValues> + <!– Duration of each sample value in seconds –> <sampleDuration>60</sampleDuration> </pattern> <pattern factor="load-average" mode="stop"> - <!-- Sample values --> + <!– Sample values –> <sampleValues>20,20,20</sampleValues> - <!-- Duration of each sample value in seconds --> + <!– Duration of each sample value in seconds –> <sampleDuration>60</sampleDuration> </pattern> - </cartridge> + </cartridge>--> <cartridge type="php"> <!-- factor:memory-consumption|load-average|requests-in-flight--> <!-- mode:loop|continue|stop --> http://git-wip-us.apache.org/repos/asf/stratos/blob/27a6d761/products/stratos/modules/integration/src/test/resources/stratos-testing.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml index c772a63..0680485 100644 --- a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml +++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml @@ -76,9 +76,14 @@ <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" /> </classes> </test> - <!--<test name="GroupTerminationBehaviorTest"> + <test name="GroupTerminationBehaviorTest"> <classes> <class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest" /> </classes> - </test>--> + </test> + <!--test name="GroupStartupOrderTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.GroupStartupOrderTest" /> + </classes> + </test--> </suite>
