You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/03/01 21:26:19 UTC
stratos git commit: Fixing typo tools/automation-scripts folder name
Repository: stratos
Updated Branches:
refs/heads/master 56b20376e -> 04e315b1b
Fixing typo tools/automation-scripts folder name
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/04e315b1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/04e315b1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/04e315b1
Branch: refs/heads/master
Commit: 04e315b1b59fb63ad9c6960902977e9ec132349a
Parents: 56b2037
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Mar 2 01:56:00 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Mar 2 01:56:00 2015 +0530
----------------------------------------------------------------------
.../deployment_script.sh | 36 ++++++++
.../m1-samples/ec2/autoscale-policy.json | 14 +++
.../m1-samples/ec2/deployment-policy.json | 14 +++
.../ec2/m1_single_subsciption_app.json | 19 ++++
.../m1-samples/ec2/p1.json | 10 +++
.../m1-samples/ec2/php-cart.json | 38 ++++++++
.../m1-samples/os/autoscale-policy.json | 14 +++
.../m1-samples/os/deployment-policy.json | 14 +++
.../os/m1_single_subsciption_app.json | 19 ++++
.../m1-samples/os/p1.json | 10 +++
.../m1-samples/os/php-cart.json | 46 ++++++++++
.../samples/ec2/autoscale-policy 2.json | 14 +++
.../samples/ec2/autoscale-policy.json | 14 +++
.../samples/ec2/deployment-policy 2.json | 14 +++
.../samples/ec2/deployment-policy.json | 14 +++
.../samples/ec2/group1.json | 9 ++
.../samples/ec2/group2.json | 15 ++++
.../samples/ec2/m1_single_subsciption_app.json | 19 ++++
.../samples/ec2/m2_single_subsciption_app.json | 95 ++++++++++++++++++++
.../samples/ec2/mysql.json | 33 +++++++
.../samples/ec2/mytest.json | 33 +++++++
.../samples/ec2/p1.json | 10 +++
.../samples/ec2/php-cart.json | 38 ++++++++
.../samples/ec2/tomcat.json | 33 +++++++
.../samples/ec2/tomcat1.json | 33 +++++++
.../samples/os/autoscale-policy.json | 14 +++
.../samples/os/deployment-policy.json | 14 +++
.../samples/os/m1_single_subsciption_app.json | 19 ++++
.../samples/os/p1.json | 10 +++
.../samples/os/php-cart.json | 46 ++++++++++
.../deployment_script.sh | 36 --------
.../m1-samples/ec2/autoscale-policy.json | 14 ---
.../m1-samples/ec2/deployment-policy.json | 14 ---
.../ec2/m1_single_subsciption_app.json | 19 ----
.../m1-samples/ec2/p1.json | 10 ---
.../m1-samples/ec2/php-cart.json | 38 --------
.../m1-samples/os/autoscale-policy.json | 14 ---
.../m1-samples/os/deployment-policy.json | 14 ---
.../os/m1_single_subsciption_app.json | 19 ----
.../m1-samples/os/p1.json | 10 ---
.../m1-samples/os/php-cart.json | 46 ----------
.../samples/ec2/autoscale-policy 2.json | 14 ---
.../samples/ec2/autoscale-policy.json | 14 ---
.../samples/ec2/deployment-policy 2.json | 14 ---
.../samples/ec2/deployment-policy.json | 14 ---
.../samples/ec2/group1.json | 9 --
.../samples/ec2/group2.json | 15 ----
.../samples/ec2/m1_single_subsciption_app.json | 19 ----
.../samples/ec2/m2_single_subsciption_app.json | 95 --------------------
.../samples/ec2/mysql.json | 33 -------
.../samples/ec2/mytest.json | 33 -------
.../samples/ec2/p1.json | 10 ---
.../samples/ec2/php-cart.json | 38 --------
.../samples/ec2/tomcat.json | 33 -------
.../samples/ec2/tomcat1.json | 33 -------
.../samples/os/autoscale-policy.json | 14 ---
.../samples/os/deployment-policy.json | 14 ---
.../samples/os/m1_single_subsciption_app.json | 19 ----
.../samples/os/p1.json | 10 ---
.../samples/os/php-cart.json | 46 ----------
60 files changed, 711 insertions(+), 711 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/deployment_script.sh
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/deployment_script.sh b/tools/automation-scripts/grouping-automation-script/deployment_script.sh
new file mode 100755
index 0000000..a0740cf
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/deployment_script.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+curl -X POST -H "Content-Type: application/json" -d@'samples/ec2/p1.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/policy/deployment/partition
+
+sleep 15
+
+curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/autoscale-policy.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/policy/autoscale
+
+sleep 5
+
+curl -X POST -H "Content-Type: application/json" -d@'samples/ec2/deployment-policy.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/policy/deployment
+
+sleep 5
+
+curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/php-cart.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/cartridge/definition
+
+sleep 5
+
+curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/tomcat.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/cartridge/definition
+
+sleep 5
+
+curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/tomcat1.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/cartridge/definition
+
+
+sleep 5
+
+curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/group1.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/group/definition
+
+sleep 5
+
+curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/group2.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/group/definition
+
+sleep 5
+
+curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/m2_single_subsciption_app.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/application/definition
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/autoscale-policy.json b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/autoscale-policy.json
new file mode 100755
index 0000000..ba5664a
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/autoscale-policy.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscale_policy_1",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "average": 50
+ },
+ "memoryConsumption": {
+ "average": 700
+ },
+ "loadAverage": {
+ "average": 1000
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json
new file mode 100755
index 0000000..30d62b4
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json
@@ -0,0 +1,14 @@
+{
+ "id": "deployment_policy_1",
+ "partitionGroup": {
+ "id": "openstack",
+ "partitionAlgo": "one-after-another",
+ "partition": [
+ {
+ "id": "P1",
+ "partitionMax": "10",
+ "partitionMin": "1"
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/m1_single_subsciption_app.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/m1_single_subsciption_app.json b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/m1_single_subsciption_app.json
new file mode 100755
index 0000000..1648b67
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/m1_single_subsciption_app.json
@@ -0,0 +1,19 @@
+{
+ "applicationId": "test_app_1",
+ "alias": "mytestapp1",
+ "components": {
+ "subscribables": [
+ {
+ "type": "php",
+ "alias": "myphp"
+ }
+ ],
+ },
+ "subscribableInfo": [
+ {
+ "alias": "myphp",
+ "deploymentPolicy": "deployment_policy_1",
+ "autoscalingPolicy": "autoscale_policy_1",
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/p1.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/p1.json b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/p1.json
new file mode 100755
index 0000000..8a42c54
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/p1.json
@@ -0,0 +1,10 @@
+{
+ "id": "P1",
+ "provider": "ec2",
+ "property": [
+ {
+ "name": "region",
+ "value": "ap-southeast-1"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/php-cart.json b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/php-cart.json
new file mode 100755
index 0000000..45985d9
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/php-cart.json
@@ -0,0 +1,38 @@
+{
+ "type": "php",
+ "provider": "apache",
+ "host": "isuruh.lk",
+ "displayName": "PHP",
+ "description": "PHP Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "protocol": "http",
+ "port": "80",
+ "proxyPort": "8280"
+ },
+ {
+ "protocol": "https",
+ "port": "443",
+ "proxyPort": "8243"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "ec2",
+ "imageId": "ap-southeast-1/ami-3c0f5d6e",
+ "maxInstanceLimit": "2",
+ "property": [
+ ]
+ }
+ ],
+ "loadBalancer": {
+ "property": {
+ "name": "no.load.balancer",
+ "value": "true"
+ }
+ },
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/m1-samples/os/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/os/autoscale-policy.json b/tools/automation-scripts/grouping-automation-script/m1-samples/os/autoscale-policy.json
new file mode 100755
index 0000000..ba5664a
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/os/autoscale-policy.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscale_policy_1",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "average": 50
+ },
+ "memoryConsumption": {
+ "average": 700
+ },
+ "loadAverage": {
+ "average": 1000
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/m1-samples/os/deployment-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/os/deployment-policy.json b/tools/automation-scripts/grouping-automation-script/m1-samples/os/deployment-policy.json
new file mode 100755
index 0000000..30d62b4
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/os/deployment-policy.json
@@ -0,0 +1,14 @@
+{
+ "id": "deployment_policy_1",
+ "partitionGroup": {
+ "id": "openstack",
+ "partitionAlgo": "one-after-another",
+ "partition": [
+ {
+ "id": "P1",
+ "partitionMax": "10",
+ "partitionMin": "1"
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/m1-samples/os/m1_single_subsciption_app.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/os/m1_single_subsciption_app.json b/tools/automation-scripts/grouping-automation-script/m1-samples/os/m1_single_subsciption_app.json
new file mode 100755
index 0000000..1648b67
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/os/m1_single_subsciption_app.json
@@ -0,0 +1,19 @@
+{
+ "applicationId": "test_app_1",
+ "alias": "mytestapp1",
+ "components": {
+ "subscribables": [
+ {
+ "type": "php",
+ "alias": "myphp"
+ }
+ ],
+ },
+ "subscribableInfo": [
+ {
+ "alias": "myphp",
+ "deploymentPolicy": "deployment_policy_1",
+ "autoscalingPolicy": "autoscale_policy_1",
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/m1-samples/os/p1.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/os/p1.json b/tools/automation-scripts/grouping-automation-script/m1-samples/os/p1.json
new file mode 100755
index 0000000..0fa8c5b
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/os/p1.json
@@ -0,0 +1,10 @@
+{
+ "id": "P1",
+ "provider": "openstack",
+ "property": [
+ {
+ "name": "region",
+ "value": "RegionOne"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/m1-samples/os/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/os/php-cart.json b/tools/automation-scripts/grouping-automation-script/m1-samples/os/php-cart.json
new file mode 100755
index 0000000..cbfab11
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/os/php-cart.json
@@ -0,0 +1,46 @@
+{
+ "type": "php",
+ "provider": "apache",
+ "host": "isuruh.lk",
+ "displayName": "PHP",
+ "description": "PHP Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "protocol": "http",
+ "port": "80",
+ "proxyPort": "8280"
+ },
+ {
+ "protocol": "https",
+ "port": "443",
+ "proxyPort": "8243"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "openstack",
+ "imageId": "RegionOne/f2ddf72a-4e76-4893-a9fa-e5f4352f1a86",
+ "maxInstanceLimit": "2",
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/3"
+ },
+ {
+ "name": "keyPair",
+ "value": "isuruh"
+ }
+ ]
+ }
+ ],
+ "loadBalancer": {
+ "property": {
+ "name": "no.load.balancer",
+ "value": "true"
+ }
+ },
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/autoscale-policy 2.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/autoscale-policy 2.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/autoscale-policy 2.json
new file mode 100755
index 0000000..8ac8212
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/autoscale-policy 2.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscale_policy_mysql",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 30
+ },
+ "memoryConsumption": {
+ "threshold": 40
+ },
+ "loadAverage": {
+ "threshold": 150
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/autoscale-policy.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/autoscale-policy.json
new file mode 100755
index 0000000..ba5664a
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/autoscale-policy.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscale_policy_1",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "average": 50
+ },
+ "memoryConsumption": {
+ "average": 700
+ },
+ "loadAverage": {
+ "average": 1000
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy 2.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy 2.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy 2.json
new file mode 100755
index 0000000..9cceeb7
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy 2.json
@@ -0,0 +1,14 @@
+{
+ "id": "dep_policy_mysql",
+ "partitionGroup": {
+ "id": "openstack",
+ "partitionAlgo": "one-after-another",
+ "partition": [
+ {
+ "id": "P1",
+ "partitionMax": "10",
+ "partitionMin": "1"
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy.json
new file mode 100755
index 0000000..2a24807
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/deployment-policy.json
@@ -0,0 +1,14 @@
+{
+ "id": "deployment_policy_1",
+ "partitionGroup": {
+ "id": "ec2",
+ "partitionAlgo": "one-after-another",
+ "partition": [
+ {
+ "id": "P1",
+ "partitionMax": "10",
+ "partitionMin": "1"
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/group1.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/group1.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/group1.json
new file mode 100755
index 0000000..dc8eded
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/group1.json
@@ -0,0 +1,9 @@
+{
+ "name": "group1",
+ "cartridges": [
+ "tomcat1","tomcat"
+ ],
+ "dependencies": {
+ "killBehaviour": "kill-none"
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/group2.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/group2.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/group2.json
new file mode 100755
index 0000000..942ef8b
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/group2.json
@@ -0,0 +1,15 @@
+{
+ "name": "group2",
+ "subGroups": [
+ "group1"
+ ],
+ "cartridges": [
+ "tomcat"
+ ],
+ "dependencies": {
+ "startupOrders": [
+ "group.group1,cartridge.tomcat"
+ ],
+ "killBehaviour": "kill-dependents"
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/m1_single_subsciption_app.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/m1_single_subsciption_app.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/m1_single_subsciption_app.json
new file mode 100755
index 0000000..1648b67
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/m1_single_subsciption_app.json
@@ -0,0 +1,19 @@
+{
+ "applicationId": "test_app_1",
+ "alias": "mytestapp1",
+ "components": {
+ "subscribables": [
+ {
+ "type": "php",
+ "alias": "myphp"
+ }
+ ],
+ },
+ "subscribableInfo": [
+ {
+ "alias": "myphp",
+ "deploymentPolicy": "deployment_policy_1",
+ "autoscalingPolicy": "autoscale_policy_1",
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json
new file mode 100644
index 0000000..b234c49
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json
@@ -0,0 +1,95 @@
+{
+ "applicationId": "test_app_3",
+ "alias": "phpapp2",
+ "components": {
+ "groups": [
+ {
+ "name": "group2",
+ "alias": "mygroup2",
+ "deploymentPolicy": "deployment_policy_1",
+ "autoscalingPolicy": "autoscale_policy_1",
+ "subscribables": [
+ {
+ "type": "tomcat",
+ "alias": "mygroup2tomcat"
+
+ }
+ ],
+ "subGroups": [
+ {
+ "name": "group1",
+ "alias": "mygroup1"
+
+ }
+ ]
+
+ },
+ {
+ "name": "group1",
+ "alias": "mygroup1",
+ "deploymentPolicy": "dep_policy_group1",
+ "autoscalingPolicy": "autoscale_policy_group1",
+ "subscribables": [
+ {
+ "type": "tomcat",
+ "alias": "mygroup1tomcat"
+
+ },
+ {
+ "type": "tomcat1",
+ "alias": "mygroup1tomcat1"
+
+ }
+
+ ]
+
+ }
+
+ ],
+ "subscribables": [
+ {
+ "type": "tomcat",
+ "alias": "mytomcat"
+ }
+ ],
+ "dependencies": {
+ "startupOrders": [
+ "group.mygroup2,cartridge.mytomcat"
+ ],
+ "killBehaviour": "kill-dependents"
+ }
+
+ },
+ "subscribableInfo": [
+ {
+ "alias": "mygroup1tomcat",
+ "deploymentPolicy": "deployment_policy_1",
+ "autoscalingPolicy": "autoscale_policy_1"
+ },
+ {
+ "alias": "mygroup2tomcat",
+ "deploymentPolicy": "deployment_policy_1",
+ "autoscalingPolicy": "autoscale_policy_1",
+ "repoURL": "www.mygit.com/php.git",
+ "privateRepo": "true",
+ "repoUsername": "admin",
+ "repoPassword": "xxxx"
+ },
+ {
+ "alias": "mytomcat",
+ "deploymentPolicy": "deployment_policy_1",
+ "autoscalingPolicy": "autoscale_policy_1",
+ "repoURL": "www.mygit.com/tomcat.git",
+ "privateRepo": "false",
+ "repoUsername": "admin",
+ "repoPassword": "yyyy"
+ },
+ {
+ "alias": "mygroup1tomcat1",
+ "deploymentPolicy": "deployment_policy_1",
+ "autoscalingPolicy": "autoscale_policy_1"
+ }
+
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/mysql.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/mysql.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/mysql.json
new file mode 100755
index 0000000..f2de7f6
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/mysql.json
@@ -0,0 +1,33 @@
+{
+ "type": "mysql",
+ "provider": "apache",
+ "host": "isuruh.lk",
+ "displayName": "mysql",
+ "description": "mysql Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "protocol": "http",
+ "port": "3306",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "ec2",
+ "imageId": "ap-southeast-1/ami-3c0f5d6e",
+ "maxInstanceLimit": "2",
+ "property": [
+ ]
+ }
+ ],
+ "loadBalancer": {
+ "property": {
+ "name": "no.load.balancer",
+ "value": "true"
+ }
+ },
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/mytest.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/mytest.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/mytest.json
new file mode 100755
index 0000000..0197ab1
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/mytest.json
@@ -0,0 +1,33 @@
+{
+ "type": "mytest",
+ "provider": "apache",
+ "host": "isuruh.lk",
+ "displayName": "mytest",
+ "description": "mytest Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "protocol": "http",
+ "port": "80",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "ec2",
+ "imageId": "ap-southeast-1/ami-3c0f5d6e",
+ "maxInstanceLimit": "2",
+ "property": [
+ ]
+ }
+ ],
+ "loadBalancer": {
+ "property": {
+ "name": "no.load.balancer",
+ "value": "true"
+ }
+ },
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/p1.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/p1.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/p1.json
new file mode 100755
index 0000000..8a42c54
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/p1.json
@@ -0,0 +1,10 @@
+{
+ "id": "P1",
+ "provider": "ec2",
+ "property": [
+ {
+ "name": "region",
+ "value": "ap-southeast-1"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/php-cart.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/php-cart.json
new file mode 100755
index 0000000..45985d9
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/php-cart.json
@@ -0,0 +1,38 @@
+{
+ "type": "php",
+ "provider": "apache",
+ "host": "isuruh.lk",
+ "displayName": "PHP",
+ "description": "PHP Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "protocol": "http",
+ "port": "80",
+ "proxyPort": "8280"
+ },
+ {
+ "protocol": "https",
+ "port": "443",
+ "proxyPort": "8243"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "ec2",
+ "imageId": "ap-southeast-1/ami-3c0f5d6e",
+ "maxInstanceLimit": "2",
+ "property": [
+ ]
+ }
+ ],
+ "loadBalancer": {
+ "property": {
+ "name": "no.load.balancer",
+ "value": "true"
+ }
+ },
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat.json
new file mode 100755
index 0000000..308b94e
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat.json
@@ -0,0 +1,33 @@
+{
+ "type": "tomcat",
+ "provider": "apache",
+ "host": "isuruh.lk",
+ "displayName": "tomcat",
+ "description": "tomcat Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "protocol": "http",
+ "port": "80",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "ec2",
+ "imageId": "ap-southeast-1/ami-3c0f5d6e",
+ "maxInstanceLimit": "2",
+ "property": [
+ ]
+ }
+ ],
+ "loadBalancer": {
+ "property": {
+ "name": "no.load.balancer",
+ "value": "true"
+ }
+ },
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat1.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat1.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat1.json
new file mode 100755
index 0000000..0984fb9
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat1.json
@@ -0,0 +1,33 @@
+{
+ "type": "tomcat1",
+ "provider": "apache",
+ "host": "isuruh.lk",
+ "displayName": "tomcat1",
+ "description": "tomcat1 Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "protocol": "http",
+ "port": "80",
+ "proxyPort": "8280"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "ec2",
+ "imageId": "ap-southeast-1/ami-3c0f5d6e",
+ "maxInstanceLimit": "2",
+ "property": [
+ ]
+ }
+ ],
+ "loadBalancer": {
+ "property": {
+ "name": "no.load.balancer",
+ "value": "true"
+ }
+ },
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/os/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/os/autoscale-policy.json b/tools/automation-scripts/grouping-automation-script/samples/os/autoscale-policy.json
new file mode 100755
index 0000000..ba5664a
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/os/autoscale-policy.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscale_policy_1",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "average": 50
+ },
+ "memoryConsumption": {
+ "average": 700
+ },
+ "loadAverage": {
+ "average": 1000
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/os/deployment-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/os/deployment-policy.json b/tools/automation-scripts/grouping-automation-script/samples/os/deployment-policy.json
new file mode 100755
index 0000000..30d62b4
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/os/deployment-policy.json
@@ -0,0 +1,14 @@
+{
+ "id": "deployment_policy_1",
+ "partitionGroup": {
+ "id": "openstack",
+ "partitionAlgo": "one-after-another",
+ "partition": [
+ {
+ "id": "P1",
+ "partitionMax": "10",
+ "partitionMin": "1"
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/os/m1_single_subsciption_app.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/os/m1_single_subsciption_app.json b/tools/automation-scripts/grouping-automation-script/samples/os/m1_single_subsciption_app.json
new file mode 100755
index 0000000..1648b67
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/os/m1_single_subsciption_app.json
@@ -0,0 +1,19 @@
+{
+ "applicationId": "test_app_1",
+ "alias": "mytestapp1",
+ "components": {
+ "subscribables": [
+ {
+ "type": "php",
+ "alias": "myphp"
+ }
+ ],
+ },
+ "subscribableInfo": [
+ {
+ "alias": "myphp",
+ "deploymentPolicy": "deployment_policy_1",
+ "autoscalingPolicy": "autoscale_policy_1",
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/os/p1.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/os/p1.json b/tools/automation-scripts/grouping-automation-script/samples/os/p1.json
new file mode 100755
index 0000000..0fa8c5b
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/os/p1.json
@@ -0,0 +1,10 @@
+{
+ "id": "P1",
+ "provider": "openstack",
+ "property": [
+ {
+ "name": "region",
+ "value": "RegionOne"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-scripts/grouping-automation-script/samples/os/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/os/php-cart.json b/tools/automation-scripts/grouping-automation-script/samples/os/php-cart.json
new file mode 100755
index 0000000..cbfab11
--- /dev/null
+++ b/tools/automation-scripts/grouping-automation-script/samples/os/php-cart.json
@@ -0,0 +1,46 @@
+{
+ "type": "php",
+ "provider": "apache",
+ "host": "isuruh.lk",
+ "displayName": "PHP",
+ "description": "PHP Cartridge",
+ "version": "7",
+ "multiTenant": "false",
+ "portMapping": [
+ {
+ "protocol": "http",
+ "port": "80",
+ "proxyPort": "8280"
+ },
+ {
+ "protocol": "https",
+ "port": "443",
+ "proxyPort": "8243"
+ }
+ ],
+ "deployment": {
+ },
+ "iaasProvider": [
+ {
+ "type": "openstack",
+ "imageId": "RegionOne/f2ddf72a-4e76-4893-a9fa-e5f4352f1a86",
+ "maxInstanceLimit": "2",
+ "property": [
+ {
+ "name": "instanceType",
+ "value": "RegionOne/3"
+ },
+ {
+ "name": "keyPair",
+ "value": "isuruh"
+ }
+ ]
+ }
+ ],
+ "loadBalancer": {
+ "property": {
+ "name": "no.load.balancer",
+ "value": "true"
+ }
+ },
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/deployment_script.sh
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/deployment_script.sh b/tools/automation-sripts/grouping-automation-script/deployment_script.sh
deleted file mode 100755
index a0740cf..0000000
--- a/tools/automation-sripts/grouping-automation-script/deployment_script.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-curl -X POST -H "Content-Type: application/json" -d@'samples/ec2/p1.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/policy/deployment/partition
-
-sleep 15
-
-curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/autoscale-policy.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/policy/autoscale
-
-sleep 5
-
-curl -X POST -H "Content-Type: application/json" -d@'samples/ec2/deployment-policy.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/policy/deployment
-
-sleep 5
-
-curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/php-cart.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/cartridge/definition
-
-sleep 5
-
-curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/tomcat.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/cartridge/definition
-
-sleep 5
-
-curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/tomcat1.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/cartridge/definition
-
-
-sleep 5
-
-curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/group1.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/group/definition
-
-sleep 5
-
-curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/group2.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/group/definition
-
-sleep 5
-
-curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/m2_single_subsciption_app.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/application/definition
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/autoscale-policy.json b/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/autoscale-policy.json
deleted file mode 100755
index ba5664a..0000000
--- a/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscale_policy_1",
- "loadThresholds": {
- "requestsInFlight": {
- "average": 50
- },
- "memoryConsumption": {
- "average": 700
- },
- "loadAverage": {
- "average": 1000
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json b/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json
deleted file mode 100755
index 30d62b4..0000000
--- a/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/deployment-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "deployment_policy_1",
- "partitionGroup": {
- "id": "openstack",
- "partitionAlgo": "one-after-another",
- "partition": [
- {
- "id": "P1",
- "partitionMax": "10",
- "partitionMin": "1"
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/m1_single_subsciption_app.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/m1_single_subsciption_app.json b/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/m1_single_subsciption_app.json
deleted file mode 100755
index 1648b67..0000000
--- a/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/m1_single_subsciption_app.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "applicationId": "test_app_1",
- "alias": "mytestapp1",
- "components": {
- "subscribables": [
- {
- "type": "php",
- "alias": "myphp"
- }
- ],
- },
- "subscribableInfo": [
- {
- "alias": "myphp",
- "deploymentPolicy": "deployment_policy_1",
- "autoscalingPolicy": "autoscale_policy_1",
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/p1.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/p1.json b/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/p1.json
deleted file mode 100755
index 8a42c54..0000000
--- a/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/p1.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "id": "P1",
- "provider": "ec2",
- "property": [
- {
- "name": "region",
- "value": "ap-southeast-1"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/php-cart.json b/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/php-cart.json
deleted file mode 100755
index 45985d9..0000000
--- a/tools/automation-sripts/grouping-automation-script/m1-samples/ec2/php-cart.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "type": "php",
- "provider": "apache",
- "host": "isuruh.lk",
- "displayName": "PHP",
- "description": "PHP Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "protocol": "http",
- "port": "80",
- "proxyPort": "8280"
- },
- {
- "protocol": "https",
- "port": "443",
- "proxyPort": "8243"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "ec2",
- "imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
- "property": [
- ]
- }
- ],
- "loadBalancer": {
- "property": {
- "name": "no.load.balancer",
- "value": "true"
- }
- },
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/m1-samples/os/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/m1-samples/os/autoscale-policy.json b/tools/automation-sripts/grouping-automation-script/m1-samples/os/autoscale-policy.json
deleted file mode 100755
index ba5664a..0000000
--- a/tools/automation-sripts/grouping-automation-script/m1-samples/os/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscale_policy_1",
- "loadThresholds": {
- "requestsInFlight": {
- "average": 50
- },
- "memoryConsumption": {
- "average": 700
- },
- "loadAverage": {
- "average": 1000
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/m1-samples/os/deployment-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/m1-samples/os/deployment-policy.json b/tools/automation-sripts/grouping-automation-script/m1-samples/os/deployment-policy.json
deleted file mode 100755
index 30d62b4..0000000
--- a/tools/automation-sripts/grouping-automation-script/m1-samples/os/deployment-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "deployment_policy_1",
- "partitionGroup": {
- "id": "openstack",
- "partitionAlgo": "one-after-another",
- "partition": [
- {
- "id": "P1",
- "partitionMax": "10",
- "partitionMin": "1"
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/m1-samples/os/m1_single_subsciption_app.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/m1-samples/os/m1_single_subsciption_app.json b/tools/automation-sripts/grouping-automation-script/m1-samples/os/m1_single_subsciption_app.json
deleted file mode 100755
index 1648b67..0000000
--- a/tools/automation-sripts/grouping-automation-script/m1-samples/os/m1_single_subsciption_app.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "applicationId": "test_app_1",
- "alias": "mytestapp1",
- "components": {
- "subscribables": [
- {
- "type": "php",
- "alias": "myphp"
- }
- ],
- },
- "subscribableInfo": [
- {
- "alias": "myphp",
- "deploymentPolicy": "deployment_policy_1",
- "autoscalingPolicy": "autoscale_policy_1",
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/m1-samples/os/p1.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/m1-samples/os/p1.json b/tools/automation-sripts/grouping-automation-script/m1-samples/os/p1.json
deleted file mode 100755
index 0fa8c5b..0000000
--- a/tools/automation-sripts/grouping-automation-script/m1-samples/os/p1.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "id": "P1",
- "provider": "openstack",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/m1-samples/os/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/m1-samples/os/php-cart.json b/tools/automation-sripts/grouping-automation-script/m1-samples/os/php-cart.json
deleted file mode 100755
index cbfab11..0000000
--- a/tools/automation-sripts/grouping-automation-script/m1-samples/os/php-cart.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "type": "php",
- "provider": "apache",
- "host": "isuruh.lk",
- "displayName": "PHP",
- "description": "PHP Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "protocol": "http",
- "port": "80",
- "proxyPort": "8280"
- },
- {
- "protocol": "https",
- "port": "443",
- "proxyPort": "8243"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "openstack",
- "imageId": "RegionOne/f2ddf72a-4e76-4893-a9fa-e5f4352f1a86",
- "maxInstanceLimit": "2",
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/3"
- },
- {
- "name": "keyPair",
- "value": "isuruh"
- }
- ]
- }
- ],
- "loadBalancer": {
- "property": {
- "name": "no.load.balancer",
- "value": "true"
- }
- },
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/autoscale-policy 2.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/autoscale-policy 2.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/autoscale-policy 2.json
deleted file mode 100755
index 8ac8212..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/autoscale-policy 2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscale_policy_mysql",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 30
- },
- "memoryConsumption": {
- "threshold": 40
- },
- "loadAverage": {
- "threshold": 150
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/autoscale-policy.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/autoscale-policy.json
deleted file mode 100755
index ba5664a..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscale_policy_1",
- "loadThresholds": {
- "requestsInFlight": {
- "average": 50
- },
- "memoryConsumption": {
- "average": 700
- },
- "loadAverage": {
- "average": 1000
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/deployment-policy 2.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/deployment-policy 2.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/deployment-policy 2.json
deleted file mode 100755
index 9cceeb7..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/deployment-policy 2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "dep_policy_mysql",
- "partitionGroup": {
- "id": "openstack",
- "partitionAlgo": "one-after-another",
- "partition": [
- {
- "id": "P1",
- "partitionMax": "10",
- "partitionMin": "1"
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/deployment-policy.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/deployment-policy.json
deleted file mode 100755
index 2a24807..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/deployment-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "deployment_policy_1",
- "partitionGroup": {
- "id": "ec2",
- "partitionAlgo": "one-after-another",
- "partition": [
- {
- "id": "P1",
- "partitionMax": "10",
- "partitionMin": "1"
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/group1.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/group1.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/group1.json
deleted file mode 100755
index dc8eded..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/group1.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "name": "group1",
- "cartridges": [
- "tomcat1","tomcat"
- ],
- "dependencies": {
- "killBehaviour": "kill-none"
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/group2.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/group2.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/group2.json
deleted file mode 100755
index 942ef8b..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/group2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "group2",
- "subGroups": [
- "group1"
- ],
- "cartridges": [
- "tomcat"
- ],
- "dependencies": {
- "startupOrders": [
- "group.group1,cartridge.tomcat"
- ],
- "killBehaviour": "kill-dependents"
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/m1_single_subsciption_app.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/m1_single_subsciption_app.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/m1_single_subsciption_app.json
deleted file mode 100755
index 1648b67..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/m1_single_subsciption_app.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "applicationId": "test_app_1",
- "alias": "mytestapp1",
- "components": {
- "subscribables": [
- {
- "type": "php",
- "alias": "myphp"
- }
- ],
- },
- "subscribableInfo": [
- {
- "alias": "myphp",
- "deploymentPolicy": "deployment_policy_1",
- "autoscalingPolicy": "autoscale_policy_1",
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json
deleted file mode 100644
index b234c49..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
- "applicationId": "test_app_3",
- "alias": "phpapp2",
- "components": {
- "groups": [
- {
- "name": "group2",
- "alias": "mygroup2",
- "deploymentPolicy": "deployment_policy_1",
- "autoscalingPolicy": "autoscale_policy_1",
- "subscribables": [
- {
- "type": "tomcat",
- "alias": "mygroup2tomcat"
-
- }
- ],
- "subGroups": [
- {
- "name": "group1",
- "alias": "mygroup1"
-
- }
- ]
-
- },
- {
- "name": "group1",
- "alias": "mygroup1",
- "deploymentPolicy": "dep_policy_group1",
- "autoscalingPolicy": "autoscale_policy_group1",
- "subscribables": [
- {
- "type": "tomcat",
- "alias": "mygroup1tomcat"
-
- },
- {
- "type": "tomcat1",
- "alias": "mygroup1tomcat1"
-
- }
-
- ]
-
- }
-
- ],
- "subscribables": [
- {
- "type": "tomcat",
- "alias": "mytomcat"
- }
- ],
- "dependencies": {
- "startupOrders": [
- "group.mygroup2,cartridge.mytomcat"
- ],
- "killBehaviour": "kill-dependents"
- }
-
- },
- "subscribableInfo": [
- {
- "alias": "mygroup1tomcat",
- "deploymentPolicy": "deployment_policy_1",
- "autoscalingPolicy": "autoscale_policy_1"
- },
- {
- "alias": "mygroup2tomcat",
- "deploymentPolicy": "deployment_policy_1",
- "autoscalingPolicy": "autoscale_policy_1",
- "repoURL": "www.mygit.com/php.git",
- "privateRepo": "true",
- "repoUsername": "admin",
- "repoPassword": "xxxx"
- },
- {
- "alias": "mytomcat",
- "deploymentPolicy": "deployment_policy_1",
- "autoscalingPolicy": "autoscale_policy_1",
- "repoURL": "www.mygit.com/tomcat.git",
- "privateRepo": "false",
- "repoUsername": "admin",
- "repoPassword": "yyyy"
- },
- {
- "alias": "mygroup1tomcat1",
- "deploymentPolicy": "deployment_policy_1",
- "autoscalingPolicy": "autoscale_policy_1"
- }
-
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/mysql.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/mysql.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/mysql.json
deleted file mode 100755
index f2de7f6..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/mysql.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "type": "mysql",
- "provider": "apache",
- "host": "isuruh.lk",
- "displayName": "mysql",
- "description": "mysql Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "protocol": "http",
- "port": "3306",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "ec2",
- "imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
- "property": [
- ]
- }
- ],
- "loadBalancer": {
- "property": {
- "name": "no.load.balancer",
- "value": "true"
- }
- },
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/mytest.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/mytest.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/mytest.json
deleted file mode 100755
index 0197ab1..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/mytest.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "type": "mytest",
- "provider": "apache",
- "host": "isuruh.lk",
- "displayName": "mytest",
- "description": "mytest Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "protocol": "http",
- "port": "80",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "ec2",
- "imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
- "property": [
- ]
- }
- ],
- "loadBalancer": {
- "property": {
- "name": "no.load.balancer",
- "value": "true"
- }
- },
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/p1.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/p1.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/p1.json
deleted file mode 100755
index 8a42c54..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/p1.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "id": "P1",
- "provider": "ec2",
- "property": [
- {
- "name": "region",
- "value": "ap-southeast-1"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/php-cart.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/php-cart.json
deleted file mode 100755
index 45985d9..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/php-cart.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "type": "php",
- "provider": "apache",
- "host": "isuruh.lk",
- "displayName": "PHP",
- "description": "PHP Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "protocol": "http",
- "port": "80",
- "proxyPort": "8280"
- },
- {
- "protocol": "https",
- "port": "443",
- "proxyPort": "8243"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "ec2",
- "imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
- "property": [
- ]
- }
- ],
- "loadBalancer": {
- "property": {
- "name": "no.load.balancer",
- "value": "true"
- }
- },
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/tomcat.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/tomcat.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/tomcat.json
deleted file mode 100755
index 308b94e..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/tomcat.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "type": "tomcat",
- "provider": "apache",
- "host": "isuruh.lk",
- "displayName": "tomcat",
- "description": "tomcat Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "protocol": "http",
- "port": "80",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "ec2",
- "imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
- "property": [
- ]
- }
- ],
- "loadBalancer": {
- "property": {
- "name": "no.load.balancer",
- "value": "true"
- }
- },
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/ec2/tomcat1.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/tomcat1.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/tomcat1.json
deleted file mode 100755
index 0984fb9..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/ec2/tomcat1.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "type": "tomcat1",
- "provider": "apache",
- "host": "isuruh.lk",
- "displayName": "tomcat1",
- "description": "tomcat1 Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "protocol": "http",
- "port": "80",
- "proxyPort": "8280"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "ec2",
- "imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
- "property": [
- ]
- }
- ],
- "loadBalancer": {
- "property": {
- "name": "no.load.balancer",
- "value": "true"
- }
- },
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/os/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/os/autoscale-policy.json b/tools/automation-sripts/grouping-automation-script/samples/os/autoscale-policy.json
deleted file mode 100755
index ba5664a..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/os/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscale_policy_1",
- "loadThresholds": {
- "requestsInFlight": {
- "average": 50
- },
- "memoryConsumption": {
- "average": 700
- },
- "loadAverage": {
- "average": 1000
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/os/deployment-policy.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/os/deployment-policy.json b/tools/automation-sripts/grouping-automation-script/samples/os/deployment-policy.json
deleted file mode 100755
index 30d62b4..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/os/deployment-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "deployment_policy_1",
- "partitionGroup": {
- "id": "openstack",
- "partitionAlgo": "one-after-another",
- "partition": [
- {
- "id": "P1",
- "partitionMax": "10",
- "partitionMin": "1"
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/os/m1_single_subsciption_app.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/os/m1_single_subsciption_app.json b/tools/automation-sripts/grouping-automation-script/samples/os/m1_single_subsciption_app.json
deleted file mode 100755
index 1648b67..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/os/m1_single_subsciption_app.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "applicationId": "test_app_1",
- "alias": "mytestapp1",
- "components": {
- "subscribables": [
- {
- "type": "php",
- "alias": "myphp"
- }
- ],
- },
- "subscribableInfo": [
- {
- "alias": "myphp",
- "deploymentPolicy": "deployment_policy_1",
- "autoscalingPolicy": "autoscale_policy_1",
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/os/p1.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/os/p1.json b/tools/automation-sripts/grouping-automation-script/samples/os/p1.json
deleted file mode 100755
index 0fa8c5b..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/os/p1.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "id": "P1",
- "provider": "openstack",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/04e315b1/tools/automation-sripts/grouping-automation-script/samples/os/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-sripts/grouping-automation-script/samples/os/php-cart.json b/tools/automation-sripts/grouping-automation-script/samples/os/php-cart.json
deleted file mode 100755
index cbfab11..0000000
--- a/tools/automation-sripts/grouping-automation-script/samples/os/php-cart.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "type": "php",
- "provider": "apache",
- "host": "isuruh.lk",
- "displayName": "PHP",
- "description": "PHP Cartridge",
- "version": "7",
- "multiTenant": "false",
- "portMapping": [
- {
- "protocol": "http",
- "port": "80",
- "proxyPort": "8280"
- },
- {
- "protocol": "https",
- "port": "443",
- "proxyPort": "8243"
- }
- ],
- "deployment": {
- },
- "iaasProvider": [
- {
- "type": "openstack",
- "imageId": "RegionOne/f2ddf72a-4e76-4893-a9fa-e5f4352f1a86",
- "maxInstanceLimit": "2",
- "property": [
- {
- "name": "instanceType",
- "value": "RegionOne/3"
- },
- {
- "name": "keyPair",
- "value": "isuruh"
- }
- ]
- }
- ],
- "loadBalancer": {
- "property": {
- "name": "no.load.balancer",
- "value": "true"
- }
- },
-}