You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/04 10:40:37 UTC
[5/8] stratos git commit: adding application add, deploy, update,
undeploy and remove in the integration test
http://git-wip-us.apache.org/repos/asf/stratos/blob/4f3a53c6/products/stratos/modules/integration/src/test/resources/applications/simple/single-group-app/README.md
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-group-app/README.md b/products/stratos/modules/integration/src/test/resources/applications/simple/single-group-app/README.md
deleted file mode 100644
index d0c764b..0000000
--- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-group-app/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Single Group Application
-========================
-An application with a tomcat cartridge and a cartridge group which consists of esb and php cartridges.
-
-Application view
-----------------
-single-group-app <br />
--- cartridge-group-app-1 <br />
--- -- my-tomcat <br />
--- -- my-esb-php-group <br />
--- -- -- my-esb <br />
--- -- -- my-php <br />
-
-Application folder structure
-----------------------------
--- artifacts/[iaas]/ IaaS specific artifacts <br />
--- scripts/common/ Common scripts for all iaases <br />
--- scripts/[iaas] IaaS specific scripts <br />
-
-How to run
-----------
-cd scripts/[iaas]/ <br />
-./deploy.sh <br />
-
-How to undeploy
----------------
-cd scripts/[iaas]/ <br />
-./undeploy.sh <br />
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/4f3a53c6/products/stratos/modules/integration/src/test/resources/applications/simple/single-group-app/artifacts/application.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-group-app/artifacts/application.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-group-app/artifacts/application.json
deleted file mode 100644
index c16a3f3..0000000
--- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-group-app/artifacts/application.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
- "applicationId": "cartridge-group-app",
- "alias": "my-cartridge-group-app",
- "components": {
- "groups": [
- {
- "name": "esb-php-group",
- "alias": "my-esb-php-group",
- "deploymentPolicy": "deployment-policy-1",
- "groupMinInstances": 1,
- "groupMaxInstances": 2,
- "cartridges": [
- {
- "type": "esb",
- "cartridgeMin": 1,
- "cartridgeMax": 2,
- "subscribableInfo": {
- "alias": "my-esb",
- "autoscalingPolicy": "autoscaling-policy-1",
- "artifactRepository": {
- "privateRepo": false,
- "repoUrl": "https://github.com/imesh/stratos-esb-applications.git",
- "repoUsername": "",
- "repoPassword": ""
- }
- }
- },
- {
- "type": "php",
- "cartridgeMin": 1,
- "cartridgeMax": 2,
- "subscribableInfo": {
- "alias": "my-php",
- "autoscalingPolicy": "autoscaling-policy-1",
- "artifactRepository": {
- "privateRepo": false,
- "repoUrl": "https://github.com/imesh/stratos-php-applications.git",
- "repoUsername": "",
- "repoPassword": ""
- }
- }
- }
- ]
- }
- ],
- "cartridges": [
- {
- "type": "tomcat",
- "cartridgeMin": 2,
- "cartridgeMax": 4,
- "subscribableInfo": {
- "alias": "my-tomcat",
- "autoscalingPolicy": "autoscaling-policy-1",
- "deploymentPolicy": "deployment-policy-1",
- "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/4f3a53c6/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json
new file mode 100644
index 0000000..f82403b
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-1",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 35
+ },
+ "memoryConsumption": {
+ "threshold": 45
+ },
+ "loadAverage": {
+ "threshold": 25
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4f3a53c6/products/stratos/modules/integration/src/test/resources/cartridge-groups/group1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridge-groups/group1.json b/products/stratos/modules/integration/src/test/resources/cartridge-groups/group1.json
deleted file mode 100644
index 8fc36dd..0000000
--- a/products/stratos/modules/integration/src/test/resources/cartridge-groups/group1.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "name": "group1",
- "groups": [
- {
- "name": "group2",
- "cartridges": [
- "c3",
- "c2"
- ],
- "dependencies": {
- "startupOrders": [
- {
- "aliases": [
- "cartridge.my-c3-group2",
- "cartridge.my-c2-group2"
- ]
- }
- ],
- "terminationBehaviour": "terminate-all"
- }
- }
- ],
- "cartridges": [
- "c1"
- ],
- "dependencies": {
- "startupOrders": [
- {
- "aliases": [
- "cartridge.my-c1-group1",
- "group.my-group2"
- ]
- }
- ],
- "terminationBehaviour": "terminate-dependents"
- }
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/4f3a53c6/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested.json b/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested.json
index 8ef80e7..6020e1e 100644
--- a/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested.json
+++ b/products/stratos/modules/integration/src/test/resources/cartridges-groups/cartrdige-nested.json
@@ -2,7 +2,14 @@
"name": "G1",
"dependencies": {
"terminationBehaviour": "terminate-none",
- "startupOrders": ["group.group2,cartridge.c1-1x0"]
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group2",
+ "cartridge.c1-1x0"
+ ]
+ }
+ ]
},
"cartridges": [
"c1"
@@ -12,7 +19,14 @@
"name": "G2",
"dependencies": {
"terminationBehaviour": "terminate-dependents",
- "startupOrders": ["group.group3,cartridge.c2-1x0"]
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group3",
+ "cartridge.c2-1x0"
+ ]
+ }
+ ]
},
"cartridges": [
"c2"
http://git-wip-us.apache.org/repos/asf/stratos/blob/4f3a53c6/products/stratos/modules/integration/src/test/resources/cartridges-groups/update/cartrdige-nested.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges-groups/update/cartrdige-nested.json b/products/stratos/modules/integration/src/test/resources/cartridges-groups/update/cartrdige-nested.json
new file mode 100644
index 0000000..6020e1e
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridges-groups/update/cartrdige-nested.json
@@ -0,0 +1,50 @@
+{
+ "name": "G1",
+ "dependencies": {
+ "terminationBehaviour": "terminate-none",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group2",
+ "cartridge.c1-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c1"
+ ],
+ "groups": [
+ {
+ "name": "G2",
+ "dependencies": {
+ "terminationBehaviour": "terminate-dependents",
+ "startupOrders": [
+ {
+ "aliases": [
+ "group.group3",
+ "cartridge.c2-1x0"
+ ]
+ }
+ ]
+ },
+ "cartridges": [
+ "c2"
+ ],
+ "groups": [
+ {
+ "name": "G3",
+ "dependencies": {
+ "terminationBehaviour": "terminate-all",
+ "startupOrders": []
+ },
+ "cartridges": [
+ "c3"
+ ],
+ "groups": []
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/4f3a53c6/products/stratos/modules/integration/src/test/resources/cartridges/mock/c1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c1.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c1.json
new file mode 100755
index 0000000..145e2ce
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c1.json
@@ -0,0 +1,45 @@
+{
+ "type": "c1",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c1",
+ "description": "c1 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4f3a53c6/products/stratos/modules/integration/src/test/resources/cartridges/mock/c2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c2.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c2.json
new file mode 100755
index 0000000..fd85892
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c2.json
@@ -0,0 +1,45 @@
+{
+ "type": "c2",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c2",
+ "description": "c2 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4f3a53c6/products/stratos/modules/integration/src/test/resources/cartridges/mock/c3.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/cartridges/mock/c3.json b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c3.json
new file mode 100755
index 0000000..937e8d3
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/cartridges/mock/c3.json
@@ -0,0 +1,45 @@
+{
+ "type": "c3",
+ "provider": "apache",
+ "host": "stratos.apache.org",
+ "category": "data",
+ "displayName": "c3",
+ "description": "c3 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "name": "http-22",
+ "protocol": "http",
+ "port": "22",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "mock",
+ "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
+ "networkInterfaces": [
+ {
+ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
+ }
+ ],
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+ },
+ {
+ "name": "keyPair",
+ "value": "vishanth-key"
+ },
+ {
+ "name": "securityGroups",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}