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/06 13:20:44 UTC

[2/2] stratos git commit: Renamed files and variables to a common standard

Renamed files and variables to a common standard


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

Branch: refs/heads/master
Commit: 7e028a0defb06661d09cc301c069d7fbbaf51aa1
Parents: cf4c7d9
Author: Dinithi <di...@wso2.com>
Authored: Fri Feb 6 17:17:37 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Feb 6 17:50:40 2015 +0530

----------------------------------------------------------------------
 .../artifacts/ec2/deployment-policy.json           | 12 ++++++------
 .../artifacts/kubernetes/deployment-policy.json    | 12 ++++++------
 .../artifacts/mock/deployment-policy.json          | 12 ++++++------
 .../artifacts/openstack/deployment-policy.json     | 12 ++++++------
 .../sample-cartridges/scripts/ec2/deploy.sh        | 11 ++++++-----
 .../sample-cartridges/scripts/kubernetes/deploy.sh |  2 ++
 .../sample-cartridges/scripts/mock/deploy.sh       | 13 +++++++------
 .../sample-cartridges/scripts/openstack/deploy.sh  | 11 ++++++-----
 .../artifacts/ec2/deployment-policy.json           | 12 ++++++------
 .../artifacts/kubernetes/deployment-policy.json    | 12 ++++++------
 .../artifacts/mock/deployment-policy.json          | 12 ++++++------
 .../artifacts/openstack/deployment-policy.json     | 12 ++++++------
 .../sample-groups/scripts/ec2/deploy.sh            | 11 ++++++-----
 .../sample-groups/scripts/kubernetes/deploy.sh     | 17 ++++++++++++-----
 .../sample-groups/scripts/kubernetes/undeploy.sh   | 13 +++++++++----
 .../sample-groups/scripts/mock/deploy.sh           | 13 +++++++------
 .../sample-groups/scripts/openstack/deploy.sh      | 11 ++++++-----
 17 files changed, 109 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-cartridges/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-cartridges/artifacts/ec2/deployment-policy.json b/samples/applications/dependency-scaling/sample-cartridges/artifacts/ec2/deployment-policy.json
