http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1.json deleted file mode 100644 index 76d72c8..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "alias": "g-sc-G123-1", - "applicationId": "g-sc-G123-1", - "components": { - "cartridges": [], - "groups": [ - { - "name": "G1", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group1", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c1", - "subscribableInfo": { - "alias": "c1-1x0", - "deploymentPolicy": "deployment-policy-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [ - { - "name": "G2", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group2", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c2", - "subscribableInfo": { - "alias": "c2-1x0", - "deploymentPolicy": "deployment-policy-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [ - { - "name": "G3", - "groupMaxInstances": 2, - "groupMinInstances": 1, - "deploymentPolicy": "deployment-policy-1", - "alias": "group3", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c3", - "subscribableInfo": { - "alias": "c3-1x0", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [] - } - ] - } - ] - } - ] - } -}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-1.json deleted file mode 100644 index f82403b..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-1.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "autoscaling-policy-1", - "loadThresholds": { - "requestsInFlight": { - "threshold": 35 - }, - "memoryConsumption": { - "threshold": 45 - }, - "loadAverage": { - "threshold": 25 - } - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-sample-applications-test.json new file mode 100644 index 0000000..5bd90ab --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-sample-applications-test.json @@ -0,0 +1,14 @@ +{ + "id": "autoscaling-policy-sample-applications-test", + "loadThresholds": { + "requestsInFlight": { + "threshold": 35 + }, + "memoryConsumption": { + "threshold": 45 + }, + "loadAverage": { + "threshold": 25 + } + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json new file mode 100644 index 0000000..9d1fc7b --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json @@ -0,0 +1,50 @@ +{ + "name": "G1-sample-applications-test", + "dependencies": { + "terminationBehaviour": "terminate-none", + "startupOrders": [ + { + "aliases": [ + "group.group2-sample-applications-test", + "cartridge.c1-1x0-sample-applications-test" + ] + } + ] + }, + "cartridges": [ + "c1-sample-applications-test" + ], + "groups": [ + { + "name": "G2-sample-applications-test", + "dependencies": { + "terminationBehaviour": "terminate-dependents", + "startupOrders": [ + { + "aliases": [ + "group.group3-sample-applications-test", + "cartridge.c2-1x0-sample-applications-test" + ] + } + ] + }, + "cartridges": [ + "c2-sample-applications-test" + ], + "groups": [ + { + "name": "G3-sample-applications-test", + "dependencies": { + "terminationBehaviour": "terminate-all", + "startupOrders": [] + }, + "cartridges": [ + "c3-sample-applications-test" + ], + "groups": [] + } + ] + } + ] +} + http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json new file mode 100644 index 0000000..9d1fc7b --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json @@ -0,0 +1,50 @@ +{ + "name": "G1-sample-applications-test", + "dependencies": { + "terminationBehaviour": "terminate-none", + "startupOrders": [ + { + "aliases": [ + "group.group2-sample-applications-test", + "cartridge.c1-1x0-sample-applications-test" + ] + } + ] + }, + "cartridges": [ + "c1-sample-applications-test" + ], + "groups": [ + { + "name": "G2-sample-applications-test", + "dependencies": { + "terminationBehaviour": "terminate-dependents", + "startupOrders": [ + { + "aliases": [ + "group.group3-sample-applications-test", + "cartridge.c2-1x0-sample-applications-test" + ] + } + ] + }, + "cartridges": [ + "c2-sample-applications-test" + ], + "groups": [ + { + "name": "G3-sample-applications-test", + "dependencies": { + "terminationBehaviour": "terminate-all", + "startupOrders": [] + }, + "cartridges": [ + "c3-sample-applications-test" + ], + "groups": [] + } + ] + } + ] +} + http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-v1.json deleted file mode 100644 index 6020e1e..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-v1.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "G1", - "dependencies": { - "terminationBehaviour": "terminate-none", - "startupOrders": [ - { - "aliases": [ - "group.group2", - "cartridge.c1-1x0" - ] - } - ] - }, - "cartridges": [ - "c1" - ], - "groups": [ - { - "name": "G2", - "dependencies": { - "terminationBehaviour": "terminate-dependents", - "startupOrders": [ - { - "aliases": [ - "group.group3", - "cartridge.c2-1x0" - ] - } - ] - }, - "cartridges": [ - "c2" - ], - "groups": [ - { - "name": "G3", - "dependencies": { - "terminationBehaviour": "terminate-all", - "startupOrders": [] - }, - "cartridges": [ - "c3" - ], - "groups": [] - } - ] - } - ] -} - http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested.json deleted file mode 100644 index 6020e1e..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "G1", - "dependencies": { - "terminationBehaviour": "terminate-none", - "startupOrders": [ - { - "aliases": [ - "group.group2", - "cartridge.c1-1x0" - ] - } - ] - }, - "cartridges": [ - "c1" - ], - "groups": [ - { - "name": "G2", - "dependencies": { - "terminationBehaviour": "terminate-dependents", - "startupOrders": [ - { - "aliases": [ - "group.group3", - "cartridge.c2-1x0" - ] - } - ] - }, - "cartridges": [ - "c2" - ], - "groups": [ - { - "name": "G3", - "dependencies": { - "terminationBehaviour": "terminate-all", - "startupOrders": [] - }, - "cartridges": [ - "c3" - ], - "groups": [] - } - ] - } - ] -} - http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1-sample-applications-test.json new file mode 100755 index 0000000..26f8588 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1-sample-applications-test.json @@ -0,0 +1,45 @@ +{ + "type": "c1-sample-applications-test", + "provider": "apache", + "host": "stratos.apache.org", + "category": "data", + "displayName": "c1-sample-applications-test", + "description": "c1-sample-applications-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" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1.json deleted file mode 100755 index 145e2ce..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "c1", - "provider": "apache", - "host": "stratos.apache.org", - "category": "data", - "displayName": "c1", - "description": "c1 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" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2-sample-applications-test.json new file mode 100755 index 0000000..0f3c61f --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2-sample-applications-test.json @@ -0,0 +1,45 @@ +{ + "type": "c2-sample-applications-test", + "provider": "apache", + "host": "stratos.apache.org", + "category": "data", + "displayName": "c2-sample-applications-test", + "description": "c2-sample-applications-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" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2.json deleted file mode 100755 index fd85892..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "c2", - "provider": "apache", - "host": "stratos.apache.org", - "category": "data", - "displayName": "c2", - "description": "c2 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" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3-sample-applications-test.json new file mode 100755 index 0000000..c959d53 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3-sample-applications-test.json @@ -0,0 +1,45 @@ +{ + "type": "c3-sample-applications-test", + "provider": "apache", + "host": "stratos.apache.org", + "category": "data", + "displayName": "c3-sample-applications-test", + "description": "c3-sample-applications-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" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3.json deleted file mode 100755 index 937e8d3..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "c3", - "provider": "apache", - "host": "stratos.apache.org", - "category": "data", - "displayName": "c3", - "description": "c3 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" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1-v1.json deleted file mode 100644 index 2ba5eb3..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1-v1.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "id": "deployment-policy-1", - "networkPartitions": [ - { - "id": "network-partition-1", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 25 - }, - { - "id": "partition-2", - "partitionMax": 20 - } - ] - }, - { - "id": "network-partition-2", - "partitionAlgo": "round-robin", - "partitions": [ - { - "id": "network-partition-2-partition-1", - "partitionMax": 15 - }, - { - "id": "network-partition-2-partition-2", - "partitionMax": 5 - } - ] - } - ] -} - - - http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1.json deleted file mode 100644 index e186690..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-1.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "id": "deployment-policy-1", - "networkPartitions": [ - { - "id": "network-partition-1", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 20 - } - ] - }, - { - "id": "network-partition-2", - "partitionAlgo": "round-robin", - "partitions": [ - { - "id": "network-partition-2-partition-1", - "partitionMax": 10 - }, - { - "id": "network-partition-2-partition-2", - "partitionMax": 9 - } - ] - } - ] -} - - - http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json new file mode 100644 index 0000000..0e35536 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json @@ -0,0 +1,36 @@ +{ + "id": "deployment-policy-sample-applications-test", + "networkPartitions": [ + { + "id": "network-partition-sample-applications-test-1", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 25 + }, + { + "id": "partition-2", + "partitionMax": 20 + } + ] + }, + { + "id": "network-partition-sample-applications-test-2", + "partitionAlgo": "round-robin", + "partitions": [ + { + "id": "network-partition-2-partition-1", + "partitionMax": 15 + }, + { + "id": "network-partition-2-partition-2", + "partitionMax": 5 + } + ] + } + ] +} + + + http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test.json new file mode 100644 index 0000000..2e26c25 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test.json @@ -0,0 +1,32 @@ +{ + "id": "deployment-policy-sample-applications-test", + "networkPartitions": [ + { + "id": "network-partition-sample-applications-test-1", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 20 + } + ] + }, + { + "id": "network-partition-sample-applications-test-2", + "partitionAlgo": "round-robin", + "partitions": [ + { + "id": "network-partition-2-partition-1", + "partitionMax": 10 + }, + { + "id": "network-partition-2-partition-2", + "partitionMax": 9 + } + ] + } + ] +} + + + http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1-v1.json deleted file mode 100644 index 054265a..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1-v1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "id": "network-partition-1", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - }, - { - "id": "partition-2", - "property": [ - { - "name": "region", - "value": "default1" - }, - { - "name": "zone", - "value": "z1" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1.json deleted file mode 100644 index 466da28..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "network-partition-1", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-2.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-2.json deleted file mode 100644 index 23236e2..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-2.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "id": "network-partition-2", - "provider": "mock", - "partitions": [ - { - "id": "network-partition-2-partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - }, - { - "id": "network-partition-2-partition-2", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1-v1.json new file mode 100644 index 0000000..2df920e --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1-v1.json @@ -0,0 +1,28 @@ +{ + "id": "network-partition-sample-applications-test-1", + "provider": "mock", + "partitions": [ + { + "id": "partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + }, + { + "id": "partition-2", + "property": [ + { + "name": "region", + "value": "default1" + }, + { + "name": "zone", + "value": "z1" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1.json new file mode 100644 index 0000000..8d7aed5 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1.json @@ -0,0 +1,15 @@ +{ + "id": "network-partition-sample-applications-test-1", + "provider": "mock", + "partitions": [ + { + "id": "partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-2.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-2.json new file mode 100644 index 0000000..2fd5411 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-2.json @@ -0,0 +1,24 @@ +{ + "id": "network-partition-sample-applications-test-2", + "provider": "mock", + "partitions": [ + { + "id": "network-partition-2-partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + }, + { + "id": "network-partition-2-partition-2", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/application-policies/application-policy-single-cluster-scaling-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/application-policies/application-policy-single-cluster-scaling-test.json b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/application-policies/application-policy-single-cluster-scaling-test.json new file mode 100644 index 0000000..866f568 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/application-policies/application-policy-single-cluster-scaling-test.json @@ -0,0 +1,13 @@ +{ + "id": "application-policy-single-cluster-scaling-test", + "algorithm": "one-after-another", + "networkPartitions": [ + "network-partition-single-cluster-scaling-test" + ], + "properties": [ + { + "name": "key-2", + "value": "value-2" + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json new file mode 100644 index 0000000..f091e26 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json @@ -0,0 +1,28 @@ +{ + "applicationId": "single-cluster-scaling-test", + "alias": "single-cluster-scaling-test", + "components": { + "cartridges": [ + { + "type": "c7-single-cluster-scaling-test", + "cartridgeMin": 2, + "cartridgeMax": 5, + "subscribableInfo": { + "alias": "my-c7", + "autoscalingPolicy": "autoscaling-policy-single-cluster-scaling-test", + "deploymentPolicy": "deployment-policy-single-cluster-scaling-test", + "artifactRepository": { + "privateRepo": false, + "repoUrl": "https://github.com/imesh/stratos-tomcat-applications.git";, + "repoUsername": "", + "repoPassword": "" + } + } + } + ], + "dependencies": { + "terminationBehaviour": "terminate-none" + } + } +} + http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/autoscaling-policies/autoscaling-policy-single-cluster-scaling-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/autoscaling-policies/autoscaling-policy-single-cluster-scaling-test.json b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/autoscaling-policies/autoscaling-policy-single-cluster-scaling-test.json new file mode 100644 index 0000000..31602d1 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/autoscaling-policies/autoscaling-policy-single-cluster-scaling-test.json @@ -0,0 +1,14 @@ +{ + "id": "autoscaling-policy-single-cluster-scaling-test", + "loadThresholds": { + "requestsInFlight": { + "threshold": 20 + }, + "memoryConsumption": { + "threshold": 30 + }, + "loadAverage": { + "threshold": 25 + } + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/cartridges/mock/c7-single-cluster-scaling-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/cartridges/mock/c7-single-cluster-scaling-test.json b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/cartridges/mock/c7-single-cluster-scaling-test.json new file mode 100755 index 0000000..c8abf51 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/cartridges/mock/c7-single-cluster-scaling-test.json @@ -0,0 +1,45 @@ +{ + "type": "c7-single-cluster-scaling-test", + "provider": "apache", + "host": "stratos.apache.org", + "category": "data", + "displayName": "c7-single-cluster-scaling-test", + "description": "c7-single-cluster-scaling-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" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/deployment-policies/deployment-policy-single-cluster-scaling-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/deployment-policies/deployment-policy-single-cluster-scaling-test.json b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/deployment-policies/deployment-policy-single-cluster-scaling-test.json new file mode 100644 index 0000000..4818751 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/deployment-policies/deployment-policy-single-cluster-scaling-test.json @@ -0,0 +1,22 @@ +{ + "id": "deployment-policy-single-cluster-scaling-test", + "networkPartitions": [ + { + "id": "network-partition-single-cluster-scaling-test", + "partitionAlgo": "round-robin", + "partitions": [ + { + "id": "network-partition-11-partition-1", + "partitionMax": 3 + }, + { + "id": "network-partition-11-partition-2", + "partitionMax": 3 + } + ] + } + ] +} + + + http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/network-partitions/mock/network-partition-single-cluster-scaling-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/network-partitions/mock/network-partition-single-cluster-scaling-test.json b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/network-partitions/mock/network-partition-single-cluster-scaling-test.json new file mode 100644 index 0000000..13f1723 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/network-partitions/mock/network-partition-single-cluster-scaling-test.json @@ -0,0 +1,24 @@ +{ + "id": "network-partition-single-cluster-scaling-test", + "provider": "mock", + "partitions": [ + { + "id": "network-partition-11-partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + }, + { + "id": "network-partition-11-partition-2", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/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 356b5ec..5014b41 100644 --- a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml +++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml @@ -20,8 +20,7 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > -<suite name="StratosIntegrationSuite"> - +<suite name="StratosIntegrationSuite" parallel="tests" thread-count="5"> <test name="CartridgeTest"> <classes> <class name="org.apache.stratos.integration.tests.group.CartridgeTest" /> @@ -57,10 +56,25 @@ <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" /> </classes> </test> - <test name="ApplicationBurstingTest"> + <!--test name="ApplicationBurstingTest"> <classes> <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" /> </classes> + </test--> + <!--test name="SingleClusterScalingTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest" /> + </classes> </test> + <test name="PartitionRoundRobinClusterTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" /> + </classes> + </test--> + <!--<test name="ApplicationUpdateTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.ApplicationUpdateTest" /> + </classes> + </test>--> </suite>
