Repository: stratos Updated Branches: refs/heads/stratos-4.1.x 3da304582 -> 9514aef53
http://git-wip-us.apache.org/repos/asf/stratos/blob/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/cartridges/mock/postgres.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/cartridges/mock/postgres.json b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/cartridges/mock/postgres.json deleted file mode 100644 index 05a510a..0000000 --- a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/cartridges/mock/postgres.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "type": "postgres", - "provider": "apache", - "host": "stratos.apache.org", - "category": "data", - "displayName": "c4", - "description": "mysql 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/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/cartridges/mock/tomcat-application-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/cartridges/mock/tomcat-application-startup-order-test.json b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/cartridges/mock/tomcat-application-startup-order-test.json new file mode 100644 index 0000000..c2a3c12 --- /dev/null +++ b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/cartridges/mock/tomcat-application-startup-order-test.json @@ -0,0 +1,53 @@ +{ + "type": "tomcat-application-startup-order-test", + "provider": "apache", + "host": "tomcat.stratos.org", + "category": "framework", + "displayName": "tomcat-application-startup-order-test", + "description": "tomcat-application-startup-order-test Cartridge", + "version": "7", + "multiTenant": "false", + "portMapping": [ + { + "name": "http-22", + "protocol": "http", + "port": "22", + "proxyPort": "8280" + }, + { + "protocol": "http", + "port": "8080", + "proxyPort": "80" + } + ], + "deployment": { + }, + "iaasProvider": [ + { + "type": "mock", + "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e", + "networkInterfaces": [ + { + "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" + } + ], + "property": [ + { + "name": "instanceType", + "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" + }, + { + "name": "keyPair", + "value": "vishanth-key" + }, + { + "name": "securityGroups", + "value": "default" + } + ] + } + ], + "metadataKeys": [ + "url" + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/cartridges/mock/tomcat.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/cartridges/mock/tomcat.json b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/cartridges/mock/tomcat.json deleted file mode 100644 index 395687d..0000000 --- a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-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/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-1-application-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-1-application-startup-order-test.json b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-1-application-startup-order-test.json new file mode 100644 index 0000000..a6f500c --- /dev/null +++ b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-1-application-startup-order-test.json @@ -0,0 +1,15 @@ +{ + "id": "deployment-policy-1-application-startup-order-test", + "networkPartitions": [ + { + "id": "network-partition-1-application-startup-order-test", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 20 + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-1.json b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-1.json deleted file mode 100644 index a434226..0000000 --- a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "deployment-policy-1", - "networkPartitions": [ - { - "id": "network-partition-1", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 20 - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-2-application-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-2-application-startup-order-test.json b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-2-application-startup-order-test.json new file mode 100644 index 0000000..dbc3c97 --- /dev/null +++ b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-2-application-startup-order-test.json @@ -0,0 +1,29 @@ +{ + "id": "deployment-policy-2-application-startup-order-test", + "networkPartitions": [ + { + "id": "network-partition-1-application-startup-order-test", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 5 + } + ] + }, + { + "id": "network-partition-2-application-startup-order-test", + "partitionAlgo": "round-robin", + "partitions": [ + { + "id": "network-partition-2-partition-1", + "partitionMax": 5 + }, + { + "id": "network-partition-2-partition-2", + "partitionMax": 5 + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-2.json b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-2.json deleted file mode 100644 index c62eda7..0000000 --- a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/deployment-policies/deployment-policy-2.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "id": "deployment-policy-2", - "networkPartitions": [ - { - "id": "network-partition-1", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 5 - } - ] - }, - { - "id": "network-partition-2", - "partitionAlgo": "round-robin", - "partitions": [ - { - "id": "network-partition-2-partition-1", - "partitionMax": 5 - }, - { - "id": "network-partition-2-partition-2", - "partitionMax": 5 - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-1-application-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-1-application-startup-order-test.json b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-1-application-startup-order-test.json new file mode 100644 index 0000000..2371b07 --- /dev/null +++ b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-1-application-startup-order-test.json @@ -0,0 +1,15 @@ +{ + "id": "network-partition-1-application-startup-order-test", + "provider": "mock", + "partitions": [ + { + "id": "partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-1.json b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-1.json deleted file mode 100644 index 466da28..0000000 --- a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-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/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-2-application-startup-order-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-2-application-startup-order-test.json b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-2-application-startup-order-test.json new file mode 100644 index 0000000..4095fbc --- /dev/null +++ b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-2-application-startup-order-test.json @@ -0,0 +1,24 @@ +{ + "id": "network-partition-2-application-startup-order-test", + "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/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-2.json b/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-test/network-partitions/mock/network-partition-2.json deleted file mode 100644 index 23236e2..0000000 --- a/products/stratos/modules/integration/test-integration/src/test/resources/application-startup-order-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/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json b/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json deleted file mode 100644 index 9d1fc7b..0000000 --- a/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "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/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json b/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json deleted file mode 100644 index 9d1fc7b..0000000 --- a/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "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/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartridge-nested-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartridge-nested-sample-applications-test.json b/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartridge-nested-sample-applications-test.json new file mode 100644 index 0000000..9d1fc7b --- /dev/null +++ b/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/cartridges-groups/cartridge-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/9514aef5/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json b/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json deleted file mode 100644 index 0e35536..0000000 --- a/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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/9514aef5/products/stratos/modules/integration/test-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/test-integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1-v1.json b/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1-v1.json deleted file mode 100644 index 2df920e..0000000 --- a/products/stratos/modules/integration/test-integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1-v1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "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" - } - ] - } - ] -}
