You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/09/10 10:13:56 UTC
[12/16] stratos git commit: Upgrading automation engine to v4.4.2
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/users/UserTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/users/UserTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/users/UserTest.java
deleted file mode 100644
index c15250f..0000000
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/users/UserTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.integration.tests.users;
-
-import com.google.gson.reflect.TypeToken;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.beans.UserInfoBean;
-import org.apache.stratos.common.beans.cartridge.CartridgeBean;
-import org.apache.stratos.integration.tests.RestConstants;
-import org.apache.stratos.integration.tests.StratosTestServerManager;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
-import static junit.framework.Assert.*;
-
-/**
- * Handling users
- */
-public class UserTest extends StratosTestServerManager {
- private static final Log log = LogFactory.getLog(UserTest.class);
- private static final String RESOURCES_PATH = "/user-test";
-
- @Test
- public void addUser() {
- try {
- log.info("-------------------------------Started users test case-------------------------------");
- String userId = "user-1";
- boolean addedUser1 = restClient.addEntity(RESOURCES_PATH + "/" +
- userId + ".json",
- RestConstants.USERS, RestConstants.USERS_NAME);
- assertTrue(addedUser1);
-
- Type listType = new TypeToken<ArrayList<UserInfoBean>>() {
- }.getType();
-
- List<UserInfoBean> userInfoBeanList = (List<UserInfoBean>) restClient.listEntity(RestConstants.USERS,
- listType, RestConstants.USERS_NAME);
-
- UserInfoBean bean1 = null;
- for (UserInfoBean userInfoBean : userInfoBeanList) {
- if (userInfoBean.getUserName().equals(userId)) {
- bean1 = userInfoBean;
- }
- }
- assertNotNull(bean1);
- /*assertEquals(bean1.getEmail(), "foo@bar.com");
- assertEquals(bean1.getFirstName(), "Frank");
- assertEquals(bean1.getRole(), "admin");
- assertEquals(bean1.getLastName(), "Myers");
- assertEquals(bean1.getCredential(), "kim12345");*/
-
- boolean updatedUser1 = restClient.updateEntity(RESOURCES_PATH + "/" +
- userId + "-v1.json",
- RestConstants.USERS, RestConstants.USERS_NAME);
- assertTrue(updatedUser1);
-
- userInfoBeanList = (List<UserInfoBean>) restClient.listEntity(RestConstants.USERS,
- listType, RestConstants.USERS_NAME);
-
- for (UserInfoBean userInfoBean : userInfoBeanList) {
- if (userInfoBean.getUserName().equals(userId)) {
- bean1 = userInfoBean;
- }
- }
- assertNotNull(bean1);
- /*assertEquals(bean1.getEmail(), "user-1@bar.com");
- assertEquals(bean1.getFirstName(), "Frankn");
- assertEquals(bean1.getRole(), "admin");
- assertEquals(bean1.getLastName(), "Myersn");
- assertEquals(bean1.getCredential(), "kim123456");*/
-
- boolean removedUser1 = restClient.removeEntity(RestConstants.USERS,
- userId, RestConstants.USERS_NAME);
- assertTrue(removedUser1);
-
- userInfoBeanList = (List<UserInfoBean>) restClient.listEntity(RestConstants.USERS,
- listType, RestConstants.USERS_NAME);
-
- bean1 = null;
- for (UserInfoBean userInfoBean : userInfoBeanList) {
- if (userInfoBean.getUserName().equals(userId)) {
- bean1 = userInfoBean;
- }
- }
- assertNull(bean1);
-
- log.info("-------------------------Ended users test case-------------------------");
-
- } catch (Exception e) {
- log.error("An error occurred while handling application bursting", e);
- assertTrue("An error occurred while handling application bursting", false);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/JMSOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/JMSOutputAdaptor.xml b/products/stratos/modules/integration/src/test/resources/JMSOutputAdaptor.xml
deleted file mode 100755
index a6a2cff..0000000
--- a/products/stratos/modules/integration/src/test/resources/JMSOutputAdaptor.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<outputEventAdaptor name="JMSOutputAdaptor" statistics="disable"
- trace="enable" type="jms" xmlns="http://wso2.org/carbon/eventadaptormanager">
- <!--property name="java.naming.provider.url">CEP_HOME/repository/conf/jndi.properties</property-->
- <property name="java.naming.provider.url">tcp://localhost:61617</property>
- <property name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</property>
- <property name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</property>
- <property name="transport.jms.DestinationType">topic</property>
-</outputEventAdaptor>
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-application-bursting-test.json
deleted file mode 100644
index 4d1d35f..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-application-bursting-test.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "id": "application-policy-application-bursting-test",
- "algorithm": "one-after-another",
- "networkPartitions": [
- "network-partition-application-bursting-test-1",
- "network-partition-application-bursting-test-2"
- ],
- "properties": [
- {
- "name": "networkPartitionGroups",
- "value": "network-partition-application-bursting-test-1|network-partition-application-bursting-test-2"
- },
- {
- "name": "key-2",
- "value": "value-2"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json
deleted file mode 100644
index c091ec5..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "applicationId": "application-bursting-test",
- "alias": "my-cartridge-group-app",
- "components": {
- "groups": [
- {
- "name": "esb-php-group-application-bursting-test",
- "alias": "my-esb-php-group-application-bursting-test",
- "deploymentPolicy": "deployment-policy-application-bursting-test",
- "groupMinInstances": 1,
- "groupMaxInstances": 2,
- "cartridges": [
- {
- "type": "esb-application-bursting-test",
- "cartridgeMin": 1,
- "cartridgeMax": 2,
- "subscribableInfo": {
- "alias": "my-esb-application-bursting-test",
- "autoscalingPolicy": "autoscaling-policy-application-bursting-test",
- "artifactRepository": {
- "privateRepo": false,
- "repoUrl": "https://github.com/imesh/stratos-esb-applications.git",
- "repoUsername": "",
- "repoPassword": ""
- }
- }
- },
- {
- "type": "php-application-bursting-test",
- "cartridgeMin": 2,
- "cartridgeMax": 4,
- "lvsVirtualIP": "192.168.56.50|255.255.255.0",
- "subscribableInfo": {
- "alias": "my-php-application-bursting-test",
- "autoscalingPolicy": "autoscaling-policy-application-bursting-test",
- "artifactRepository": {
- "privateRepo": false,
- "repoUrl": "https://github.com/imesh/stratos-php-applications.git",
- "repoUsername": "",
- "repoPassword": ""
- }
- }
- }
- ]
- }
- ],
- "cartridges": [
- {
- "type": "tomcat-application-bursting-test",
- "cartridgeMin": 2,
- "cartridgeMax": 4,
- "subscribableInfo": {
- "alias": "my-tomcat-application-bursting-test",
- "autoscalingPolicy": "autoscaling-policy-application-bursting-test",
- "deploymentPolicy": "deployment-policy-application-bursting-test",
- "artifactRepository": {
- "privateRepo": false,
- "repoUrl": "https://github.com/imesh/stratos-tomcat-applications.git",
- "repoUsername": "",
- "repoPassword": ""
- }
- }
- }
- ],
- "dependencies": {
- "terminationBehaviour": "terminate-none"
- }
- }
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json
deleted file mode 100644
index 697cb70..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-application-bursting-test",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 35
- },
- "memoryConsumption": {
- "threshold": 45
- },
- "loadAverage": {
- "threshold": 25
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group-application-bursting-test.json
deleted file mode 100644
index 8fbab89..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group-application-bursting-test.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "esb-php-group-application-bursting-test",
- "cartridges": [
- "esb-application-bursting-test",
- "php-application-bursting-test"
- ],
- "dependencies": {
- "startupOrders": [
- {
- "aliases": [
- "cartridge.my-esb-application-bursting-test",
- "cartridge.my-php-application-bursting-test"
- ]
- }
- ],
- "terminationBehaviour": "terminate-none"
- }
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb-application-bursting-test.json
deleted file mode 100755
index d97f9ff..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb-application-bursting-test.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "type": "esb-application-bursting-test",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "framework",
- "displayName": "esb-application-bursting-test",
- "description": "esb-application-bursting-test Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ],
- "metadataKeys": [
- "server_ip",
- "username",
- "password"
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php-application-bursting-test.json
deleted file mode 100755
index 02d0d9d..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php-application-bursting-test.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "type": "php-application-bursting-test",
- "provider": "apache",
- "category": "framework",
- "host": "php.stratos.org",
- "displayName": "php-application-bursting-test",
- "description": "php-application-bursting-test Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-80",
- "protocol": "http",
- "port": "8080",
- "proxyPort": "8280"
- },
- {
- "name": "http-22",
- "protocol": "tcp",
- "port": "22",
- "proxyPort": "8222"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "reka"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat-application-bursting-test.json
deleted file mode 100755
index b63d568..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat-application-bursting-test.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "type": "tomcat-application-bursting-test",
- "provider": "apache",
- "host": "tomcat.stratos.org",
- "category": "framework",
- "displayName": "tomcat-application-bursting-test",
- "description": "tomcat-application-bursting-test Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- },
- {
- "protocol": "http",
- "port": "8080",
- "proxyPort": "80"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ],
- "metadataKeys": [
- "url"
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-application-bursting-test.json
deleted file mode 100644
index 4adc0f2..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-application-bursting-test.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "id": "deployment-policy-application-bursting-test",
- "networkPartitions": [
- {
- "id": "network-partition-application-bursting-test-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "partitionMax": 4
- }
- ]
- },
- {
- "id": "network-partition-application-bursting-test-2",
- "partitionAlgo": "round-robin",
- "partitions": [
- {
- "id": "network-partition-10-partition-1",
- "partitionMax": 4
- },
- {
- "id": "network-partition-10-partition-2",
- "partitionMax": 4
- }
- ]
- }
- ]
-}
-
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-1.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-1.json
deleted file mode 100644
index 78f7d01..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-application-bursting-test-1",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-2.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-2.json
deleted file mode 100644
index 588bfff..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-application-bursting-test-2.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "id": "network-partition-application-bursting-test-2",
- "provider": "mock",
- "partitions": [
- {
- "id": "network-partition-10-partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "network-partition-10-partition-2",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test-1.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test-1.json
deleted file mode 100644
index da3e8ef..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test-1.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "id": "application-policy-application-policy-test-1",
- "algorithm": "one-after-another",
- "networkPartitions": [
- "network-partition-application-policy-test-1",
- "network-partition-application-policy-test-2"
- ],
- "properties": [
- {
- "name": "networkPartitionGroups",
- "value": "network-partition-application-policy-test-1,network-partition-application-policy-test-2"
- },
- {
- "name": "key-2",
- "value": "value-2"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test-2.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test-2.json
deleted file mode 100644
index ec3715c..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test-2.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "id": "application-policy-application-policy-test-2",
- "algorithm": "one-after-another",
- "networkPartitions": [
- "network-partition-application-policy-test-1",
- "network-partition-application-policy-test-2"
- ],
- "properties": [
- {
- "name": "networkPartitionGroups",
- "value": "network-partition-application-policy-test-1,network-partition-application-policy-test-2"
- },
- {
- "name": "key-2",
- "value": "value-2"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test.json
deleted file mode 100644
index cf1aace..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-application-policy-test.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "id": "application-policy-application-policy-test",
- "algorithm": "one-after-another",
- "networkPartitions": [
- "network-partition-application-policy-test-1",
- "network-partition-application-policy-test-2"
- ],
- "properties": [
- {
- "name": "networkPartitionGroups",
- "value": "network-partition-application-policy-test-1,network-partition-application-policy-test-2"
- },
- {
- "name": "key-2",
- "value": "value-2"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-1.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-1.json
deleted file mode 100644
index 79a9024..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-1.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "id": "network-partition-application-policy-test-1",
- "provider": "mock",
- "partitions": [
- {
- "id": "network-partition-8-partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "network-partition-8-partition-2",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-2.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-2.json
deleted file mode 100644
index a802378..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-application-policy-test-2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-application-policy-test-2",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/application-policies/application-policy-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/application-policies/application-policy-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/application-policies/application-policy-application-update-test.json
deleted file mode 100644
index 1b29165..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/application-policies/application-policy-application-update-test.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "id": "application-policy-application-update-test",
- "algorithm": "one-after-another",
- "networkPartitions": [
- "network-partition-application-update-test-1",
- "network-partition-application-update-test-2"
- ],
- "properties": [
- {
- "name": "networkPartitionGroups",
- "value": "network-partition-application-update-test-1,network-partition-application-update-test-2"
- },
- {
- "name": "key-2",
- "value": "value-2"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test-v1.json b/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test-v1.json
deleted file mode 100644
index 2509ab1..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test-v1.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
- "alias": "g-sc-G123-1-application-update-test",
- "applicationId": "g-sc-G123-1-application-update-test",
- "components": {
- "cartridges": [],
- "groups": [
- {
- "name": "G1-application-update-test",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group1-application-update-test",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c1-application-update-test",
- "subscribableInfo": {
- "alias": "c1-1x0-application-update-test",
- "deploymentPolicy": "deployment-policy-application-update-test",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-application-update-test"
- }
- }
- ],
- "groups": [
- {
- "name": "G2-application-update-test",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group2-application-update-test",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 4,
- "type": "c2-application-update-test",
- "subscribableInfo": {
- "alias": "c2-1x0-application-update-test",
- "deploymentPolicy": "deployment-policy-application-update-test",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-application-update-test"
- }
- }
- ],
- "groups": [
- {
- "name": "G3-application-update-test",
- "groupMaxInstances": 3,
- "groupMinInstances": 2,
- "deploymentPolicy": "deployment-policy-application-update-test",
- "alias": "group3-application-update-test",
- "cartridges": [
- {
- "cartridgeMin": 2,
- "cartridgeMax": 3,
- "type": "c3-application-update-test",
- "subscribableInfo": {
- "alias": "c3-1x0-application-update-test",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-application-update-test"
- }
- }
- ],
- "groups": []
- }
- ]
- }
- ]
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test.json
deleted file mode 100644
index 548e66c..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/applications/g-sc-G123-1-application-update-test.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
- "alias": "g-sc-G123-1-application-update-test",
- "applicationId": "g-sc-G123-1-application-update-test",
- "components": {
- "cartridges": [],
- "groups": [
- {
- "name": "G1-application-update-test",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group1-application-update-test",
- "cartridges": [
- {
- "cartridgeMin": 1,
- "cartridgeMax": 2,
- "type": "c1-application-update-test",
- "subscribableInfo": {
- "alias": "c1-1x0-application-update-test",
- "deploymentPolicy": "deployment-policy-application-update-test",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-application-update-test"
- }
- }
- ],
- "groups": [
- {
- "name": "G2-application-update-test",
- "groupMaxInstances": 1,
- "groupMinInstances": 1,
- "alias": "group2-application-update-test",
- "cartridges": [
- {
- "cartridgeMin": 1,
- "cartridgeMax": 2,
- "type": "c2-application-update-test",
- "subscribableInfo": {
- "alias": "c2-1x0-application-update-test",
- "deploymentPolicy": "deployment-policy-application-update-test",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-application-update-test"
- }
- }
- ],
- "groups": [
- {
- "name": "G3-application-update-test",
- "groupMaxInstances": 2,
- "groupMinInstances": 1,
- "deploymentPolicy": "deployment-policy-application-update-test",
- "alias": "group3-application-update-test",
- "cartridges": [
- {
- "cartridgeMin": 1,
- "cartridgeMax": 2,
- "type": "c3-application-update-test",
- "subscribableInfo": {
- "alias": "c3-1x0-application-update-test",
- "artifactRepository": {
- "repoUsername": "user",
- "repoUrl": "http://stratos.apache.org:10080/git/default.git",
- "privateRepo": true,
- "repoPassword": "c-policy"
- },
- "autoscalingPolicy": "autoscaling-policy-application-update-test"
- }
- }
- ],
- "groups": []
- }
- ]
- }
- ]
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/autoscaling-policies/autoscaling-policy-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/autoscaling-policies/autoscaling-policy-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/autoscaling-policies/autoscaling-policy-application-update-test.json
deleted file mode 100644
index 8d9b766..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/autoscaling-policies/autoscaling-policy-application-update-test.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-application-update-test",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 35
- },
- "memoryConsumption": {
- "threshold": 45
- },
- "loadAverage": {
- "threshold": 25
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test-v1.json b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test-v1.json
deleted file mode 100644
index 884ea0c..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test-v1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "G1-application-update-test",
- "dependencies": {
- "terminationBehaviour": "terminate-none",
- "startupOrders": [
- {
- "aliases": [
- "group.group2-application-update-test",
- "cartridge.c1-1x0-application-update-test"
- ]
- }
- ]
- },
- "cartridges": [
- "c1-application-update-test"
- ],
- "groups": [
- {
- "name": "G2-application-update-test",
- "dependencies": {
- "terminationBehaviour": "terminate-dependents",
- "startupOrders": [
- {
- "aliases": [
- "group.group3-application-update-test",
- "cartridge.c2-1x0-application-update-test"
- ]
- }
- ]
- },
- "cartridges": [
- "c2-application-update-test"
- ],
- "groups": [
- {
- "name": "G3-application-update-test",
- "dependencies": {
- "terminationBehaviour": "terminate-all",
- "startupOrders": []
- },
- "cartridges": [
- "c3-application-update-test"
- ],
- "groups": []
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test.json
deleted file mode 100644
index 884ea0c..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges-groups/cartrdige-nested-application-update-test.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "G1-application-update-test",
- "dependencies": {
- "terminationBehaviour": "terminate-none",
- "startupOrders": [
- {
- "aliases": [
- "group.group2-application-update-test",
- "cartridge.c1-1x0-application-update-test"
- ]
- }
- ]
- },
- "cartridges": [
- "c1-application-update-test"
- ],
- "groups": [
- {
- "name": "G2-application-update-test",
- "dependencies": {
- "terminationBehaviour": "terminate-dependents",
- "startupOrders": [
- {
- "aliases": [
- "group.group3-application-update-test",
- "cartridge.c2-1x0-application-update-test"
- ]
- }
- ]
- },
- "cartridges": [
- "c2-application-update-test"
- ],
- "groups": [
- {
- "name": "G3-application-update-test",
- "dependencies": {
- "terminationBehaviour": "terminate-all",
- "startupOrders": []
- },
- "cartridges": [
- "c3-application-update-test"
- ],
- "groups": []
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c1-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c1-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c1-application-update-test.json
deleted file mode 100755
index fcfa6f2..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c1-application-update-test.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "type": "c1-application-update-test",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "data",
- "displayName": "c1-application-update-test",
- "description": "c1-application-update-test Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c2-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c2-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c2-application-update-test.json
deleted file mode 100755
index a1c1a97..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c2-application-update-test.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "type": "c2-application-update-test",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "data",
- "displayName": "c2-application-update-test",
- "description": "c2-application-update-test Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c3-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c3-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c3-application-update-test.json
deleted file mode 100755
index e3932fc..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/cartridges/mock/c3-application-update-test.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "type": "c3-application-update-test",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "data",
- "displayName": "c3-application-update-test",
- "description": "c3-application-update-test Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test-v1.json b/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test-v1.json
deleted file mode 100644
index 5dc2081..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test-v1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "id": "deployment-policy-application-update-test",
- "networkPartitions": [
- {
- "id": "network-partition-application-update-test-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "partitionMax": 25
- },
- {
- "id": "partition-2",
- "partitionMax": 20
- }
- ]
- },
- {
- "id": "network-partition-application-update-test-2",
- "partitionAlgo": "round-robin",
- "partitions": [
- {
- "id": "network-partition-2-partition-1",
- "partitionMax": 15
- },
- {
- "id": "network-partition-2-partition-2",
- "partitionMax": 5
- }
- ]
- }
- ]
-}
-
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test.json b/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test.json
deleted file mode 100644
index 647322b..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/deployment-policies/deployment-policy-application-update-test.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "id": "deployment-policy-application-update-test",
- "networkPartitions": [
- {
- "id": "network-partition-application-update-test-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "partitionMax": 20
- }
- ]
- },
- {
- "id": "network-partition-application-update-test-2",
- "partitionAlgo": "round-robin",
- "partitions": [
- {
- "id": "network-partition-2-partition-1",
- "partitionMax": 10
- },
- {
- "id": "network-partition-2-partition-2",
- "partitionMax": 9
- }
- ]
- }
- ]
-}
-
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1-v1.json b/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1-v1.json
deleted file mode 100644
index aaa3f04..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1-v1.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "id": "network-partition-application-update-test-1",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "partition-2",
- "property": [
- {
- "name": "region",
- "value": "default1"
- },
- {
- "name": "zone",
- "value": "z1"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1.json b/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1.json
deleted file mode 100644
index f1822af..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "network-partition-application-update-test-1",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-2.json b/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-2.json
deleted file mode 100644
index 19ddd83..0000000
--- a/products/stratos/modules/integration/src/test/resources/application-update-test/network-partitions/mock/network-partition-application-update-test-2.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "id": "network-partition-application-update-test-2",
- "provider": "mock",
- "partitions": [
- {
- "id": "network-partition-2-partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- },
- {
- "id": "network-partition-2-partition-2",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-1.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-1.json
deleted file mode 100644
index d7765b9..0000000
--- a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-1.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-autoscaling-policy-test-1",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 35
- },
- "memoryConsumption": {
- "threshold": 45
- },
- "loadAverage": {
- "threshold": 25
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-2.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-2.json
deleted file mode 100644
index 03f3a01..0000000
--- a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-autoscaling-policy-test-2",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 35
- },
- "memoryConsumption": {
- "threshold": 45
- },
- "loadAverage": {
- "threshold": 25
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-v1.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-v1.json
deleted file mode 100644
index d29a8e3..0000000
--- a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test-v1.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-autoscaling-policy-test",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 30
- },
- "memoryConsumption": {
- "threshold": 40
- },
- "loadAverage": {
- "threshold": 20
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test.json
deleted file mode 100644
index dce4c7a..0000000
--- a/products/stratos/modules/integration/src/test/resources/autoscaling-policy-test/autoscaling-policies/autoscaling-policy-autoscaling-policy-test.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-autoscaling-policy-test",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 35
- },
- "memoryConsumption": {
- "threshold": 45
- },
- "loadAverage": {
- "threshold": 25
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test-v1.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test-v1.json
deleted file mode 100644
index 38a976a..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test-v1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "G4-cartridge-group-test",
- "dependencies": {
- "terminationBehaviour": "terminate-none",
- "startupOrders": [
- {
- "aliases": [
- "group.group2-cartridge-group-test",
- "cartridge.c1-1x0-cartridge-group-test"
- ]
- }
- ]
- },
- "cartridges": [
- "c4-cartridge-group-test"
- ],
- "groups": [
- {
- "name": "G5-cartridge-group-test",
- "dependencies": {
- "terminationBehaviour": "terminate-dependents",
- "startupOrders": [
- {
- "aliases": [
- "group.group6-cartridge-group-test",
- "cartridge.c5-1x0-cartridge-group-test"
- ]
- }
- ]
- },
- "cartridges": [
- "c5-cartridge-group-test"
- ],
- "groups": [
- {
- "name": "G6-cartridge-group-test",
- "dependencies": {
- "terminationBehaviour": "terminate-all",
- "startupOrders": []
- },
- "cartridges": [
- "c6-cartridge-group-test"
- ],
- "groups": []
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test.json
deleted file mode 100644
index 741efe0..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/g4-g5-g6-cartridge-group-test.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "G4-cartridge-group-test",
- "dependencies": {
- "terminationBehaviour": "terminate-none",
- "startupOrders": [
- {
- "aliases": [
- "group.group5-cartridge-group-test",
- "cartridge.c4-1x0-cartridge-group-test"
- ]
- }
- ]
- },
- "cartridges": [
- "c4-cartridge-group-test"
- ],
- "groups": [
- {
- "name": "G5-cartridge-group-test",
- "dependencies": {
- "terminationBehaviour": "terminate-dependents",
- "startupOrders": [
- {
- "aliases": [
- "group.group6-cartridge-group-test",
- "cartridge.c5-1x0-cartridge-group-test"
- ]
- }
- ]
- },
- "cartridges": [
- "c5-cartridge-group-test"
- ],
- "groups": [
- {
- "name": "G6-cartridge-group-test",
- "dependencies": {
- "terminationBehaviour": "terminate-all",
- "startupOrders": []
- },
- "cartridges": [
- "c6-cartridge-group-test"
- ],
- "groups": []
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/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
deleted file mode 100644
index a3050f4..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/group-1-cartridge-group-test.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "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/395be450/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
deleted file mode 100644
index bbe7ae7..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges-groups/group-2-cartridge-group-test.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "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/395be450/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4-cartridge-group-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4-cartridge-group-test.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4-cartridge-group-test.json
deleted file mode 100755
index f34c1c4..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c4-cartridge-group-test.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "type": "c4-cartridge-group-test",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "data",
- "displayName": "c4-cartridge-group-test",
- "description": "c4-cartridge-group-test Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5-cartridge-group-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5-cartridge-group-test.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5-cartridge-group-test.json
deleted file mode 100755
index 9c236a0..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c5-cartridge-group-test.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "category": "Application",
- "description": "c5-cartridge-group-test Cartridge",
- "displayName": "c5-cartridge-group-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": "c5-cartridge-group-test",
- "version": "1.0"
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6-cartridge-group-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6-cartridge-group-test.json b/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6-cartridge-group-test.json
deleted file mode 100755
index 4bfcca6..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridge-group-test/cartridges/mock/c6-cartridge-group-test.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "type": "c6-cartridge-group-test",
- "provider": "apache",
- "host": "stratos.apache.org",
- "category": "data",
- "displayName": "c6-cartridge-group-test",
- "description": "c6-cartridge-group-test Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "name": "http-22",
- "protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "mock",
- "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
- "networkInterfaces": [
- {
- "networkUuid": "b55f009a-1cc6-cartridge-group-test-4b17-924f-4ae0ee18db5e"
- }
- ],
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/aa5f45a2-c6-cartridge-group-testd6-419d-917a-9dd2e3888594"
- },
- {
- "name": "keyPair",
- "value": "vishanth-key"
- },
- {
- "name": "securityGroups",
- "value": "default"
- }
- ]
- }
- ]
-}