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/02/02 10:32:23 UTC

[1/2] stratos git commit: Updating single-cartridge sample application with common scripts folder

Repository: stratos
Updated Branches:
  refs/heads/master 119c75a50 -> 8e78a6fdb


Updating single-cartridge sample application with common scripts folder


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8e78a6fd
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8e78a6fd
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8e78a6fd

Branch: refs/heads/master
Commit: 8e78a6fdbe2a6e65477b8864b6ed2f4a8853affc
Parents: 2e684e7
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Feb 2 15:02:03 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Feb 2 15:02:17 2015 +0530

----------------------------------------------------------------------
 .../artifacts/autoscale-policy.json             | 14 -----
 .../artifacts/autoscaling-policy.json           | 14 +++++
 .../artifacts/ec2/deployment-policy.json        | 40 ++++++++++++++
 .../artifacts/kubernetes/deployment-policy.json | 40 ++++++++++++++
 .../kubernetes/kubernetes-cluster.json          | 55 ++++++++++++++++++++
 .../artifacts/mock/deployment-policy.json       | 40 ++++++++++++++
 .../artifacts/network-partition.json            |  2 +-
 .../artifacts/openstack/deployment-policy.json  | 40 ++++++++++++++
 .../iaases/ec2/artifacts/dep_single_group.json  | 41 ---------------
 .../single-cartridge/iaases/ec2/deploy.sh       | 39 --------------
 .../single-cartridge/iaases/ec2/undeploy.sh     | 23 --------
 .../kubernetes/artifacts/deployment-policy.json | 40 --------------
 .../artifacts/kubernetes-cluster.json           | 55 --------------------
 .../iaases/kubernetes/deploy.sh                 | 45 ----------------
 .../iaases/kubernetes/get-application.sh        |  3 --
 .../iaases/kubernetes/get-deployment-policy.sh  |  3 --
 .../iaases/kubernetes/list-applications.sh      |  3 --
 .../iaases/kubernetes/undeploy.sh               | 27 ----------
 .../iaases/mock/add-domain-mappings.sh          |  9 ----
 .../iaases/mock/add-network-partition.sh        |  9 ----
 .../mock/artifacts/deployment-policy.json       | 41 ---------------
 .../single-cartridge/iaases/mock/deploy.sh      | 39 --------------
 .../iaases/mock/list-domain-mappings.sh         |  4 --
 .../iaases/mock/list-network-partition.sh       |  4 --
 .../single-cartridge/iaases/mock/undeploy.sh    | 23 --------
 .../openstack/artifacts/dep_single_group.json   | 41 ---------------
 .../single-cartridge/iaases/openstack/deploy.sh | 39 --------------
 .../iaases/openstack/undeploy.sh                | 23 --------
 .../scripts/common/add-domain-mappings.sh       |  9 ++++
 .../scripts/common/add-network-partition.sh     |  9 ++++
 .../single-cartridge/scripts/common/deploy.sh   | 35 +++++++++++++
 .../scripts/common/list-domain-mappings.sh      |  4 ++
 .../scripts/common/list-network-partition.sh    |  4 ++
 .../single-cartridge/scripts/common/undeploy.sh | 20 +++++++
 .../single-cartridge/scripts/ec2/deploy.sh      |  9 ++++
 .../single-cartridge/scripts/ec2/undeploy.sh    |  8 +++
 .../scripts/kubernetes/deploy.sh                | 15 ++++++
 .../scripts/kubernetes/undeploy.sh              | 13 +++++
 .../single-cartridge/scripts/mock/deploy.sh     |  9 ++++
 .../single-cartridge/scripts/mock/undeploy.sh   |  8 +++
 .../scripts/openstack/deploy.sh                 |  9 ++++
 .../scripts/openstack/undeploy.sh               |  8 +++
 42 files changed, 390 insertions(+), 526 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/artifacts/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/autoscale-policy.json b/samples/applications/single-cartridge/artifacts/autoscale-policy.json
