Repository: stratos Updated Branches: refs/heads/tenant-isolation 96899f7a7 -> 7fae8a72e
http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5.json deleted file mode 100755 index 0e438fd..0000000 --- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "category": "Application", - "description": "c5 Cartridge", - "displayName": "c5", - "host": "qmog.cisco.com", - "iaasProvider": [ - { - "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9dde0f", - "maxInstanceLimit": "4", - "networkInterfaces": [ - { - "floatingNetworks": [ - { - "name": "public", - "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc211af6" - } - ], - "name": "core", - "networkUuid": "5e107fbd-4820-47ad-84ea-6f135496f889" - } - ], - "property": [ - { - "name": "instanceType", - "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb809" - }, - { - "name": "keyPair", - "value": "phoenix" - }, - { - "name": "autoAssignIp", - "value": "false" - }, - { - "name": "securityGroups", - "value": "default" - } - ], - "type": "mock" - } - ], - "multiTenant": "false", - "portMapping": [ - { - "port": "22", - "protocol": "http", - "proxyPort": "8280" - } - ], - "property": [ - { - "name": "payload_parameter.MB_IP", - "value": "octl.qmog.cisco.com" - }, - { - "name": "payload_parameter.MB_PORT", - "value": "61616" - }, - { - "name": "payload_parameter.CEP_IP", - "value": "octl.qmog.cisco.com" - }, - { - "name": "payload_parameter.CEP_PORT", - "value": "7611" - }, - { - "name": "payload_parameter.CEP_ADMIN_USERNAME", - "value": "admin" - }, - { - "name": "payload_parameter.CEP_ADMIN_PASSWORD", - "value": "admin" - }, - { - "name": "payload_parameter.CERT_TRUSTSTORE", - "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks" - }, - { - "name": "payload_parameter.TRUSTSTORE_PASSWORD", - "value": "wso2carbon" - }, - { - "name": "payload_parameter.ENABLE_DATA_PUBLISHER", - "value": "false" - }, - { - "name": "payload_parameter.MONITORING_SERVER_IP", - "value": "octl.qmog.cisco.com" - }, - { - "name": "payload_parameter.MONITORING_SERVER_PORT", - "value": "7611" - }, - { - "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT", - "value": "7711" - }, - { - "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME", - "value": "admin" - }, - { - "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD", - "value": "admin" - }, - { - "name": "payload_parameter.QTCM_DNS_SEGMENT", - "value": "test" - }, - { - "name": "payload_parameter.QTCM_NETWORK_COUNT", - "value": "1" - }, - { - "name": "payload_parameter.SIMPLE_PROPERTY", - "value": "value" - } - ], - "provider": "cisco", - "type": "c5", - "version": "1.0" -} http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6.json deleted file mode 100755 index 8f41441..0000000 --- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "c6", - "provider": "apache", - "host": "stratos.apache.org", - "category": "data", - "displayName": "c6", - "description": "c6 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/6c6f4cc3/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0-v1.json b/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0-v1.json deleted file mode 100755 index 6d922a9..0000000 --- a/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0-v1.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "category": "Data", - "description": "c0 Cartridge", - "displayName": "c0", - "host": "qmog.cisco.com12", - "iaasProvider": [ - { - "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9d123", - "maxInstanceLimit": "4", - "networkInterfaces": [ - { - "floatingNetworks": [ - { - "name": "private", - "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc2112121" - } - ], - "name": "core1", - "networkUuid": "5e107fbd-4820-47ad-84ea-6f1354961212" - } - ], - "property": [ - { - "name": "instanceType", - "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb812" - }, - { - "name": "keyPair", - "value": "phoenix12" - }, - { - "name": "autoAssignIp", - "value": "true" - }, - { - "name": "securityGroups", - "value": "default123" - } - ], - "type": "mock" - } - ], - "multiTenant": "false", - "portMapping": [ - { - "port": "22", - "protocol": "http", - "proxyPort": "8280" - } - ], - "property": [ - { - "name": "payload_parameter.MB_IP", - "value": "octl.qmog.cisco.com123" - }, - { - "name": "payload_parameter.MB_PORT", - "value": "61617" - }, - { - "name": "payload_parameter.CEP_IP", - "value": "octl.qmog.cisco.com123" - }, - { - "name": "payload_parameter.CEP_PORT", - "value": "7612" - }, - { - "name": "payload_parameter.CEP_ADMIN_USERNAME", - "value": "admin" - }, - { - "name": "payload_parameter.CEP_ADMIN_PASSWORD", - "value": "admin123" - }, - { - "name": "payload_parameter.CERT_TRUSTSTORE", - "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks" - }, - { - "name": "payload_parameter.TRUSTSTORE_PASSWORD", - "value": "wso2carbon" - }, - { - "name": "payload_parameter.ENABLE_DATA_PUBLISHER", - "value": "false" - }, - { - "name": "payload_parameter.MONITORING_SERVER_IP", - "value": "octl.qmog.cisco.com123" - }, - { - "name": "payload_parameter.MONITORING_SERVER_PORT", - "value": "7612" - }, - { - "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT", - "value": "7712" - }, - { - "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME", - "value": "admin" - }, - { - "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD", - "value": "admin123" - }, - { - "name": "payload_parameter.QTCM_DNS_SEGMENT", - "value": "test123" - }, - { - "name": "payload_parameter.QTCM_NETWORK_COUNT", - "value": "3" - }, - { - "name": "payload_parameter.SIMPLE_PROPERTY", - "value": "value" - } - ], - "provider": "apache", - "type": "c0", - "version": "1.0" -} http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0.json b/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0.json deleted file mode 100755 index 44066e1..0000000 --- a/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c0.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "category": "Application", - "description": "c0 Cartridge", - "displayName": "c0", - "host": "qmog.cisco.com", - "iaasProvider": [ - { - "imageId": "RegionOne/16e7e35b-0c88-4605-90ce-cbef9e9dde0f", - "maxInstanceLimit": "4", - "networkInterfaces": [ - { - "floatingNetworks": [ - { - "name": "public", - "networkUuid": "26b4aa2b-06bc-4e4f-a6eb-c19fbc211af6" - } - ], - "name": "core", - "networkUuid": "5e107fbd-4820-47ad-84ea-6f135496f889" - } - ], - "property": [ - { - "name": "instanceType", - "value": "RegionOne/2cdbd576-8c9b-4c2d-8b1a-0f79dc4fb809" - }, - { - "name": "keyPair", - "value": "phoenix" - }, - { - "name": "autoAssignIp", - "value": "false" - }, - { - "name": "securityGroups", - "value": "default" - } - ], - "type": "mock" - } - ], - "multiTenant": "false", - "portMapping": [ - { - "port": "22", - "protocol": "http", - "proxyPort": "8280" - } - ], - "property": [ - { - "name": "payload_parameter.MB_IP", - "value": "octl.qmog.cisco.com" - }, - { - "name": "payload_parameter.MB_PORT", - "value": "61616" - }, - { - "name": "payload_parameter.CEP_IP", - "value": "octl.qmog.cisco.com" - }, - { - "name": "payload_parameter.CEP_PORT", - "value": "7611" - }, - { - "name": "payload_parameter.CEP_ADMIN_USERNAME", - "value": "admin" - }, - { - "name": "payload_parameter.CEP_ADMIN_PASSWORD", - "value": "admin" - }, - { - "name": "payload_parameter.CERT_TRUSTSTORE", - "value": "/opt/apache-stratos-cartridge-agent/security/client-truststore.jks" - }, - { - "name": "payload_parameter.TRUSTSTORE_PASSWORD", - "value": "wso2carbon" - }, - { - "name": "payload_parameter.ENABLE_DATA_PUBLISHER", - "value": "false" - }, - { - "name": "payload_parameter.MONITORING_SERVER_IP", - "value": "octl.qmog.cisco.com" - }, - { - "name": "payload_parameter.MONITORING_SERVER_PORT", - "value": "7611" - }, - { - "name": "payload_parameter.MONITORING_SERVER_SECURE_PORT", - "value": "7711" - }, - { - "name": "payload_parameter.MONITORING_SERVER_ADMIN_USERNAME", - "value": "admin" - }, - { - "name": "payload_parameter.MONITORING_SERVER_ADMIN_PASSWORD", - "value": "admin" - }, - { - "name": "payload_parameter.QTCM_DNS_SEGMENT", - "value": "test" - }, - { - "name": "payload_parameter.QTCM_NETWORK_COUNT", - "value": "1" - }, - { - "name": "payload_parameter.SIMPLE_PROPERTY", - "value": "value" - } - ], - "provider": "cisco", - "type": "c0", - "version": "1.0" -} http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2-v1.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2-v1.json deleted file mode 100644 index b5c305c..0000000 --- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2-v1.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "id": "deployment-policy-2", - "networkPartitions": [ - { - "id": "network-partition-5", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 25 - }, - { - "id": "partition-2", - "partitionMax": 20 - } - ] - }, - { - "id": "network-partition-6", - "partitionAlgo": "round-robin", - "partitions": [ - { - "id": "network-partition-6-partition-1", - "partitionMax": 15 - }, - { - "id": "network-partition-6-partition-2", - "partitionMax": 5 - } - ] - } - ] -} - - - http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2.json deleted file mode 100644 index 5df3e24..0000000 --- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-2.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "id": "deployment-policy-2", - "networkPartitions": [ - { - "id": "network-partition-5", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 20 - } - ] - }, - { - "id": "network-partition-6", - "partitionAlgo": "round-robin", - "partitions": [ - { - "id": "network-partition-6-partition-1", - "partitionMax": 10 - }, - { - "id": "network-partition-6-partition-2", - "partitionMax": 9 - } - ] - } - ] -} - - - http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5-v1.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5-v1.json deleted file mode 100644 index 275b536..0000000 --- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5-v1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "id": "network-partition-5", - "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/6c6f4cc3/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5.json deleted file mode 100644 index 5464aa9..0000000 --- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-5.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "network-partition-5", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-6.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-6.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-6.json deleted file mode 100644 index d200b70..0000000 --- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-6.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "id": "network-partition-6", - "provider": "mock", - "partitions": [ - { - "id": "network-partition-6-partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - }, - { - "id": "network-partition-6-partition-2", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/mock-iaas.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/mock-iaas.xml b/products/stratos/modules/integration/src/test/resources/mock-iaas.xml index 24e423c..a0f1066 100644 --- a/products/stratos/modules/integration/src/test/resources/mock-iaas.xml +++ b/products/stratos/modules/integration/src/test/resources/mock-iaas.xml @@ -39,6 +39,46 @@ <sampleDuration>60</sampleDuration> </pattern> </cartridge> + <cartridge type="c7-single-cluster-scaling-test"> + <!-- factor:memory-consumption|load-average|requests-in-flight--> + <!-- mode:loop|continue|stop --> + <!-- Mode defines the action needs to be taken after the last sample value: + loop: start from beginning + continue: continue the last sample value + stop: stop publishing statistics --> + <pattern factor="memory-consumption" mode="continue"> + <!-- Sample values --> + <sampleValues>60,70,80,90,90,90,40,60,50,60</sampleValues> + <!-- Duration of each sample value in seconds --> + <sampleDuration>60</sampleDuration> + </pattern> + <pattern factor="load-average" mode="continue"> + <!-- Sample values --> + <sampleValues>70,70,70</sampleValues> + <!-- Duration of each sample value in seconds --> + <sampleDuration>60</sampleDuration> + </pattern> + </cartridge> + <cartridge type="c7-partition-round-robin-test"> + <!-- factor:memory-consumption|load-average|requests-in-flight--> + <!-- mode:loop|continue|stop --> + <!-- Mode defines the action needs to be taken after the last sample value: + loop: start from beginning + continue: continue the last sample value + stop: stop publishing statistics --> + <pattern factor="memory-consumption" mode="stop"> + <!-- Sample values --> + <sampleValues>20,20,20,20</sampleValues> + <!-- Duration of each sample value in seconds --> + <sampleDuration>30</sampleDuration> + </pattern> + <pattern factor="load-average" mode="stop"> + <!-- Sample values --> + <sampleValues>20,20,20,20</sampleValues> + <!-- Duration of each sample value in seconds --> + <sampleDuration>30</sampleDuration> + </pattern> + </cartridge> <cartridge type="php"> <!-- factor:memory-consumption|load-average|requests-in-flight--> <!-- mode:loop|continue|stop --> @@ -60,4 +100,4 @@ </pattern> </cartridge> </health-statistics> -</mock-iaas> \ No newline at end of file +</mock-iaas> http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3-v1.json b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3-v1.json deleted file mode 100644 index c7d4733..0000000 --- a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3-v1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "id": "network-partition-3", - "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/6c6f4cc3/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3.json b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3.json deleted file mode 100644 index 1bb7f2a..0000000 --- a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-3.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "network-partition-3", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-1.json deleted file mode 100644 index d2699a1..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-1.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "application-policy-1", - "algorithm": "one-after-another", - "networkPartitions": [ - "network-partition-1", - "network-partition-2" - ], - "properties": [ - { - "name": "key-1", - "value": "network-partition-1,network-partition-2" - }, - { - "name": "key-2", - "value": "value-2" - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v1.json deleted file mode 100644 index a91c4e0..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v1.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": 2, - "cartridgeMax": 3, - "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": 2, - "cartridgeMax": 4, - "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": 3, - "groupMinInstances": 2, - "deploymentPolicy": "deployment-policy-1", - "alias": "group3", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "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/6c6f4cc3/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v2.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v2.json deleted file mode 100644 index 6f827c2..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v2.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "alias": "g-sc-G123-1", - "applicationId": "g-sc-G123-1", - "components": { - "cartridges": [], - "groups": [ - { - "name": "G1", - "groupMaxInstances": 5, - "groupMinInstances": 2, - "alias": "group1", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "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": 2, - "cartridgeMax": 4, - "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": 3, - "groupMinInstances": 2, - "deploymentPolicy": "static-1", - "alias": "group3", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "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/6c6f4cc3/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v3.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v3.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v3.json deleted file mode 100644 index a6e5fd7..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-v3.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": 2, - "cartridgeMax": 3, - "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": 2, - "cartridgeMax": 4, - "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": 4, - "groupMinInstances": 3, - "deploymentPolicy": "static-1", - "alias": "group3", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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/6c6f4cc3/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..c530c1c 100644 --- a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml +++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml @@ -21,13 +21,12 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > <suite name="StratosIntegrationSuite"> - <test name="CartridgeTest"> <classes> <class name="org.apache.stratos.integration.tests.group.CartridgeTest" /> </classes> </test> - <test name="CartridgeGroupTest"> + <test name="CartridgeGroupTest" > <classes> <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" /> </classes> @@ -57,6 +56,21 @@ <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" /> </classes> </test> + <!-- <test name="ApplicationUpdateTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.ApplicationUpdateTest" /> + </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="ApplicationBurstingTest"> <classes> <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" /> http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json b/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json deleted file mode 100644 index f575b1b..0000000 --- a/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin": "admin", - "firstName": "Frank", - "lastName": "Myers", - "adminPassword": "admin123", - "tenantDomain": "test1.com", - "email": "[email protected]", - "active": "true" -} http://git-wip-us.apache.org/repos/asf/stratos/blob/6c6f4cc3/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json b/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json deleted file mode 100644 index 3d2baf2..0000000 --- a/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin": "admin", - "firstName": "Frank", - "lastName": "Myers", - "adminPassword": "admin123", - "tenantDomain": "test2.com", - "email": "[email protected]", - "active": "true" -}
