You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/08/12 11:59:34 UTC
[05/16] stratos git commit: Restructuring the integration test and
adding more test cases
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json
deleted file mode 100644
index 2cecc06..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "id": "application-policy-3",
- "algorithm": "one-after-another",
- "networkPartitions": [
- "network-partition-9",
- "network-partition-10"
- ],
- "properties": [
- {
- "name": "networkPartitionGroups",
- "value": "network-partition-9|network-partition-10"
- },
- {
- "name": "key-2",
- "value": "value-2"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-application-bursting-test.json
new file mode 100644
index 0000000..4d1d35f
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-application-bursting-test.json
@@ -0,0 +1,18 @@
+{
+ "id": "application-policy-application-bursting-test",
+ "algorithm": "one-after-another",
+ "networkPartitions": [
+ "network-partition-application-bursting-test-1",
+ "network-partition-application-bursting-test-2"
+ ],
+ "properties": [
+ {
+ "name": "networkPartitionGroups",
+ "value": "network-partition-application-bursting-test-1|network-partition-application-bursting-test-2"
+ },
+ {
+ "name": "key-2",
+ "value": "value-2"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json
index 4e00d60..c091ec5 100644
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json
@@ -1,22 +1,22 @@
{
- "applicationId": "cartridge-group-app",
+ "applicationId": "application-bursting-test",
"alias": "my-cartridge-group-app",
"components": {
"groups": [
{
- "name": "esb-php-group",
- "alias": "my-esb-php-group",
- "deploymentPolicy": "deployment-policy-4",
+ "name": "esb-php-group-application-bursting-test",
+ "alias": "my-esb-php-group-application-bursting-test",
+ "deploymentPolicy": "deployment-policy-application-bursting-test",
"groupMinInstances": 1,
"groupMaxInstances": 2,
"cartridges": [
{
- "type": "esb",
+ "type": "esb-application-bursting-test",
"cartridgeMin": 1,
"cartridgeMax": 2,
"subscribableInfo": {
- "alias": "my-esb",
- "autoscalingPolicy": "autoscaling-policy-2",
+ "alias": "my-esb-application-bursting-test",
+ "autoscalingPolicy": "autoscaling-policy-application-bursting-test",
"artifactRepository": {
"privateRepo": false,
"repoUrl": "https://github.com/imesh/stratos-esb-applications.git",
@@ -26,13 +26,13 @@
}
},
{
- "type": "php",
+ "type": "php-application-bursting-test",
"cartridgeMin": 2,
"cartridgeMax": 4,
"lvsVirtualIP": "192.168.56.50|255.255.255.0",
"subscribableInfo": {
- "alias": "my-php",
- "autoscalingPolicy": "autoscaling-policy-2",
+ "alias": "my-php-application-bursting-test",
+ "autoscalingPolicy": "autoscaling-policy-application-bursting-test",
"artifactRepository": {
"privateRepo": false,
"repoUrl": "https://github.com/imesh/stratos-php-applications.git",
@@ -46,13 +46,13 @@
],
"cartridges": [
{
- "type": "tomcat",
+ "type": "tomcat-application-bursting-test",
"cartridgeMin": 2,
"cartridgeMax": 4,
"subscribableInfo": {
- "alias": "my-tomcat",
- "autoscalingPolicy": "autoscaling-policy-2",
- "deploymentPolicy": "deployment-policy-4",
+ "alias": "my-tomcat-application-bursting-test",
+ "autoscalingPolicy": "autoscaling-policy-application-bursting-test",
+ "deploymentPolicy": "deployment-policy-application-bursting-test",
"artifactRepository": {
"privateRepo": false,
"repoUrl": "https://github.com/imesh/stratos-tomcat-applications.git",
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json
deleted file mode 100644
index 944aa82..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-2",
- "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/application-bursting-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json
new file mode 100644
index 0000000..697cb70
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-application-bursting-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/application-bursting-test/cartridges-groups/esb-php-group-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group-application-bursting-test.json
new file mode 100644
index 0000000..8fbab89
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group-application-bursting-test.json
@@ -0,0 +1,19 @@
+{
+ "name": "esb-php-group-application-bursting-test",
+ "cartridges": [
+ "esb-application-bursting-test",
+ "php-application-bursting-test"
+ ],
+ "dependencies": {
+ "startupOrders": [
+ {
+ "aliases": [
+ "cartridge.my-esb-application-bursting-test",
+ "cartridge.my-php-application-bursting-test"
+ ]
+ }
+ ],
+ "terminationBehaviour": "terminate-none"
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json
deleted file mode 100644
index 008c735..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "esb-php-group",
- "cartridges": [
- "esb",
- "php"
- ],
- "dependencies": {
- "startupOrders": [
- {
- "aliases": [
- "cartridge.my-esb",
- "cartridge.my-php"
- ]
- }
- ],
- "terminationBehaviour": "terminate-none"
- }
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb-application-bursting-test.json
new file mode 100755
index 0000000..d97f9ff
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb-application-bursting-test.json
@@ -0,0 +1,50 @@
+{
+ "type": "esb-application-bursting-test",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "framework",
+ "displayName": "esb-application-bursting-test",
+ "description": "esb-application-bursting-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/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json
deleted file mode 100755
index 571e7e1..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "type": "esb",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "framework",
- "displayName": "esb",
- "description": "esb 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/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php-application-bursting-test.json
new file mode 100755
index 0000000..02d0d9d
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php-application-bursting-test.json
@@ -0,0 +1,51 @@
+{
+ "type": "php-application-bursting-test",
+ "provider": "apache",
+ "category": "framework",
+ "host": "php.stratos.org",
+ "displayName": "php-application-bursting-test",
+ "description": "php-application-bursting-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/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json
deleted file mode 100755
index 5d53e3a..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "type": "php",
- "provider": "apache",
- "category": "framework",
- "host": "php.stratos.org",
- "displayName": "php",
- "description": "php 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/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat-application-bursting-test.json
new file mode 100755
index 0000000..b63d568
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat-application-bursting-test.json
@@ -0,0 +1,53 @@
+{
+ "type": "tomcat-application-bursting-test",
+ "provider": "apache",
+ "host": "tomcat.stratos.org",
+ "category": "framework",
+ "displayName": "tomcat-application-bursting-test",
+ "description": "tomcat-application-bursting-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/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json
deleted file mode 100755
index 395687d..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "type": "tomcat",
- "provider": "apache",
- "host": "tomcat.stratos.org",
- "category": "framework",
- "displayName": "tomcat",
- "description": "tomcat 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/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json
deleted file mode 100644
index f9935d7..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "id": "deployment-policy-4",
- "networkPartitions": [
- {
- "id": "network-partition-9",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "partitionMax": 4
- }
- ]
- },
- {
- "id": "network-partition-10",
- "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/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-application-bursting-test.json
new file mode 100644
index 0000000..4adc0f2
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-application-bursting-test.json
@@ -0,0 +1,32 @@
+{
+ "id": "deployment-policy-application-bursting-test",
+ "networkPartitions": [
+ {
+ "id": "network-partition-application-bursting-test-1",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 4
+ }
+ ]
+ },
+ {
+ "id": "network-partition-application-bursting-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/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json
deleted file mode 100644
index 1e1ec23..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "id": "network-partition-10",
- "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/f78ab824/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json
deleted file mode 100644
index 9f12343..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-9",
- "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/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-1.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-1.json
new file mode 100644
index 0000000..78f7d01
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-1.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-application-bursting-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/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-2.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-2.json
new file mode 100644
index 0000000..588bfff
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-2.json
@@ -0,0 +1,24 @@
+{
+ "id": "network-partition-application-bursting-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/f78ab824/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-2.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-2.json
deleted file mode 100644
index 1137942..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-2.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "id": "application-policy-2",
- "algorithm": "one-after-another",
- "networkPartitions": [
- "network-partition-7",
- "network-partition-8"
- ],
- "properties": [
- {
- "name": "networkPartitionGroups",
- "value": "network-partition-7,network-partition-8"
- },
- {
- "name": "key-2",
- "value": "value-2"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test.json
new file mode 100644
index 0000000..cf1aace
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test.json
@@ -0,0 +1,18 @@
+{
+ "id": "application-policy-application-policy-test",
+ "algorithm": "one-after-another",
+ "networkPartitions": [
+ "network-partition-application-policy-test-1",
+ "network-partition-application-policy-test-2"
+ ],
+ "properties": [
+ {
+ "name": "networkPartitionGroups",
+ "value": "network-partition-application-policy-test-1,network-partition-application-policy-test-2"
+ },
+ {
+ "name": "key-2",
+ "value": "value-2"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-7.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-7.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-7.json
deleted file mode 100644
index 6250504..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-7.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-7",
- "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/application-policy-test/network-partitions/mock/network-partition-8.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-8.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-8.json
deleted file mode 100644
index 354b837..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-8.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "id": "network-partition-8",
- "provider": "mock",
- "partitions": [
- {
- "id": "network-partition-8-partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "network-partition-8-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/application-policy-test/network-partitions/mock/network-partition-application-policy-test-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-1.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-1.json
new file mode 100644
index 0000000..79a9024
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-1.json
@@ -0,0 +1,24 @@
+{
+ "id": "network-partition-application-policy-test-1",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "network-partition-8-partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ },
+ {
+ "id": "network-partition-8-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/application-policy-test/network-partitions/mock/network-partition-application-policy-test-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-2.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-2.json
new file mode 100644
index 0000000..a802378
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-2.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-application-policy-test-2",
+ "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/application-update-test/application-policies/application-policy-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/application-policies/application-policy-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/application-policies/application-policy-application-update-test.json
new file mode 100644
index 0000000..1b29165
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/application-policies/application-policy-application-update-test.json
@@ -0,0 +1,18 @@
+{
+ "id": "application-policy-application-update-test",
+ "algorithm": "one-after-another",
+ "networkPartitions": [
+ "network-partition-application-update-test-1",
+ "network-partition-application-update-test-2"
+ ],
+ "properties": [
+ {
+ "name": "networkPartitionGroups",
+ "value": "network-partition-application-update-test-1,network-partition-application-update-test-2"
+ },
+ {
+ "name": "key-2",
+ "value": "value-2"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test-v1.json b/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test-v1.json
new file mode 100644
index 0000000..2509ab1
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test-v1.json
@@ -0,0 +1,86 @@
+{
+ "alias": "g-sc-G123-1-application-update-test",
+ "applicationId": "g-sc-G123-1-application-update-test",
+ "components": {
+ "cartridges": [],
+ "groups": [
+ {
+ "name": "G1-application-update-test",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group1-application-update-test",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c1-application-update-test",
+ "subscribableInfo": {
+ "alias": "c1-1x0-application-update-test",
+ "deploymentPolicy": "deployment-policy-application-update-test",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-application-update-test"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G2-application-update-test",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group2-application-update-test",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 4,
+ "type": "c2-application-update-test",
+ "subscribableInfo": {
+ "alias": "c2-1x0-application-update-test",
+ "deploymentPolicy": "deployment-policy-application-update-test",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-application-update-test"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G3-application-update-test",
+ "groupMaxInstances": 3,
+ "groupMinInstances": 2,
+ "deploymentPolicy": "deployment-policy-application-update-test",
+ "alias": "group3-application-update-test",
+ "cartridges": [
+ {
+ "cartridgeMin": 2,
+ "cartridgeMax": 3,
+ "type": "c3-application-update-test",
+ "subscribableInfo": {
+ "alias": "c3-1x0-application-update-test",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-application-update-test"
+ }
+ }
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test.json
new file mode 100644
index 0000000..548e66c
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test.json
@@ -0,0 +1,86 @@
+{
+ "alias": "g-sc-G123-1-application-update-test",
+ "applicationId": "g-sc-G123-1-application-update-test",
+ "components": {
+ "cartridges": [],
+ "groups": [
+ {
+ "name": "G1-application-update-test",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group1-application-update-test",
+ "cartridges": [
+ {
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
+ "type": "c1-application-update-test",
+ "subscribableInfo": {
+ "alias": "c1-1x0-application-update-test",
+ "deploymentPolicy": "deployment-policy-application-update-test",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-application-update-test"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G2-application-update-test",
+ "groupMaxInstances": 1,
+ "groupMinInstances": 1,
+ "alias": "group2-application-update-test",
+ "cartridges": [
+ {
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
+ "type": "c2-application-update-test",
+ "subscribableInfo": {
+ "alias": "c2-1x0-application-update-test",
+ "deploymentPolicy": "deployment-policy-application-update-test",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-application-update-test"
+ }
+ }
+ ],
+ "groups": [
+ {
+ "name": "G3-application-update-test",
+ "groupMaxInstances": 2,
+ "groupMinInstances": 1,
+ "deploymentPolicy": "deployment-policy-application-update-test",
+ "alias": "group3-application-update-test",
+ "cartridges": [
+ {
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
+ "type": "c3-application-update-test",
+ "subscribableInfo": {
+ "alias": "c3-1x0-application-update-test",
+ "artifactRepository": {
+ "repoUsername": "user",
+ "repoUrl": "http://stratos.apache.org:10080/git/default.git",
+ "privateRepo": true,
+ "repoPassword": "c-policy"
+ },
+ "autoscalingPolicy": "autoscaling-policy-application-update-test"
+ }
+ }
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-update-test/autoscaling-policies/autoscaling-policy-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/autoscaling-policies/autoscaling-policy-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/autoscaling-policies/autoscaling-policy-application-update-test.json
new file mode 100644
index 0000000..8d9b766
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/autoscaling-policies/autoscaling-policy-application-update-test.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-application-update-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/application-update-test/cartridges-groups/cartrdige-nested-application-update-test-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test-v1.json b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test-v1.json
new file mode 100644
index 0000000..884ea0c
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test-v1.json
@@ -0,0 +1,50 @@
+{
+ "name": "G1-application-update-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group2-application-update-test",
+ "cartridge.c1-1x0-application-update-test"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c1-application-update-test"
+ ],
+ "groups": [
+ {
+ "name": "G2-application-update-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group3-application-update-test",
+ "cartridge.c2-1x0-application-update-test"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c2-application-update-test"
+ ],
+ "groups": [
+ {
+ "name": "G3-application-update-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c3-application-update-test"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test.json
new file mode 100644
index 0000000..884ea0c
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test.json
@@ -0,0 +1,50 @@
+{
+ "name": "G1-application-update-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group2-application-update-test",
+ "cartridge.c1-1x0-application-update-test"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c1-application-update-test"
+ ],
+ "groups": [
+ {
+ "name": "G2-application-update-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group3-application-update-test",
+ "cartridge.c2-1x0-application-update-test"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c2-application-update-test"
+ ],
+ "groups": [
+ {
+ "name": "G3-application-update-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c3-application-update-test"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c1-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c1-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c1-application-update-test.json
new file mode 100755
index 0000000..fcfa6f2
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c1-application-update-test.json
@@ -0,0 +1,45 @@
+{
+ "type": "c1-application-update-test",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c1-application-update-test",
+ "description": "c1-application-update-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/application-update-test/cartridges/mock/c2-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c2-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c2-application-update-test.json
new file mode 100755
index 0000000..a1c1a97
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c2-application-update-test.json
@@ -0,0 +1,45 @@
+{
+ "type": "c2-application-update-test",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c2-application-update-test",
+ "description": "c2-application-update-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/application-update-test/cartridges/mock/c3-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c3-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c3-application-update-test.json
new file mode 100755
index 0000000..e3932fc
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c3-application-update-test.json
@@ -0,0 +1,45 @@
+{
+ "type": "c3-application-update-test",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c3-application-update-test",
+ "description": "c3-application-update-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/application-update-test/deployment-policies/deployment-policy-application-update-test-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test-v1.json b/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test-v1.json
new file mode 100644
index 0000000..5dc2081
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test-v1.json
@@ -0,0 +1,36 @@
+{
+ "id": "deployment-policy-application-update-test",
+ "networkPartitions": [
+ {
+ "id": "network-partition-application-update-test-1",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 25
+ },
+ {
+ "id": "partition-2",
+ "partitionMax": 20
+ }
+ ]
+ },
+ {
+ "id": "network-partition-application-update-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/application-update-test/deployment-policies/deployment-policy-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test.json
new file mode 100644
index 0000000..647322b
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test.json
@@ -0,0 +1,32 @@
+{
+ "id": "deployment-policy-application-update-test",
+ "networkPartitions": [
+ {
+ "id": "network-partition-application-update-test-1",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "partitionMax": 20
+ }
+ ]
+ },
+ {
+ "id": "network-partition-application-update-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/application-update-test/network-partitions/mock/network-partition-application-update-test-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1-v1.json b/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1-v1.json
new file mode 100644
index 0000000..aaa3f04
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1-v1.json
@@ -0,0 +1,28 @@
+{
+ "id": "network-partition-application-update-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/application-update-test/network-partitions/mock/network-partition-application-update-test-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1.json b/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1.json
new file mode 100644
index 0000000..f1822af
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-application-update-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/application-update-test/network-partitions/mock/network-partition-application-update-test-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-2.json b/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-2.json
new file mode 100644
index 0000000..19ddd83
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-2.json
@@ -0,0 +1,24 @@
+{
+ "id": "network-partition-application-update-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/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-v1.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-v1.json
new file mode 100644
index 0000000..d29a8e3
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-v1.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-autoscaling-policy-test",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 30
+ },
+ "memoryConsumption": {
+ "threshold": 40
+ },
+ "loadAverage": {
+ "threshold": 20
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test.json
new file mode 100644
index 0000000..dce4c7a
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-autoscaling-policy-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/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0-v1.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0-v1.json
deleted file mode 100644
index 31c2b84..0000000
--- a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0-v1.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-c0",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 30
- },
- "memoryConsumption": {
- "threshold": 40
- },
- "loadAverage": {
- "threshold": 20
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0.json
deleted file mode 100644
index 4bcef26..0000000
--- a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-c0.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-c0",
- "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/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test-v1.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test-v1.json
new file mode 100644
index 0000000..38a976a
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test-v1.json
@@ -0,0 +1,50 @@
+{
+ "name": "G4-cartridge-group-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group2-cartridge-group-test",
+ "cartridge.c1-1x0-cartridge-group-test"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c4-cartridge-group-test"
+ ],
+ "groups": [
+ {
+ "name": "G5-cartridge-group-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group6-cartridge-group-test",
+ "cartridge.c5-1x0-cartridge-group-test"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c5-cartridge-group-test"
+ ],
+ "groups": [
+ {
+ "name": "G6-cartridge-group-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c6-cartridge-group-test"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test.json
new file mode 100644
index 0000000..741efe0
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test.json
@@ -0,0 +1,50 @@
+{
+ "name": "G4-cartridge-group-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group5-cartridge-group-test",
+ "cartridge.c4-1x0-cartridge-group-test"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c4-cartridge-group-test"
+ ],
+ "groups": [
+ {
+ "name": "G5-cartridge-group-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group6-cartridge-group-test",
+ "cartridge.c5-1x0-cartridge-group-test"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c5-cartridge-group-test"
+ ],
+ "groups": [
+ {
+ "name": "G6-cartridge-group-test",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c6-cartridge-group-test"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-v1.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-v1.json
deleted file mode 100644
index c0132f0..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-v1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "G4",
- "dependencies": {
- "terminationBehaviour": "terminate-none",
- "startupOrders": [
- {
- "aliases": [
- "group.group2",
- "cartridge.c1-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c4"
- ],
- "groups": [
- {
- "name": "G5",
- "dependencies": {
- "terminationBehaviour": "terminate-dependents",
- "startupOrders": [
- {
- "aliases": [
- "group.group6",
- "cartridge.c5-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c5"
- ],
- "groups": [
- {
- "name": "G6",
- "dependencies": {
- "terminationBehaviour": "terminate-all",
- "startupOrders": []
- },
- "cartridges": [
- "c6"
- ],
- "groups": []
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6.json
deleted file mode 100644
index ef28723..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "G4",
- "dependencies": {
- "terminationBehaviour": "terminate-none",
- "startupOrders": [
- {
- "aliases": [
- "group.group5",
- "cartridge.c4-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c4"
- ],
- "groups": [
- {
- "name": "G5",
- "dependencies": {
- "terminationBehaviour": "terminate-dependents",
- "startupOrders": [
- {
- "aliases": [
- "group.group6",
- "cartridge.c5-1x0"
- ]
- }
- ]
- },
- "cartridges": [
- "c5"
- ],
- "groups": [
- {
- "name": "G6",
- "dependencies": {
- "terminationBehaviour": "terminate-all",
- "startupOrders": []
- },
- "cartridges": [
- "c6"
- ],
- "groups": []
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/f78ab824/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4-cartridge-group-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4-cartridge-group-test.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4-cartridge-group-test.json
new file mode 100755
index 0000000..f34c1c4
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4-cartridge-group-test.json
@@ -0,0 +1,45 @@
+{
+ "type": "c4-cartridge-group-test",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c4-cartridge-group-test",
+ "description": "c4-cartridge-group-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/cartridge-group-test/cartridges/mock/c4.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4.json
deleted file mode 100755
index ec7d8b2..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "type": "c4",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "data",
- "displayName": "c4",
- "description": "c4 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"
- }
- ]
- }
- ]
-}