http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java index 684dc03..61f2205 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/policies/NetworkPartitionTest.java @@ -19,17 +19,20 @@ package org.apache.stratos.integration.tests.policies; +import com.google.gson.reflect.TypeToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.beans.partition.NetworkPartitionBean; -import org.apache.stratos.common.beans.partition.NetworkPartitionReferenceBean; import org.apache.stratos.common.beans.partition.PartitionBean; import org.apache.stratos.integration.tests.RestConstants; import org.apache.stratos.integration.tests.StratosTestServerManager; import org.testng.annotations.Test; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; + +import static junit.framework.Assert.*; /** * Test to handle Network partition CRUD operations @@ -49,7 +52,7 @@ public class NetworkPartitionTest extends StratosTestServerManager { networkPartitionId + ".json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); - assertEquals(added, true); + assertTrue(added); NetworkPartitionBean bean = (NetworkPartitionBean) restClient. getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId, NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME); @@ -65,7 +68,7 @@ public class NetworkPartitionTest extends StratosTestServerManager { networkPartitionId + "-v1.json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); - assertEquals(updated, true); + assertTrue(updated); NetworkPartitionBean updatedBean = (NetworkPartitionBean) restClient. getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId, NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME); @@ -81,12 +84,80 @@ public class NetworkPartitionTest extends StratosTestServerManager { boolean removed = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId, RestConstants.NETWORK_PARTITIONS_NAME); - assertEquals(removed, true); + assertTrue(removed); NetworkPartitionBean beanRemoved = (NetworkPartitionBean) restClient. getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId, NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME); - assertEquals(beanRemoved, null); + assertNull(beanRemoved); + + log.info("-------------------------Ended network partition test case-------------------------"); + } catch (Exception e) { + log.error("An error occurred while handling network partitions", e); + assertTrue("An error occurred while handling network partitions", false); + } + } + + @Test + public void testNetworkPartitionList() { + try { + String networkPartitionId1 = "network-partition-network-partition-test-1"; + String networkPartitionId2 = "network-partition-network-partition-test-2"; + + log.info("-------------------------Started network partition list test case-------------------------"); + + boolean added = restClient.addEntity(RESOURCES_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + + networkPartitionId1 + ".json", + RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); + assertTrue(added); + + added = restClient.addEntity(RESOURCES_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + + networkPartitionId2 + ".json", + RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); + assertTrue(added); + + Type listType = new TypeToken<ArrayList<NetworkPartitionBean>>() { + }.getType(); + + List<NetworkPartitionBean> cartridgeList = (List<NetworkPartitionBean>) restClient. + listEntity(RestConstants.NETWORK_PARTITIONS, + listType, RestConstants.NETWORK_PARTITIONS_NAME); + assertEquals(cartridgeList.size(), 2); + + NetworkPartitionBean bean1 = null; + for (NetworkPartitionBean networkPartitionBean : cartridgeList) { + if (networkPartitionBean.getId().equals(networkPartitionId1)) { + bean1 = networkPartitionBean; + } + } + assertNotNull(bean1); + + NetworkPartitionBean bean2 = null; + for (NetworkPartitionBean networkPartitionBean : cartridgeList) { + if (networkPartitionBean.getId().equals(networkPartitionId2)) { + bean2 = networkPartitionBean; + } + } + assertNotNull(bean2); + + + boolean removed = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, + networkPartitionId1, RestConstants.NETWORK_PARTITIONS_NAME); + assertTrue(removed); + + NetworkPartitionBean beanRemoved = (NetworkPartitionBean) restClient. + getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId1, + NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME); + assertNull(beanRemoved); + + removed = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, + networkPartitionId2, RestConstants.NETWORK_PARTITIONS_NAME); + assertTrue(removed); + + beanRemoved = (NetworkPartitionBean) restClient. + getEntity(RestConstants.NETWORK_PARTITIONS, networkPartitionId2, + NetworkPartitionBean.class, RestConstants.NETWORK_PARTITIONS_NAME); + assertNull(beanRemoved); log.info("-------------------------Ended network partition test case-------------------------"); } catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java index 34a9d75..9702a31 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java @@ -34,6 +34,7 @@ import org.apache.http.impl.conn.PoolingClientConnectionManager; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; +import java.lang.reflect.Type; import java.net.URI; /** @@ -263,6 +264,35 @@ public class RestClient { } } + public Object listEntity(String resourcePath, Type type, String entityName) { + try { + URI uri = new URIBuilder(this.endPoint + resourcePath).build(); + HttpResponse response = doGet(uri); + GsonBuilder gsonBuilder = new GsonBuilder(); + Gson gson = gsonBuilder.create(); + if (response != null) { + if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) { + return gson.fromJson(response.getContent(), type); + } else if (response.getStatusCode() == 404) { + return null; + } else { + ErrorResponse errorResponse = gson.fromJson(response.getContent(), + ErrorResponse.class); + if (errorResponse != null) { + throw new RuntimeException(errorResponse.getErrorMessage()); + } + } + } + String msg = "An unknown error occurred while getting the " + entityName; + log.error(msg); + throw new RuntimeException(msg); + } catch (Exception e) { + String message = "Could not get " + entityName; + log.error(message, e); + throw new RuntimeException(message, e); + } + } + public boolean removeEntity(String resourcePath, String identifier, String entityName) { try { URI uri = new URIBuilder(this.endPoint + "/" + resourcePath + "/" + identifier).build(); http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/group-1-cartridge-group-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/group-1-cartridge-group-test.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/group-1-cartridge-group-test.json new file mode 100644 index 0000000..a3050f4 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/group-1-cartridge-group-test.json @@ -0,0 +1,50 @@ +{ + "name": "group-1-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/512280af/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/group-2-cartridge-group-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/group-2-cartridge-group-test.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/group-2-cartridge-group-test.json new file mode 100644 index 0000000..bbe7ae7 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/group-2-cartridge-group-test.json @@ -0,0 +1,50 @@ +{ + "name": "group-2-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/512280af/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c1-cartridge-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c1-cartridge-test.json b/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c1-cartridge-test.json new file mode 100755 index 0000000..2251af1 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c1-cartridge-test.json @@ -0,0 +1,124 @@ +{ + "category": "Application", + "description": "c1-cartridge-test Cartridge", + "displayName": "c1-cartridge-test", + "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": "c1-cartridge-test", + "version": "1.0" +} http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c2-cartridge-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c2-cartridge-test.json b/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c2-cartridge-test.json new file mode 100755 index 0000000..ce821f1 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/cartridge-test/cartridges/mock/c2-cartridge-test.json @@ -0,0 +1,124 @@ +{ + "category": "Application", + "description": "c2-cartridge-test Cartridge", + "displayName": "c2-cartridge-test", + "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": "c2-cartridge-test", + "version": "1.0" +} http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/application-policies/application-policy-application-bursting-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/application-policies/application-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/application-policies/application-policy-application-bursting-test.json deleted file mode 100644 index 15e757b..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/application-policies/application-policy-application-bursting-test.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "application-policy-group-termination-behavior-test", - "algorithm": "one-after-another", - "networkPartitions": [ - "network-partition-group-termination-behavior-test-1" - ], - "properties": [ - { - "name": "networkPartitionGroups", - "value": "network-partition-group-termination-behavior-test-1" - }, - { - "name": "key-2", - "value": "value-2" - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/application-policies/application-policy-group-termination-behavior-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/application-policies/application-policy-group-termination-behavior-test.json b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/application-policies/application-policy-group-termination-behavior-test.json new file mode 100644 index 0000000..15e757b --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/application-policies/application-policy-group-termination-behavior-test.json @@ -0,0 +1,17 @@ +{ + "id": "application-policy-group-termination-behavior-test", + "algorithm": "one-after-another", + "networkPartitions": [ + "network-partition-group-termination-behavior-test-1" + ], + "properties": [ + { + "name": "networkPartitionGroups", + "value": "network-partition-group-termination-behavior-test-1" + }, + { + "name": "key-2", + "value": "value-2" + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/applications/group-termination-behavior-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/applications/group-termination-behavior-test.json b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/applications/group-termination-behavior-test.json index 0ce09a8..70432ae 100644 --- a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/applications/group-termination-behavior-test.json +++ b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/applications/group-termination-behavior-test.json @@ -61,9 +61,9 @@ { "cartridgeMin": 1, "cartridgeMax": 1, - "type": "c4", + "type": "c4-group-termination-behavior-test", "subscribableInfo": { - "alias": "c4-1x0", + "alias": "c4-1x0-group-termination-behavior-test", "deploymentPolicy": "deployment-policy-group-termination-behavior-test", "artifactRepository": { "repoUsername": "user", http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json deleted file mode 100644 index fd81d17..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "autoscaling-policy-group-termination-behavior-test", - "loadThresholds": { - "requestsInFlight": { - "threshold": 35 - }, - "memoryConsumption": { - "threshold": 45 - }, - "loadAverage": { - "threshold": 25 - } - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/autoscaling-policies/autoscaling-policy-group-termination-behavior-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/autoscaling-policies/autoscaling-policy-group-termination-behavior-test.json b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/autoscaling-policies/autoscaling-policy-group-termination-behavior-test.json new file mode 100644 index 0000000..fd81d17 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/autoscaling-policies/autoscaling-policy-group-termination-behavior-test.json @@ -0,0 +1,14 @@ +{ + "id": "autoscaling-policy-group-termination-behavior-test", + "loadThresholds": { + "requestsInFlight": { + "threshold": 35 + }, + "memoryConsumption": { + "threshold": 45 + }, + "loadAverage": { + "threshold": 25 + } + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/cartridges-groups/cartridge-groups-group-termination-behavior-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/cartridges-groups/cartridge-groups-group-termination-behavior-test.json b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/cartridges-groups/cartridge-groups-group-termination-behavior-test.json index 52ce80f..2d69021 100644 --- a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/cartridges-groups/cartridge-groups-group-termination-behavior-test.json +++ b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/cartridges-groups/cartridge-groups-group-termination-behavior-test.json @@ -46,8 +46,8 @@ ] }, "cartridges": [ - "c4", - "c5" + "c3-group-termination-behavior-test", + "c4-group-termination-behavior-test" ], "groups": [ ] http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/deployment-policies/deployment-policy-group-termination-behavior-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/deployment-policies/deployment-policy-group-termination-behavior-test.json b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/deployment-policies/deployment-policy-group-termination-behavior-test.json new file mode 100644 index 0000000..035ad73 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/deployment-policies/deployment-policy-group-termination-behavior-test.json @@ -0,0 +1,18 @@ +{ + "id": "deployment-policy-group-termination-behavior-test", + "networkPartitions": [ + { + "id": "network-partition-group-termination-behavior-test-1", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 4 + } + ] + } + ] +} + + + http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/deployment-policies/deployment-policy-termination-behavior-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/deployment-policies/deployment-policy-termination-behavior-test.json b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/deployment-policies/deployment-policy-termination-behavior-test.json deleted file mode 100644 index 9209573..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/deployment-policies/deployment-policy-termination-behavior-test.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "deployment-policy-group-termination-behavior-test", - "networkPartitions": [ - { - "id": "network-partition-group-termination-behavior-test-1", - "partitionAlgo": "one-after-another", - "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/512280af/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/network-partitions/mock/network-partition-application-bursting-test-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/network-partitions/mock/network-partition-application-bursting-test-1.json b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/network-partitions/mock/network-partition-application-bursting-test-1.json deleted file mode 100644 index 13abc47..0000000 --- a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/network-partitions/mock/network-partition-application-bursting-test-1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "network-partition-group-termination-behavior-test-1", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/network-partitions/mock/network-partition-group-termination-behavior-test-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/network-partitions/mock/network-partition-group-termination-behavior-test-1.json b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/network-partitions/mock/network-partition-group-termination-behavior-test-1.json new file mode 100644 index 0000000..13abc47 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/group-termination-behavior-test/network-partitions/mock/network-partition-group-termination-behavior-test-1.json @@ -0,0 +1,15 @@ +{ + "id": "network-partition-group-termination-behavior-test-1", + "provider": "mock", + "partitions": [ + { + "id": "partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/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 a0f1066..37051b6 100644 --- a/products/stratos/modules/integration/src/test/resources/mock-iaas.xml +++ b/products/stratos/modules/integration/src/test/resources/mock-iaas.xml @@ -79,6 +79,26 @@ <sampleDuration>30</sampleDuration> </pattern> </cartridge> + <cartridge type="c3-group-termination-behavior-test"> + <!-- factor:memory-consumption|load-average|requests-in-flight--> + <!-- mode:loop|continue|stop --> + <!-- Mode defines the action needs to be taken after the last sample value: + 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</sampleValues> + <!-- Duration of each sample value in seconds --> + <sampleDuration>60</sampleDuration> + </pattern> + <pattern factor="load-average" mode="stop"> + <!-- Sample values --> + <sampleValues>20,20,20</sampleValues> + <!-- Duration of each sample value in seconds --> + <sampleDuration>60</sampleDuration> + </pattern> + </cartridge> <cartridge type="php"> <!-- factor:memory-consumption|load-average|requests-in-flight--> <!-- mode:loop|continue|stop --> http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-1.json b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-1.json new file mode 100644 index 0000000..d673796 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-1.json @@ -0,0 +1,15 @@ +{ + "id": "network-partition-network-partition-test-1", + "provider": "mock", + "partitions": [ + { + "id": "partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-2.json b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-2.json new file mode 100644 index 0000000..3e1ba76 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-2.json @@ -0,0 +1,15 @@ +{ + "id": "network-partition-network-partition-test-2", + "provider": "mock", + "partitions": [ + { + "id": "partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/512280af/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 b64603e..da48aa8 100644 --- a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml +++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml @@ -21,22 +21,22 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > <suite name="StratosIntegrationSuite"> - <test name="CartridgeTest"> + <!-- <test name="CartridgeTest"> <classes> <class name="org.apache.stratos.integration.tests.group.CartridgeTest" /> </classes> - </test> - <test name="CartridgeGroupTest" > + </test>--> + <!--<test name="CartridgeGroupTest" > <classes> <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" /> </classes> - </test> + </test>--> <test name="NetworkPartitionTest"> <classes> <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest" /> </classes> </test> - <test name="ApplicationPolicyTest"> + <!--<test name="ApplicationPolicyTest"> <classes> <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest" /> </classes> @@ -76,4 +76,9 @@ <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" /> </classes> </test> + <test name="GroupTerminationBehaviorTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest" /> + </classes> + </test>--> </suite>