deleted file mode 100644
index 431c11f..0000000
--- a/samples/applications/single-cartridge/artifacts/autoscale-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "autoscale_policy_1",
-  "loadThresholds": {
-    "requestsInFlight": {
-      "threshold": 50
-    },
-    "memoryConsumption": {
-      "threshold": 40
-    },
-    "loadAverage": {
-      "threshold": 40
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/artifacts/autoscaling-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/autoscaling-policy.json b/samples/applications/single-cartridge/artifacts/autoscaling-policy.json
new file mode 100644
index 0000000..9f6a370
--- /dev/null
+++ b/samples/applications/single-cartridge/artifacts/autoscaling-policy.json
@@ -0,0 +1,14 @@
+{
+  "id": "autoscaling-policy-1",
+  "loadThresholds": {
+    "requestsInFlight": {
+      "threshold": 50
+    },
+    "memoryConsumption": {
+      "threshold": 40
+    },
+    "loadAverage": {
+      "threshold": 40
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json b/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json
new file mode 100644
index 0000000..aae50b5
--- /dev/null
+++ b/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json
@@ -0,0 +1,40 @@
+{
+    "applicationPolicy": {
+        "networkPartition": [
+            {
+                "id": "network-partition-1",
+                "activeByDefault": "true",
+                "partitions": [
+                    {
+                        "id": "partition-1",
+                        "provider": "ec2",
+                        "property": [
+                            {
+                                "name": "region",
+                                "value": "ap-southeast-1"
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+    "childPolicies": [
+        {
+            "alias": "php1",
+            "networkPartition": [
+                {
+                    "id": "network-partition-1",
+                    "partitionAlgo": "one-after-another",
+                    "partitions": [
+                        {
+                            "id": "partition-1",
+                            "max": 8
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json b/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
new file mode 100644
index 0000000..d199695
--- /dev/null
+++ b/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
@@ -0,0 +1,40 @@
+{
+   "applicationPolicy":{
+      "networkPartition":[
+         {
+            "id":"network-partition-1",
+            "kubernetesClusterId":"kubernetes-cluster-1",
+            "activeByDefault":"true",
+            "partitions":[
+               {
+                  "id":"partition1",
+                  "provider":"kubernetes",
+                  "property":[
+                     {
+                        "name":"region",
+                        "value":"default"
+                     }
+                  ]
+               }
+            ]
+         }
+      ]
+   },
+   "childPolicies":[
+      {
+         "alias":"phpartition1",
+         "networkPartition":[
+            {
+               "id":"network-partition-1",
+               "partitionAlgo":"one-after-another",
+               "partitions":[
+                  {
+                     "id":"partition1",
+                     "max":5
+                  }
+               ]
+            }
+         ]
+      }
+   ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/artifacts/kubernetes/kubernetes-cluster.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/kubernetes/kubernetes-cluster.json b/samples/applications/single-cartridge/artifacts/kubernetes/kubernetes-cluster.json
new file mode 100644
index 0000000..228eeb3
--- /dev/null
+++ b/samples/applications/single-cartridge/artifacts/kubernetes/kubernetes-cluster.json
@@ -0,0 +1,55 @@
+{
+      "clusterId": "kubernetes-cluster-1",
+      "description": "Kubernetes CoreOS cluster",
+      "kubernetesMaster": {
+                  "hostId" : "KubHostMaster1",
+                  "hostname" : "master.dev.kubernetes.example.org",
+                  "hostIpAddress" : "172.17.8.100",
+                  "property" : [
+                  ]
+        },
+
+        "portRange" : {
+           "upper": "5000",
+           "lower": "4500"
+        },
+
+        "kubernetesHosts": [
+              {
+                     "hostId" : "KubHostSlave1",
+                     "hostname" : "slave1.dev.kubernetes.example.org",
+                     "hostIpAddress" : "172.17.8.101",
+                     "property" : [
+                     ]
+                },
+                {
+                     "hostId" : "KubHostSlave2",
+                     "hostname" : "slave2.dev.kubernetes.example.org",
+                     "hostIpAddress" : "172.17.8.102",
+                     "property" : [
+                     ]
+                }
+    ],
+    "property":[
+       {
+          "name":"payload_parameter.MB_IP",
+          "value":"172.17.8.1"
+       },
+       {
+          "name":"payload_parameter.MB_PORT",
+          "value":"1883"
+       },
+       {
+          "name":"payload_parameter.CEP_IP",
+          "value":"172.17.8.1"
+       },
+       {
+          "name":"payload_parameter.CEP_PORT",
+          "value":"7711"
+       },
+       {
+          "name":"payload_parameter.LOG_LEVEL",
+          "value":"DEBUG"
+       }
+    ]
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/mock/deployment-policy.json b/samples/applications/single-cartridge/artifacts/mock/deployment-policy.json
new file mode 100644
index 0000000..0444ea3
--- /dev/null
+++ b/samples/applications/single-cartridge/artifacts/mock/deployment-policy.json
@@ -0,0 +1,40 @@
+{
+    "applicationPolicy": {
+        "networkPartition": [
+            {
+                "id": "network-partition-1",
+                "activeByDefault": "true",
+                "partitions": [
+                    {
+                        "id": "partition-1",
+                        "provider": "mock",
+                        "property": [
+                            {
+                                "name": "region",
+                                "value": "default"
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+    "childPolicies": [
+        {
+            "alias": "php1",
+            "networkPartition": [
+                {
+                    "id": "network-partition-1",
+                    "partitionAlgo": "one-after-another",
+                    "partitions": [
+                        {
+                            "id": "partition-1",
+                            "max": 5
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/artifacts/network-partition.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/network-partition.json b/samples/applications/single-cartridge/artifacts/network-partition.json
index c9334c6..8db54b8 100644
--- a/samples/applications/single-cartridge/artifacts/network-partition.json
+++ b/samples/applications/single-cartridge/artifacts/network-partition.json
@@ -1,5 +1,5 @@
 {
-    "id": "network-p1",
+    "id": "network-partition-1",
     "activeByDefault": "true",
     "partitions": [
         {

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json b/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
new file mode 100644
index 0000000..dcbb13d
--- /dev/null
+++ b/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
@@ -0,0 +1,40 @@
+{
+    "applicationPolicy": {
+        "networkPartition": [
+            {
+                "id": "network-partition-1",
+                "activeByDefault": "true",
+                "partitions": [
+                    {
+                        "id": "partition-1",
+                        "provider": "openstack",
+                        "property": [
+                            {
+                                "name": "region",
+                                "value": "RegionOne"
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+    "childPolicies": [
+        {
+            "alias": "php1",
+            "networkPartition": [
+                {
+                    "id": "network-partition-1",
+                    "partitionAlgo": "one-after-another",
+                    "partitions": [
+                        {
+                            "id": "partition-1",
+                            "max": 8
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/ec2/artifacts/dep_single_group.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/ec2/artifacts/dep_single_group.json b/samples/applications/single-cartridge/iaases/ec2/artifacts/dep_single_group.json
deleted file mode 100644
index c53e805..0000000
--- a/samples/applications/single-cartridge/iaases/ec2/artifacts/dep_single_group.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "applicationId": "single-cartridge-app",
-    "applicationPolicy": {
-        "networkPartition": [
-            {
-                "id": "EC2-P1",
-                "activeByDefault": "true",
-                "partitions": [
-                    {
-                        "id": "P1",
-                        "provider": "ec2",
-                        "property": [
-                            {
-                                "name": "region",
-                                "value": "ap-southeast-1"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    "childPolicies": [
-        {
-            "alias": "php1",
-            "networkPartition": [
-                {
-                    "id": "EC2-P1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 8
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/ec2/deploy.sh b/samples/applications/single-cartridge/iaases/ec2/deploy.sh
deleted file mode 100755
index 51f173d..0000000
--- a/samples/applications/single-cartridge/iaases/ec2/deploy.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-export iaas="ec2"						#[openstack, ec2, mock, kubernetes]
-export host_ip="localhost"
-
-export artifacts_path="../../artifacts"
-export cartridges_path="../../../../cartridges/${iaas}"
-
-set -e
-
-# Adding autoscale policy
-pushd ${artifacts_path}
-echo "Adding autoscale policy..."
-curl -X POST -H "Content-Type: application/json" -d @'autoscale-policy.json' -k -u admin:admin https://${host_ip}:9443/api/autoscalingPolicies
-popd
-
-sleep 1
-
-# Adding cartridges
-pushd ${cartridges_path}
-	# Adding tomcat cartridge
-echo "Adding tomcat cartridge..."
-curl -X POST -H "Content-Type: application/json" -d @'tomcat.json' -k -u admin:admin https://${host_ip}:9443/api/cartridges
-popd
-
-sleep 5
-
-# Creating application
-pushd ${artifacts_path}
-echo "Creating application..."
-curl -X POST -H "Content-Type: application/json" -d @'application.json' -k -u admin:admin https://${host_ip}:9443/api/applications
-popd
-
-sleep 5 
-
-# Deploy application
-echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -d@'artifacts/dep_single_group.json' -k -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/ec2/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/ec2/undeploy.sh b/samples/applications/single-cartridge/iaases/ec2/undeploy.sh
deleted file mode 100644
index 1f70d02..0000000
--- a/samples/applications/single-cartridge/iaases/ec2/undeploy.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-export host_ip="localhost"
-
-set -e
-
-# Undeploying application
-echo "Undeploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app/undeploy
-
-sleep 30
-
-# Deleting application
-echo "Deleting application..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app
-
-# Removing cartridges
-echo "Removing cartridges..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/cartridges/tomcat
-
-# Removing autoscale policies
-echo "Removing autoscale policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/autoscalingPolicies/autoscale_policy_1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/kubernetes/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/kubernetes/artifacts/deployment-policy.json b/samples/applications/single-cartridge/iaases/kubernetes/artifacts/deployment-policy.json
deleted file mode 100644
index 9b316a0..0000000
--- a/samples/applications/single-cartridge/iaases/kubernetes/artifacts/deployment-policy.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-   "applicationPolicy":{
-      "networkPartition":[
-         {
-            "id":"network-p1",
-            "kubernetesClusterId":"kubernetes-cluster-1",
-            "activeByDefault":"true",
-            "partitions":[
-               {
-                  "id":"p1",
-                  "provider":"kubernetes",
-                  "property":[
-                     {
-                        "name":"region",
-                        "value":"default"
-                     }
-                  ]
-               }
-            ]
-         }
-      ]
-   },
-   "childPolicies":[
-      {
-         "alias":"php1",
-         "networkPartition":[
-            {
-               "id":"network-p1",
-               "partitionAlgo":"one-after-another",
-               "partitions":[
-                  {
-                     "id":"p1",
-                     "max":5
-                  }
-               ]
-            }
-         ]
-      }
-   ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/kubernetes/artifacts/kubernetes-cluster.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/kubernetes/artifacts/kubernetes-cluster.json b/samples/applications/single-cartridge/iaases/kubernetes/artifacts/kubernetes-cluster.json
deleted file mode 100644
index 228eeb3..0000000
--- a/samples/applications/single-cartridge/iaases/kubernetes/artifacts/kubernetes-cluster.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-      "clusterId": "kubernetes-cluster-1",
-      "description": "Kubernetes CoreOS cluster",
-      "kubernetesMaster": {
-                  "hostId" : "KubHostMaster1",
-                  "hostname" : "master.dev.kubernetes.example.org",
-                  "hostIpAddress" : "172.17.8.100",
-                  "property" : [
-                  ]
-        },
-
-        "portRange" : {
-           "upper": "5000",
-           "lower": "4500"
-        },
-
-        "kubernetesHosts": [
-              {
-                     "hostId" : "KubHostSlave1",
-                     "hostname" : "slave1.dev.kubernetes.example.org",
-                     "hostIpAddress" : "172.17.8.101",
-                     "property" : [
-                     ]
-                },
-                {
-                     "hostId" : "KubHostSlave2",
-                     "hostname" : "slave2.dev.kubernetes.example.org",
-                     "hostIpAddress" : "172.17.8.102",
-                     "property" : [
-                     ]
-                }
-    ],
-    "property":[
-       {
-          "name":"payload_parameter.MB_IP",
-          "value":"172.17.8.1"
-       },
-       {
-          "name":"payload_parameter.MB_PORT",
-          "value":"1883"
-       },
-       {
-          "name":"payload_parameter.CEP_IP",
-          "value":"172.17.8.1"
-       },
-       {
-          "name":"payload_parameter.CEP_PORT",
-          "value":"7711"
-       },
-       {
-          "name":"payload_parameter.LOG_LEVEL",
-          "value":"DEBUG"
-       }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/kubernetes/deploy.sh b/samples/applications/single-cartridge/iaases/kubernetes/deploy.sh
deleted file mode 100755
index 6385df1..0000000
--- a/samples/applications/single-cartridge/iaases/kubernetes/deploy.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-export iaas="kubernetes" #[openstack, ec2, mock, kubernetes]
-export host_ip="localhost"
-
-export artifacts_path="../../artifacts"
-export cartridges_path="../../../../cartridges/${iaas}"
-
-set -e
-
-# Adding autoscale policy
-pushd ${artifacts_path}
-echo "Adding autoscale policy..."
-curl -X POST -H "Content-Type: application/json" -d @'autoscale-policy.json' -k -u admin:admin https://${host_ip}:9443/api/autoscalingPolicies
-popd
-
-sleep 1
-
-# Adding cartridges
-pushd ${cartridges_path}
-# Adding php cartridge
-echo "Adding php cartridge..."
-curl -X POST -H "Content-Type: application/json" -d @'php.json' -k -u admin:admin https://${host_ip}:9443/api/cartridges
-popd
-
-sleep 5
-
-# Adding kubernetes cluster
-echo "Adding kubernetes cluster..."
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/kubernetes-cluster.json' -k -u admin:admin https://${host_ip}:9443/api/kubernetesClusters
-
-sleep 2
-
-# Creating application
-pushd ${artifacts_path}
-echo "Creating application..."
-curl -X POST -H "Content-Type: application/json" -d @'application.json' -k -u admin:admin https://${host_ip}:9443/api/applications
-popd
-
-sleep 5
-
-# Deploy application
-echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -d@'artifacts/deployment-policy.json' -k -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/kubernetes/get-application.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/kubernetes/get-application.sh b/samples/applications/single-cartridge/iaases/kubernetes/get-application.sh
deleted file mode 100755
index a606a62..0000000
--- a/samples/applications/single-cartridge/iaases/kubernetes/get-application.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl -X GET -H "Content-Type: application/json" -k -v -u admin:admin https://localhost:9443/api/applications/$1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/kubernetes/get-deployment-policy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/kubernetes/get-deployment-policy.sh b/samples/applications/single-cartridge/iaases/kubernetes/get-deployment-policy.sh
deleted file mode 100755
index 36cb62e..0000000
--- a/samples/applications/single-cartridge/iaases/kubernetes/get-deployment-policy.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl -X GET -H "Content-Type: application/json" -k -v -u admin:admin https://localhost:9443/api/applications/$1/deploymentPolicy

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/kubernetes/list-applications.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/kubernetes/list-applications.sh b/samples/applications/single-cartridge/iaases/kubernetes/list-applications.sh
deleted file mode 100755
index 2a726b3..0000000
--- a/samples/applications/single-cartridge/iaases/kubernetes/list-applications.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl -X GET -H "Content-Type: application/json" -k -v -u admin:admin https://localhost:9443/api/applications
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/kubernetes/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/kubernetes/undeploy.sh b/samples/applications/single-cartridge/iaases/kubernetes/undeploy.sh
deleted file mode 100644
index cb95f58..0000000
--- a/samples/applications/single-cartridge/iaases/kubernetes/undeploy.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-export host_ip="localhost"
-
-set -e
-
-# Undeploying application
-echo "Undeploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app/undeploy
-
-sleep 5
-
-# Deleting application
-echo "Deleting application..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app
-
-# Removing cartridges
-echo "Removing cartridges..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/cartridges/php
-
-# Removing kubernetes
-echo "Removing kubernetes cluster..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/kubernetesClusters/kubernetes-cluster-1
-
-# Removing autoscale policies
-echo "Removing autoscale policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/autoscalingPolicies/autoscale_policy_1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/mock/add-domain-mappings.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/mock/add-domain-mappings.sh b/samples/applications/single-cartridge/iaases/mock/add-domain-mappings.sh
deleted file mode 100755
index 74c6ed7..0000000
--- a/samples/applications/single-cartridge/iaases/mock/add-domain-mappings.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-export host_ip="localhost"
-export artifacts_path="../../artifacts"
-
-pushd ${artifacts_path}
-echo "Adding domain mappings..."
-curl -X POST -H "Content-Type: application/json" -d @'domain-mappings.json' -k -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app/domainMappings
-popd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/mock/add-network-partition.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/mock/add-network-partition.sh b/samples/applications/single-cartridge/iaases/mock/add-network-partition.sh
deleted file mode 100644
index 665e4d7..0000000
--- a/samples/applications/single-cartridge/iaases/mock/add-network-partition.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-export host_ip="localhost"
-export artifacts_path="../../artifacts"
-
-pushd ${artifacts_path}
-echo "Adding network partition..."
-curl -X POST -H "Content-Type: application/json" -d @'network-partition.json' -kv -u admin:admin https://${host_ip}:9443/api/networkPartitions
-popd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/mock/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/mock/artifacts/deployment-policy.json b/samples/applications/single-cartridge/iaases/mock/artifacts/deployment-policy.json
deleted file mode 100644
index 9cd5f41..0000000
--- a/samples/applications/single-cartridge/iaases/mock/artifacts/deployment-policy.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"applicationId":"single-cartridge-app",
-    "applicationPolicy": {
-        "networkPartition": [
-            {
-                "id": "network-p1",
-                "activeByDefault": "true",
-                "partitions": [
-                    {
-                        "id": "p1",
-                        "provider": "mock",
-                        "property": [
-                            {
-                                "name": "region",
-                                "value": "default"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    "childPolicies": [
-        {
-            "alias": "php1",
-            "networkPartition": [
-                {
-                    "id": "network-p1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "p1",
-                            "max": 5
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/mock/deploy.sh b/samples/applications/single-cartridge/iaases/mock/deploy.sh
deleted file mode 100755
index 72f6783..0000000
--- a/samples/applications/single-cartridge/iaases/mock/deploy.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-export iaas="mock"						#[openstack, ec2, mock, kubernetes]
-export host_ip="localhost"
-
-export artifacts_path="../../artifacts"
-export cartridges_path="../../../../cartridges/${iaas}"
-
-set -e
-
-# Adding autoscale policy
-pushd ${artifacts_path}
-echo "Adding autoscale policy..."
-curl -X POST -H "Content-Type: application/json" -d @'autoscale-policy.json' -k -u admin:admin https://${host_ip}:9443/api/autoscalingPolicies
-popd
-
-sleep 1
-
-# Adding cartridges
-pushd ${cartridges_path}
-	# Adding php cartridge
-echo "Adding php cartridge..."
-curl -X POST -H "Content-Type: application/json" -d @'php.json' -k -u admin:admin https://${host_ip}:9443/api/cartridges
-popd
-
-sleep 5
-
-# Creating application
-pushd ${artifacts_path}
-echo "Creating application..."
-curl -X POST -H "Content-Type: application/json" -d @'application.json' -k -u admin:admin https://${host_ip}:9443/api/applications
-popd
-
-sleep 5 
-
-# Deploy application
-echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -d@'artifacts/deployment-policy.json' -k -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/mock/list-domain-mappings.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/mock/list-domain-mappings.sh b/samples/applications/single-cartridge/iaases/mock/list-domain-mappings.sh
deleted file mode 100755
index 0b49f6f..0000000
--- a/samples/applications/single-cartridge/iaases/mock/list-domain-mappings.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-echo "Listing domain mappings..."
-curl -X GET -H "Content-Type: application/json" -k -u admin:admin https://localhost:9443/api/applications/single-cartridge-app/domainMappings
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/mock/list-network-partition.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/mock/list-network-partition.sh b/samples/applications/single-cartridge/iaases/mock/list-network-partition.sh
deleted file mode 100644
index 6e3812d..0000000
--- a/samples/applications/single-cartridge/iaases/mock/list-network-partition.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-echo "Listing network partitions..."
-curl -X GET -H "Content-Type: application/json" -k -u admin:admin https://localhost:9443/api/networkPartitions
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/mock/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/mock/undeploy.sh b/samples/applications/single-cartridge/iaases/mock/undeploy.sh
deleted file mode 100644
index c99083a..0000000
--- a/samples/applications/single-cartridge/iaases/mock/undeploy.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-export host_ip="localhost"
-
-set -e
-
-# Undeploying application
-echo "Undeploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app/undeploy
-
-sleep 5
-
-# Deleting application
-echo "Deleting application..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app
-
-# Removing cartridges
-echo "Removing cartridges..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/cartridges/php
-
-# Removing autoscale policies
-echo "Removing autoscale policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/autoscalingPolicies/autoscale_policy_1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/openstack/artifacts/dep_single_group.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/openstack/artifacts/dep_single_group.json b/samples/applications/single-cartridge/iaases/openstack/artifacts/dep_single_group.json
deleted file mode 100644
index 0c2748e..0000000
--- a/samples/applications/single-cartridge/iaases/openstack/artifacts/dep_single_group.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "applicationId": "single-cartridge-app",
-    "applicationPolicy": {
-        "networkPartition": [
-            {
-                "id": "openstack_R1",
-                "activeByDefault": "true",
-                "partitions": [
-                    {
-                        "id": "P1",
-                        "provider": "openstack",
-                        "property": [
-                            {
-                                "name": "region",
-                                "value": "RegionOne"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    "childPolicies": [
-        {
-            "alias": "php1",
-            "networkPartition": [
-                {
-                    "id": "openstack_R1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 8
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/openstack/deploy.sh b/samples/applications/single-cartridge/iaases/openstack/deploy.sh
deleted file mode 100755
index b82d3a6..0000000
--- a/samples/applications/single-cartridge/iaases/openstack/deploy.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-export iaas="openstack"						#[openstack, ec2, mock, kubernetes]
-export host_ip="localhost"
-
-export artifacts_path="../../artifacts"
-export cartridges_path="../../../../cartridges/${iaas}"
-
-set -e
-
-# Adding autoscale policy
-pushd ${artifacts_path}
-echo "Adding autoscale policy..."
-curl -X POST -H "Content-Type: application/json" -d @'autoscale-policy.json' -k -u admin:admin https://${host_ip}:9443/api/autoscalingPolicies
-popd
-
-sleep 1
-
-# Adding cartridges
-pushd ${cartridges_path}
-# Adding tomcat cartridge
-echo "Adding tomcat cartridge..."
-curl -X POST -H "Content-Type: application/json" -d @'tomcat.json' -k -u admin:admin https://${host_ip}:9443/api/cartridges
-popd
-
-sleep 5
-
-# Creating application
-pushd ${artifacts_path}
-echo "Creating application..."
-curl -X POST -H "Content-Type: application/json" -d @'application.json' -k -u admin:admin https://${host_ip}:9443/api/applications
-popd
-
-sleep 5 
-
-# Deploy application
-echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -d@'artifacts/dep_single_group.json' -k -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app/deploy
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/iaases/openstack/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/iaases/openstack/undeploy.sh b/samples/applications/single-cartridge/iaases/openstack/undeploy.sh
deleted file mode 100644
index 1f70d02..0000000
--- a/samples/applications/single-cartridge/iaases/openstack/undeploy.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-export host_ip="localhost"
-
-set -e
-
-# Undeploying application
-echo "Undeploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app/undeploy
-
-sleep 30
-
-# Deleting application
-echo "Deleting application..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app
-
-# Removing cartridges
-echo "Removing cartridges..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/cartridges/tomcat
-
-# Removing autoscale policies
-echo "Removing autoscale policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/autoscalingPolicies/autoscale_policy_1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/common/add-domain-mappings.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/common/add-domain-mappings.sh b/samples/applications/single-cartridge/scripts/common/add-domain-mappings.sh
new file mode 100755
index 0000000..74c6ed7
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/common/add-domain-mappings.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+export host_ip="localhost"
+export artifacts_path="../../artifacts"
+
+pushd ${artifacts_path}
+echo "Adding domain mappings..."
+curl -X POST -H "Content-Type: application/json" -d @'domain-mappings.json' -k -u admin:admin https://${host_ip}:9443/api/applications/single-cartridge-app/domainMappings
+popd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/common/add-network-partition.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/common/add-network-partition.sh b/samples/applications/single-cartridge/scripts/common/add-network-partition.sh
new file mode 100644
index 0000000..665e4d7
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/common/add-network-partition.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+export host_ip="localhost"
+export artifacts_path="../../artifacts"
+
+pushd ${artifacts_path}
+echo "Adding network partition..."
+curl -X POST -H "Content-Type: application/json" -d @'network-partition.json' -kv -u admin:admin https://${host_ip}:9443/api/networkPartitions
+popd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/common/deploy.sh b/samples/applications/single-cartridge/scripts/common/deploy.sh
new file mode 100755
index 0000000..51b844f
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/common/deploy.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+iaas=$1
+host_ip="localhost"
+host_port=9443
+
+script_path="$( cd -P "$( dirname "$SOURCE" )" && pwd )/`dirname $0`"
+artifacts_path="${script_path}/../../artifacts"
+iaas_artifacts_path="${script_path}/../../artifacts/${iaas}"
+cartridges_path="${script_path}/../../../../cartridges/${iaas}"
+cartridges_groups_path="${script_path}/../../../../cartridges-groups"
+
+set -e
+
+if [[ -z "${iaas}" ]]; then
+    echo "Usage: deploy.sh [iaas]"
+    exit
+fi
+
+echo ${artifacts_path}/autoscale-policy.json
+echo "Adding autoscale policy..."
+curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/autoscaling-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies
+
+echo "Adding php cartridge..."
+curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/php.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges
+
+sleep 1
+
+echo "Creating application..."
+curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/application.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications
+
+sleep 1
+
+echo "Deploying application..."
+curl -X POST -H "Content-Type: application/json" -d "@${iaas_artifacts_path}/deployment-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-cartridge-app/deploy

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/common/list-domain-mappings.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/common/list-domain-mappings.sh b/samples/applications/single-cartridge/scripts/common/list-domain-mappings.sh
new file mode 100755
index 0000000..0b49f6f
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/common/list-domain-mappings.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Listing domain mappings..."
+curl -X GET -H "Content-Type: application/json" -k -u admin:admin https://localhost:9443/api/applications/single-cartridge-app/domainMappings
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/common/list-network-partition.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/common/list-network-partition.sh b/samples/applications/single-cartridge/scripts/common/list-network-partition.sh
new file mode 100644
index 0000000..6e3812d
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/common/list-network-partition.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Listing network partitions..."
+curl -X GET -H "Content-Type: application/json" -k -u admin:admin https://localhost:9443/api/networkPartitions
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/common/undeploy.sh b/samples/applications/single-cartridge/scripts/common/undeploy.sh
new file mode 100644
index 0000000..11c3a49
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/common/undeploy.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+host_ip="localhost"
+host_port=9443
+
+set -e
+
+echo "Undeploying application..."
+curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-cartridge-app/undeploy
+
+sleep 10
+
+echo "Deleting application..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-cartridge-app
+
+echo "Removing cartridges..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/php
+
+echo "Removing autoscale policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/ec2/deploy.sh b/samples/applications/single-cartridge/scripts/ec2/deploy.sh
new file mode 100755
index 0000000..a4bde8e
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/ec2/deploy.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+iaas="ec2"
+current_folder="$( cd -P "$( dirname "$SOURCE" )" && pwd )/`dirname $0`"
+common_folder="${current_folder}/../common"
+
+pushd ${common_folder}
+bash deploy.sh ${iaas}
+popd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/ec2/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/ec2/undeploy.sh b/samples/applications/single-cartridge/scripts/ec2/undeploy.sh
new file mode 100644
index 0000000..e99acc8
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/ec2/undeploy.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+current_folder="$( cd -P "$( dirname "$SOURCE" )" && pwd )/`dirname $0`"
+common_folder="${current_folder}/../common"
+
+pushd ${common_folder}
+bash undeploy.sh
+popd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/kubernetes/deploy.sh b/samples/applications/single-cartridge/scripts/kubernetes/deploy.sh
new file mode 100755
index 0000000..4d32769
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/kubernetes/deploy.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+host_ip="localhost"
+host_port=9443
+iaas="kubernetes"
+script_path="$( cd -P "$( dirname "$SOURCE" )" && pwd )/`dirname $0`"
+common_folder="${script_path}/../common"
+iaas_artifacts_path="${script_path}/../../artifacts/${iaas}"
+
+echo "Adding kubernetes cluster..."
+curl -X POST -H "Content-Type: application/json" -d "@${iaas_artifacts_path}/kubernetes-cluster.json" -k -u admin:admin https://${host_ip}:${host_port}/api/kubernetesClusters
+
+pushd ${common_folder}
+bash deploy.sh ${iaas}
+popd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/kubernetes/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/kubernetes/undeploy.sh b/samples/applications/single-cartridge/scripts/kubernetes/undeploy.sh
new file mode 100644
index 0000000..db39e2a
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/kubernetes/undeploy.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+host_ip="localhost"
+host_port=9443
+script_path="$( cd -P "$( dirname "$SOURCE" )" && pwd )/`dirname $0`"
+common_folder="${script_path}/../common"
+
+pushd ${common_folder}
+bash undeploy.sh
+popd
+
+echo "Removing kubernetes cluster..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/kubernetesClusters/kubernetes-cluster-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/mock/deploy.sh b/samples/applications/single-cartridge/scripts/mock/deploy.sh
new file mode 100755
index 0000000..7db87e2
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/mock/deploy.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+iaas="mock"
+current_folder="$( cd -P "$( dirname "$SOURCE" )" && pwd )/`dirname $0`"
+common_folder="${current_folder}/../common"
+
+pushd ${common_folder}
+bash deploy.sh ${iaas}
+popd

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/mock/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/mock/undeploy.sh b/samples/applications/single-cartridge/scripts/mock/undeploy.sh
new file mode 100755
index 0000000..e99acc8
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/mock/undeploy.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+current_folder="$( cd -P "$( dirname "$SOURCE" )" && pwd )/`dirname $0`"
+common_folder="${current_folder}/../common"
+
+pushd ${common_folder}
+bash undeploy.sh
+popd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/openstack/deploy.sh b/samples/applications/single-cartridge/scripts/openstack/deploy.sh
new file mode 100755
index 0000000..caa2aef
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/openstack/deploy.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+iaas="openstack"
+current_folder="$( cd -P "$( dirname "$SOURCE" )" && pwd )/`dirname $0`"
+common_folder="${current_folder}/../common"
+
+pushd ${common_folder}
+bash deploy.sh ${iaas}
+popd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e78a6fd/samples/applications/single-cartridge/scripts/openstack/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/openstack/undeploy.sh b/samples/applications/single-cartridge/scripts/openstack/undeploy.sh
new file mode 100644
index 0000000..e99acc8
--- /dev/null
+++ b/samples/applications/single-cartridge/scripts/openstack/undeploy.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+current_folder="$( cd -P "$( dirname "$SOURCE" )" && pwd )/`dirname $0`"
+common_folder="${current_folder}/../common"
+
+pushd ${common_folder}
+bash undeploy.sh
+popd
\ No newline at end of file


[2/2] stratos git commit: Moving common artifacts to common folder in complex-app-with-lb

Posted by im...@apache.org.
Moving common artifacts to common folder in complex-app-with-lb


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2e684e77
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2e684e77
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2e684e77

Branch: refs/heads/master
Commit: 2e684e77d068ed92a03682325c1c1cf82152e88f
Parents: 119c75a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Feb 2 14:40:32 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Feb 2 15:02:17 2015 +0530

----------------------------------------------------------------------
 .../integration/src/test/resources/testing.xml  | 39 ++++++++++++++++++++
 .../integration/src/test/resources/testng.xml   | 39 --------------------
 2 files changed, 39 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/2e684e77/products/stratos/modules/integration/src/test/resources/testing.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/testing.xml b/products/stratos/modules/integration/src/test/resources/testing.xml
new file mode 100644
index 0000000..5f32fe9
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/testing.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0'?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
+<suite name="Apache Stratos Manager Test Suite">
+    <test name="testing" preserve-order="true">
+        <classes>
+            <class name="org.apache.stratos.manager.integration.tests.SampleApplicationTests"/>
+            <!-- class name="org.apache.stratos.manager.integration.tests.LoginLogoutTestCase"/>
+            <class name="org.apache.stratos.manager.integration.tests.SecurityVerificationTestCase"/>
+            <class name="org.apache.stratos.manager.integration.tests.TenantMgtTestCase">
+                <methods>
+                    <include name="init"/>
+                    <include name="addTenantTest"/>
+                    <include name="activateTenantTest"/>
+                </methods>
+            </class-->
+        </classes>
+    </test>
+</suite>

http://git-wip-us.apache.org/repos/asf/stratos/blob/2e684e77/products/stratos/modules/integration/src/test/resources/testng.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/testng.xml b/products/stratos/modules/integration/src/test/resources/testng.xml
deleted file mode 100644
index 0550eac..0000000
--- a/products/stratos/modules/integration/src/test/resources/testng.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-<suite name="Apache Stratos Manager Test Suite">
-    <test name="testing" preserve-order="true">
-        <classes>
-            <class name="org.apache.stratos.manager.integration.tests.StratosManagerTestServerManager"/>
-            <class name="org.apache.stratos.manager.integration.tests.LoginLogoutTestCase"/>
-            <class name="org.apache.stratos.manager.integration.tests.SecurityVerificationTestCase"/>
-            <!--class name="org.apache.stratos.manager.integration.tests.TenantMgtTestCase">
-                <methods>
-                    <include name="init"/>
-                    <include name="addTenantTest"/>
-                    <include name="activateTenantTest"/>
-                </methods>
-            </class-->
-        </classes>
-    </test>
-</suite>