index f830cff..fc31b8f 100644
--- a/samples/applications/dependency-scaling/sample-cartridges/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/dependency-scaling/sample-cartridges/artifacts/ec2/deployment-policy.json
@@ -4,11 +4,11 @@
         "applicationId": "sample-cartridges-app",
         "networkPartition": [
             {
-                "id": "EC2-P1",
+                "id": "network-partition-1",
                 "activeByDefault": "true",
                 "partitions": [
                     {
-                        "id": "P1",
+                        "id": "partition-1",
                         "provider": "ec2",
                         "property": [
                             {
@@ -26,11 +26,11 @@
             "alias": "mytomcat",
             "networkPartition": [
                 {
-                    "id": "EC2-P1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]
@@ -41,11 +41,11 @@
             "alias": "myphp",
             "networkPartition": [
                 {
-                    "id": "EC2-P1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 10
                         }
                     ]

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-cartridges/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-cartridges/artifacts/kubernetes/deployment-policy.json b/samples/applications/dependency-scaling/sample-cartridges/artifacts/kubernetes/deployment-policy.json
index 4e20358..7f67b30 100644
--- a/samples/applications/dependency-scaling/sample-cartridges/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/dependency-scaling/sample-cartridges/artifacts/kubernetes/deployment-policy.json
@@ -3,12 +3,12 @@
     "applicationPolicy": {
         "networkPartition": [
             {
-                "id":"network-p1",
+                "id":"network-partition-1",
                 "kubernetesClusterId":"kubernetes-cluster-1",
                 "activeByDefault": "true",
                 "partitions": [
                     {
-                        "id": "P1",
+                        "id": "partition-1",
                         "provider": "kubernetes",
                         "property": [
                             {
@@ -26,11 +26,11 @@
             "alias": "mytomcat",
             "networkPartition": [
                 {
-                    "id": "network-p1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]
@@ -41,11 +41,11 @@
             "alias": "myphp",
             "networkPartition": [
                 {
-                    "id": "network-p1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 10
                         }
                     ]

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-cartridges/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-cartridges/artifacts/mock/deployment-policy.json b/samples/applications/dependency-scaling/sample-cartridges/artifacts/mock/deployment-policy.json
index 129ac67..38458ee 100644
--- a/samples/applications/dependency-scaling/sample-cartridges/artifacts/mock/deployment-policy.json
+++ b/samples/applications/dependency-scaling/sample-cartridges/artifacts/mock/deployment-policy.json
@@ -3,11 +3,11 @@
     "applicationPolicy": {
         "networkPartition": [
             {
-                "id": "openstack_R1",
+                "id": "network-partition-1",
                 "activeByDefault": "true",
                 "partitions": [
                     {
-                        "id": "P1",
+                        "id": "partition-1",
                         "provider": "mock",
                         "property": [
                             {
@@ -25,11 +25,11 @@
             "alias": "mytomcat",
             "networkPartition": [
                 {
-                    "id": "openstack_R1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]
@@ -40,11 +40,11 @@
             "alias": "myphp",
             "networkPartition": [
                 {
-                    "id": "openstack_R1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 10
                         }
                     ]

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-cartridges/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-cartridges/artifacts/openstack/deployment-policy.json b/samples/applications/dependency-scaling/sample-cartridges/artifacts/openstack/deployment-policy.json
index c9ce59e..cebbcba 100644
--- a/samples/applications/dependency-scaling/sample-cartridges/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/dependency-scaling/sample-cartridges/artifacts/openstack/deployment-policy.json
@@ -4,11 +4,11 @@
         "applicationId": "sample-cartridges-app",
         "networkPartition": [
             {
-                "id": "openstack_R1",
+                "id": "network-partition-1",
                 "activeByDefault": "true",
                 "partitions": [
                     {
-                        "id": "P1",
+                        "id": "partition-1",
                         "provider": "openstack",
                         "property": [
                             {
@@ -26,11 +26,11 @@
             "alias": "mytomcat",
             "networkPartition": [
                 {
-                    "id": "openstack_R1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]
@@ -41,11 +41,11 @@
             "alias": "myphp",
             "networkPartition": [
                 {
-                    "id": "openstack_R1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 10
                         }
                     ]

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-cartridges/scripts/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-cartridges/scripts/ec2/deploy.sh b/samples/applications/dependency-scaling/sample-cartridges/scripts/ec2/deploy.sh
index 62063a2..6259582 100755
--- a/samples/applications/dependency-scaling/sample-cartridges/scripts/ec2/deploy.sh
+++ b/samples/applications/dependency-scaling/sample-cartridges/scripts/ec2/deploy.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
 iaas="ec2"
-script_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-common_folder="${script_path}/../common"
 
-pushd ${common_folder}
-bash deploy.sh ${iaas}
-popd
\ No newline at end of file
+prgdir=`dirname "$0"`
+script_path=`cd "$prgdir"; pwd`
+
+common_folder=`cd "${script_path}/../common"; pwd`
+
+bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-cartridges/scripts/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-cartridges/scripts/kubernetes/deploy.sh b/samples/applications/dependency-scaling/sample-cartridges/scripts/kubernetes/deploy.sh
index b9064e1..8341a0c 100755
--- a/samples/applications/dependency-scaling/sample-cartridges/scripts/kubernetes/deploy.sh
+++ b/samples/applications/dependency-scaling/sample-cartridges/scripts/kubernetes/deploy.sh
@@ -6,6 +6,8 @@ iaas="kubernetes"
 
 prgdir=`dirname "$0"`
 script_path=`cd "$prgdir"; pwd`
+
+common_folder=`cd "${script_path}/../common"; pwd`
 iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
 
 echo "Adding kubernetes cluster..."

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-cartridges/scripts/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-cartridges/scripts/mock/deploy.sh b/samples/applications/dependency-scaling/sample-cartridges/scripts/mock/deploy.sh
index a75033b..283d92a 100755
--- a/samples/applications/dependency-scaling/sample-cartridges/scripts/mock/deploy.sh
+++ b/samples/applications/dependency-scaling/sample-cartridges/scripts/mock/deploy.sh
@@ -1,9 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 iaas="mock"
-script_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-common_folder="${script_path}/../common"
 
-pushd ${common_folder}
-bash deploy.sh ${iaas}
-popd
\ No newline at end of file
+prgdir=`dirname "$0"`
+script_path=`cd "$prgdir"; pwd`
+
+common_folder=`cd "${script_path}/../common"; pwd`
+
+bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-cartridges/scripts/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-cartridges/scripts/openstack/deploy.sh b/samples/applications/dependency-scaling/sample-cartridges/scripts/openstack/deploy.sh
index 1588a45..5ac18ee 100755
--- a/samples/applications/dependency-scaling/sample-cartridges/scripts/openstack/deploy.sh
+++ b/samples/applications/dependency-scaling/sample-cartridges/scripts/openstack/deploy.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
 iaas="openstack"
-script_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-common_folder="${script_path}/../common"
 
-pushd ${common_folder}
-bash deploy.sh ${iaas}
-popd
\ No newline at end of file
+prgdir=`dirname "$0"`
+script_path=`cd "$prgdir"; pwd`
+
+common_folder=`cd "${script_path}/../common"; pwd`
+
+bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-groups/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-groups/artifacts/ec2/deployment-policy.json b/samples/applications/dependency-scaling/sample-groups/artifacts/ec2/deployment-policy.json
index 4886186..a69515e 100644
--- a/samples/applications/dependency-scaling/sample-groups/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/dependency-scaling/sample-groups/artifacts/ec2/deployment-policy.json
@@ -3,11 +3,11 @@
     "applicationPolicy": {
         "networkPartition": [
             {
-                "id": "EC2-P1",
+                "id": "network-partition-1",
                 "activeByDefault": "true",
                 "partitions": [
                     {
-                        "id": "P1",
+                        "id": "partition-1",
                         "provider": "ec2",
                         "property": [
                             {
@@ -25,11 +25,11 @@
             "alias": "mytomcat",
             "networkPartition": [
                 {
-                    "id": "EC2-P1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]
@@ -40,11 +40,11 @@
             "alias": "mygroup6",
             "networkPartition": [
                 {
-                    "id": "EC2-P1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-groups/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-groups/artifacts/kubernetes/deployment-policy.json b/samples/applications/dependency-scaling/sample-groups/artifacts/kubernetes/deployment-policy.json
index 9fb4bce..01044f3 100644
--- a/samples/applications/dependency-scaling/sample-groups/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/dependency-scaling/sample-groups/artifacts/kubernetes/deployment-policy.json
@@ -3,12 +3,12 @@
     "applicationPolicy": {
         "networkPartition": [
             {
-                "id":"network-p1",
+                "id":"network-partition-1",
                 "kubernetesClusterId":"kubernetes-cluster-1",
                 "activeByDefault": "true",
                 "partitions": [
                     {
-                        "id": "P1",
+                        "id": "partition-1",
                         "provider": "kubernetes",
                         "property": [
                             {
@@ -26,11 +26,11 @@
             "alias": "mytomcat",
             "networkPartition": [
                 {
-                    "id": "network-p1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]
@@ -41,11 +41,11 @@
             "alias": "mygroup6",
             "networkPartition": [
                 {
-                    "id": "network-p1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-groups/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-groups/artifacts/mock/deployment-policy.json b/samples/applications/dependency-scaling/sample-groups/artifacts/mock/deployment-policy.json
index f553ab8..23310ee 100644
--- a/samples/applications/dependency-scaling/sample-groups/artifacts/mock/deployment-policy.json
+++ b/samples/applications/dependency-scaling/sample-groups/artifacts/mock/deployment-policy.json
@@ -3,11 +3,11 @@
     "applicationPolicy": {
         "networkPartition": [
             {
-                "id": "openstack_R1",
+                "id": "network-partition-1",
                 "activeByDefault": "true",
                 "partitions": [
                     {
-                        "id": "P1",
+                        "id": "partition-1",
                         "provider": "mock",
                         "property": [
                             {
@@ -25,11 +25,11 @@
             "alias": "mytomcat",
             "networkPartition": [
                 {
-                    "id": "openstack_R1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]
@@ -40,11 +40,11 @@
             "alias": "mygroup6",
             "networkPartition": [
                 {
-                    "id": "openstack_R1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-groups/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-groups/artifacts/openstack/deployment-policy.json b/samples/applications/dependency-scaling/sample-groups/artifacts/openstack/deployment-policy.json
index 5b924c2..42f477d 100644
--- a/samples/applications/dependency-scaling/sample-groups/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/dependency-scaling/sample-groups/artifacts/openstack/deployment-policy.json
@@ -3,11 +3,11 @@
     "applicationPolicy": {
         "networkPartition": [
             {
-                "id": "openstack_R1",
+                "id": "network-partition-1",
                 "activeByDefault": "true",
                 "partitions": [
                     {
-                        "id": "P1",
+                        "id": "partition-1",
                         "provider": "openstack",
                         "property": [
                             {
@@ -25,11 +25,11 @@
             "alias": "mytomcat",
             "networkPartition": [
                 {
-                    "id": "openstack_R1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]
@@ -40,11 +40,11 @@
             "alias": "mygroup6",
             "networkPartition": [
                 {
-                    "id": "openstack_R1",
+                    "id": "network-partition-1",
                     "partitionAlgo": "one-after-another",
                     "partitions": [
                         {
-                            "id": "P1",
+                            "id": "partition-1",
                             "max": 5
                         }
                     ]

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-groups/scripts/ec2/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-groups/scripts/ec2/deploy.sh b/samples/applications/dependency-scaling/sample-groups/scripts/ec2/deploy.sh
index 62063a2..6259582 100755
--- a/samples/applications/dependency-scaling/sample-groups/scripts/ec2/deploy.sh
+++ b/samples/applications/dependency-scaling/sample-groups/scripts/ec2/deploy.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
 iaas="ec2"
-script_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-common_folder="${script_path}/../common"
 
-pushd ${common_folder}
-bash deploy.sh ${iaas}
-popd
\ No newline at end of file
+prgdir=`dirname "$0"`
+script_path=`cd "$prgdir"; pwd`
+
+common_folder=`cd "${script_path}/../common"; pwd`
+
+bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-groups/scripts/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-groups/scripts/kubernetes/deploy.sh b/samples/applications/dependency-scaling/sample-groups/scripts/kubernetes/deploy.sh
index fbb53ff..8341a0c 100755
--- a/samples/applications/dependency-scaling/sample-groups/scripts/kubernetes/deploy.sh
+++ b/samples/applications/dependency-scaling/sample-groups/scripts/kubernetes/deploy.sh
@@ -1,9 +1,16 @@
 #!/bin/bash
 
+host_ip="localhost"
+host_port=9443
 iaas="kubernetes"
-script_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-common_folder="${script_path}/../common"
 
-pushd ${common_folder}
-bash deploy.sh ${iaas}
-popd
\ No newline at end of file
+prgdir=`dirname "$0"`
+script_path=`cd "$prgdir"; pwd`
+
+common_folder=`cd "${script_path}/../common"; pwd`
+iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
+
+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
+
+bash ${common_folder}/deploy.sh ${iaas}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-groups/scripts/kubernetes/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-groups/scripts/kubernetes/undeploy.sh b/samples/applications/dependency-scaling/sample-groups/scripts/kubernetes/undeploy.sh
index b05cf9f..47ac117 100644
--- a/samples/applications/dependency-scaling/sample-groups/scripts/kubernetes/undeploy.sh
+++ b/samples/applications/dependency-scaling/sample-groups/scripts/kubernetes/undeploy.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
 
-script_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+host_ip="localhost"
+host_port=9443
+
+prgdir=`dirname "$0"`
+script_path=`cd "$prgdir"; pwd`
 common_folder="${script_path}/../common"
 
-pushd ${common_folder}
-bash undeploy.sh
-popd
\ No newline at end of file
+bash ${common_folder}/undeploy.sh
+
+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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-groups/scripts/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-groups/scripts/mock/deploy.sh b/samples/applications/dependency-scaling/sample-groups/scripts/mock/deploy.sh
index a75033b..283d92a 100755
--- a/samples/applications/dependency-scaling/sample-groups/scripts/mock/deploy.sh
+++ b/samples/applications/dependency-scaling/sample-groups/scripts/mock/deploy.sh
@@ -1,9 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 iaas="mock"
-script_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-common_folder="${script_path}/../common"
 
-pushd ${common_folder}
-bash deploy.sh ${iaas}
-popd
\ No newline at end of file
+prgdir=`dirname "$0"`
+script_path=`cd "$prgdir"; pwd`
+
+common_folder=`cd "${script_path}/../common"; pwd`
+
+bash ${common_folder}/deploy.sh ${iaas}

http://git-wip-us.apache.org/repos/asf/stratos/blob/7e028a0d/samples/applications/dependency-scaling/sample-groups/scripts/openstack/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependency-scaling/sample-groups/scripts/openstack/deploy.sh b/samples/applications/dependency-scaling/sample-groups/scripts/openstack/deploy.sh
index 1588a45..5ac18ee 100755
--- a/samples/applications/dependency-scaling/sample-groups/scripts/openstack/deploy.sh
+++ b/samples/applications/dependency-scaling/sample-groups/scripts/openstack/deploy.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
 iaas="openstack"
-script_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-common_folder="${script_path}/../common"
 
-pushd ${common_folder}
-bash deploy.sh ${iaas}
-popd
\ No newline at end of file
+prgdir=`dirname "$0"`
+script_path=`cd "$prgdir"; pwd`
+
+common_folder=`cd "${script_path}/../common"; pwd`
+
+bash ${common_folder}/deploy.sh ${iaas}