You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/08/18 19:01:26 UTC
[9/9] stratos git commit: adding complex application and disabling
the termination behavior test
adding complex application and disabling the termination behavior test
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e3ba6478
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e3ba6478
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e3ba6478
Branch: refs/heads/master
Commit: e3ba6478cf86043e1d6315539cc3f957a56440a2
Parents: 48cca39
Author: reka <rt...@gmail.com>
Authored: Sat Aug 15 09:33:50 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Tue Aug 18 17:06:50 2015 +0530
----------------------------------------------------------------------
.../GroupTerminationBehaviorTest.java | 22 ++--
.../app-bursting-single-cartriddge-group.json | 126 +++++++++++++++----
.../group-8-group-startup-order-test.json | 18 +++
.../group6-start-order-test.json | 19 +++
.../mock/group-8-group-startup-order-test.json | 18 +++
.../stratos-lb-group-startup-order-test.json | 44 +++++++
.../mock/tomcat-group-startup-order-test.json | 53 ++++++++
.../mock/tomcat1-group-startup-order-test.json | 45 +++++++
.../mock/tomcat2-group-startup-order-test.json | 49 ++++++++
.../mock/tomcat3-group-startup-order-test.json | 31 +++++
.../src/test/resources/stratos-testing.xml | 4 +-
11 files changed, 391 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3ba6478/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/GroupTerminationBehaviorTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/GroupTerminationBehaviorTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/GroupTerminationBehaviorTest.java
index 415f67a..629085f 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/GroupTerminationBehaviorTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/GroupTerminationBehaviorTest.java
@@ -26,10 +26,7 @@ import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
import org.apache.stratos.integration.tests.RestConstants;
import org.apache.stratos.integration.tests.StratosTestServerManager;
import org.apache.stratos.integration.tests.TopologyHandler;
-import org.apache.stratos.messaging.domain.application.Application;
import org.apache.stratos.messaging.domain.application.ApplicationStatus;
-import org.apache.stratos.messaging.domain.application.Group;
-import org.apache.stratos.messaging.message.receiver.application.ApplicationManager;
import org.testng.annotations.Test;
import java.util.ArrayList;
@@ -89,7 +86,7 @@ public class GroupTerminationBehaviorTest extends StratosTestServerManager {
"network-partition-group-termination-behavior-test-1.json",
RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME);
assertTrue(addedN1);
-
+
boolean addedDep = restClient.addEntity(RESOURCES_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" +
"deployment-policy-group-termination-behavior-test.json",
RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME);
@@ -164,6 +161,7 @@ public class GroupTerminationBehaviorTest extends StratosTestServerManager {
ApplicationStatus.Active);
assertCreationOfNodes(groupId, clusterIdC2);
+
assertCreationOfNodes(clusterIdC3, clusterIdC4);
//Group active handling
@@ -274,7 +272,7 @@ public class GroupTerminationBehaviorTest extends StratosTestServerManager {
long startTime = System.currentTimeMillis();
Map<String, Long> inActiveMap = TopologyHandler.getInstance().getInActiveMembers();
- while(!inActiveMap.containsKey(clusterId)) {
+ while (!inActiveMap.containsKey(clusterId)) {
try {
Thread.sleep(1000);
} catch (InterruptedException ignore) {
@@ -286,7 +284,7 @@ public class GroupTerminationBehaviorTest extends StratosTestServerManager {
}
assertTrue(inActiveMap.containsKey(clusterId));
- while(!inActiveMap.containsKey(groupId)) {
+ while (!inActiveMap.containsKey(groupId)) {
try {
Thread.sleep(1000);
} catch (InterruptedException ignore) {
@@ -302,9 +300,9 @@ public class GroupTerminationBehaviorTest extends StratosTestServerManager {
private void assertTerminatingOfNodes(String groupId, List<String> clusterIds) {
Map<String, Long> terminatingMembers = TopologyHandler.getInstance().getTerminatingMembers();
- for(String clusterId : clusterIds) {
+ for (String clusterId : clusterIds) {
long startTime = System.currentTimeMillis();
- while(!terminatingMembers.containsKey(clusterId)) {
+ while (!terminatingMembers.containsKey(clusterId)) {
try {
Thread.sleep(1000);
} catch (InterruptedException ignore) {
@@ -317,7 +315,7 @@ public class GroupTerminationBehaviorTest extends StratosTestServerManager {
assertTrue(terminatingMembers.containsKey(groupId));
}
long startTime = System.currentTimeMillis();
- while(!terminatingMembers.containsKey(groupId)) {
+ while (!terminatingMembers.containsKey(groupId)) {
try {
Thread.sleep(1000);
} catch (InterruptedException ignore) {
@@ -335,8 +333,8 @@ public class GroupTerminationBehaviorTest extends StratosTestServerManager {
long startTime = System.currentTimeMillis();
Map<String, Long> terminatedMembers = TopologyHandler.getInstance().getTerminatedMembers();
- for(String clusterId : clusterIds) {
- while(!terminatedMembers.containsKey(clusterId)) {
+ for (String clusterId : clusterIds) {
+ while (!terminatedMembers.containsKey(clusterId)) {
try {
Thread.sleep(1000);
} catch (InterruptedException ignore) {
@@ -349,7 +347,7 @@ public class GroupTerminationBehaviorTest extends StratosTestServerManager {
assertTrue(terminatedMembers.containsKey(clusterId));
}
- while(!terminatedMembers.containsKey(groupId)) {
+ while (!terminatedMembers.containsKey(groupId)) {
try {
Thread.sleep(1000);
} catch (InterruptedException ignore) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3ba6478/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json
index db04c61..8689fd8 100644
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json
+++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json
@@ -1,41 +1,99 @@
{
"applicationId": "group-startup-order-test",
- "alias": "my-cartridge-group-app",
+ "alias": "group-startup-order-test",
"components": {
"groups": [
{
- "name": "esb-php-group-group-startup-order-test",
- "alias": "my-esb-php-group-group-startup-order-test",
- "deploymentPolicy": "deployment-policy-group-startup-order-test",
+ "name": "group6-group-startup-order-test",
+ "alias": "my-group6-group-startup-order-test",
"groupMinInstances": 1,
- "groupMaxInstances": 2,
+ "groupMaxInstances": 1,
+ "deploymentPolicy": "deployment-policy-group-startup-order-test",
+ "groups": [
+ {
+ "name": "group7-group-startup-order-test",
+ "alias": "my-group7-group-startup-order-test",
+ "groupMinInstances": 1,
+ "groupMaxInstances": 1,
+ "cartridges": [
+ {
+ "type": "tomcat1",
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
+ "subscribableInfo": {
+ "alias": "my-tomcat1-group7",
+ "autoscalingPolicy": "autoscaling-policy-1",
+ "artifactRepository": {
+ "privateRepo": false,
+ "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git",
+ "repoUsername": "",
+ "repoPassword": ""
+ }
+ }
+ }
+ ]
+ }
+ ],
"cartridges": [
{
- "type": "esb-group-startup-order-test",
+ "type": "tomcat2",
"cartridgeMin": 1,
"cartridgeMax": 2,
"subscribableInfo": {
- "alias": "my-esb-group-startup-order-test",
- "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
+ "alias": "my-tomcat2-group6",
+ "autoscalingPolicy": "autoscaling-policy-1",
"artifactRepository": {
"privateRepo": false,
- "repoUrl": "https://github.com/imesh/stratos-esb-applications.git",
+ "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git",
"repoUsername": "",
"repoPassword": ""
}
}
- },
+ }
+ ]
+ },
+ {
+ "name": "group8",
+ "alias": "my-group8",
+ "groupMinInstances": 1,
+ "groupMaxInstances": 1,
+ "deploymentPolicy": "deployment-policy-1",
+ "groups": [
{
- "type": "php-group-startup-order-test",
- "cartridgeMin": 2,
- "cartridgeMax": 4,
- "lvsVirtualIP": "192.168.56.50|255.255.255.0",
+ "name": "group9",
+ "alias": "my-group9",
+ "groupMinInstances": 1,
+ "groupMaxInstances": 1,
+ "cartridges": [
+ {
+ "type": "tomcat1",
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
+ "subscribableInfo": {
+ "alias": "my-tomcat1-group9",
+ "autoscalingPolicy": "autoscaling-policy-1",
+ "artifactRepository": {
+ "privateRepo": false,
+ "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git",
+ "repoUsername": "",
+ "repoPassword": ""
+ }
+ }
+ }
+ ]
+ }
+ ],
+ "cartridges": [
+ {
+ "type": "tomcat2",
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
"subscribableInfo": {
- "alias": "my-php-group-startup-order-test",
- "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
+ "alias": "my-tomcat2-group8",
+ "autoscalingPolicy": "autoscaling-policy-1",
"artifactRepository": {
"privateRepo": false,
- "repoUrl": "https://github.com/imesh/stratos-php-applications.git",
+ "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git",
"repoUsername": "",
"repoPassword": ""
}
@@ -46,13 +104,23 @@
],
"cartridges": [
{
- "type": "tomcat-group-startup-order-test",
- "cartridgeMin": 2,
- "cartridgeMax": 4,
+ "type": "stratos-lb",
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
"subscribableInfo": {
- "alias": "my-tomcat-group-startup-order-test",
- "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
- "deploymentPolicy": "deployment-policy-group-startup-order-test",
+ "alias": "my-stratos-lb",
+ "autoscalingPolicy": "autoscaling-policy-1",
+ "deploymentPolicy": "deployment-policy-1"
+ }
+ },
+ {
+ "type": "tomcat",
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
+ "subscribableInfo": {
+ "alias": "my-tomcat",
+ "autoscalingPolicy": "autoscaling-policy-1",
+ "deploymentPolicy": "deployment-policy-1",
"artifactRepository": {
"privateRepo": false,
"repoUrl": "https://github.com/imesh/stratos-tomcat-applications.git",
@@ -63,7 +131,17 @@
}
],
"dependencies": {
- "terminationBehaviour": "terminate-none"
+ "startupOrders": [
+ {
+ "aliases": [
+ "cartridge.my-tomcat",
+ "cartridge.my-stratos-lb",
+ "group.my-group6",
+ "group.my-group8"
+ ]
+ }
+ ],
+ "terminationBehaviour": "terminate-all"
}
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3ba6478/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group-8-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group-8-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group-8-group-startup-order-test.json
new file mode 100644
index 0000000..9bd63d9
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group-8-group-startup-order-test.json
@@ -0,0 +1,18 @@
+{
+ "name": "group8-group-startup-order-test",
+ "groups": [
+ {
+ "name": "group9-group-startup-order-test",
+ "cartridges": [
+ "tomcat1-group-startup-order-test"
+ ]
+ }
+ ],
+ "cartridges": [
+ "tomcat2-group-startup-order-test"
+ ],
+ "dependencies": {
+ "terminationBehaviour": "terminate-all"
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3ba6478/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-start-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-start-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-start-order-test.json
new file mode 100644
index 0000000..6601222
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-start-order-test.json
@@ -0,0 +1,19 @@
+{
+ "name": "group6-group-startup-order-test",
+ "cartridges": [
+ "tomcat2-group-startup-order-test",
+ "tomcat1-group-startup-order-test"
+ ],
+ "dependencies": {
+ "startupOrders": [
+ {
+ "aliases": [
+ "cartridge.my-tomcat2-group-startup-order-test",
+ "cartridge.my-tomcat1-group-startup-order-test"
+ ]
+ }
+ ],
+ "terminationBehaviour": "terminate-all"
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3ba6478/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group-8-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group-8-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group-8-group-startup-order-test.json
new file mode 100644
index 0000000..9bd63d9
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/group-8-group-startup-order-test.json
@@ -0,0 +1,18 @@
+{
+ "name": "group8-group-startup-order-test",
+ "groups": [
+ {
+ "name": "group9-group-startup-order-test",
+ "cartridges": [
+ "tomcat1-group-startup-order-test"
+ ]
+ }
+ ],
+ "cartridges": [
+ "tomcat2-group-startup-order-test"
+ ],
+ "dependencies": {
+ "terminationBehaviour": "terminate-all"
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3ba6478/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json
new file mode 100755
index 0000000..8ee5d7e
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json
@@ -0,0 +1,44 @@
+{
+ "type": "stratos-lb",
+ "provider": "stratos",
+ "category": "load-balancer",
+ "host": "complex-app-with-lb",
+ "displayName": "Stratos Load Balancer",
+ "description": "Stratos Load Balancer Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "image1",
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "instanceType1"
+ },
+ {
+ "name": "keyPair",
+ "value": "default"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ],
+ "metadataKeys": [
+ "writeparam3",
+ "writeparam4"
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3ba6478/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json
new file mode 100755
index 0000000..395687d
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json
@@ -0,0 +1,53 @@
+{
+ "type": "tomcat",
+ "provider": "apache",
+ "host": "tomcat.stratos.org",
+ "category": "framework",
+ "displayName": "tomcat",
+ "description": "tomcat Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ },
+ {
+ "protocol": "http",
+ "port": "8080",
+ "proxyPort": "80"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ],
+ "metadataKeys": [
+ "url"
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3ba6478/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat1-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat1-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat1-group-startup-order-test.json
new file mode 100755
index 0000000..0f2141e
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat1-group-startup-order-test.json
@@ -0,0 +1,45 @@
+{
+ "type": "tomcat1",
+ "provider": "apache",
+ "category": "framework",
+ "host": "tomcat1.stratos.org",
+ "displayName": "tomcat1",
+ "description": "tomcat1 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": "reka"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3ba6478/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat2-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat2-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat2-group-startup-order-test.json
new file mode 100755
index 0000000..13db35e
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat2-group-startup-order-test.json
@@ -0,0 +1,49 @@
+{
+ "type": "tomcat2",
+ "provider": "apache",
+ "category": "framework",
+ "host": "tomcat2.stratos.org",
+ "displayName": "tomcat2",
+ "description": "tomcat2 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": "reka"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ],
+ "metadataKeys": [
+ "writeparam5",
+ "writeparam6"
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3ba6478/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat3-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat3-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat3-group-startup-order-test.json
new file mode 100755
index 0000000..6ea62a3
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat3-group-startup-order-test.json
@@ -0,0 +1,31 @@
+{
+ "type": "tomcat3",
+ "provider": "apache",
+ "host": "tomcat.stratos.org",
+ "category": "framework",
+ "displayName": "Tomcat 7",
+ "description": "Tomcat 7 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-8080",
+ "protocol": "http",
+ "port": "8080",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ "baseDir": "/opt/tomcat/webapps"
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "not-needed",
+ "networkInterfaces": [
+ ],
+ "property": [
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e3ba6478/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 3f66b6b..c772a63 100644
--- a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
+++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
@@ -76,9 +76,9 @@
<class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" />
</classes>
</test>
- <test name="GroupTerminationBehaviorTest">
+ <!--<test name="GroupTerminationBehaviorTest">
<classes>
<class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest" />
</classes>
- </test>
+ </test>-->
</suite>