stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lahi...@apache.org
Subject stratos git commit: Fix undeploy script such that it will delete network partitions before applicaiton policy
Date Wed, 10 Jun 2015 09:13:13 GMT
Repository: stratos
Updated Branches:
  refs/heads/master 2b7a104cd -> bcb386975


Fix undeploy script such that it will delete network partitions before applicaiton policy


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

Branch: refs/heads/master
Commit: bcb386975a5c0acc46e58ce58e585fdad38812a9
Parents: 2b7a104
Author: Lahiru Sandaruwan <lahirus@apache.org>
Authored: Wed Jun 10 14:17:53 2015 +0530
Committer: Lahiru Sandaruwan <lahirus@apache.org>
Committed: Wed Jun 10 14:17:53 2015 +0530

----------------------------------------------------------------------
 .../scripts/common/undeploy.sh                                | 6 +++---
 .../complex/tomcat-single-signon/scripts/common/undeploy.sh   | 5 ++---
 .../complex/wordpress-app/scripts/common/undeploy.sh          | 6 +++---
 .../nested/complex-app-with-lb/scripts/common/undeploy.sh     | 7 +++----
 .../scripts/common/undeploy.sh                                | 6 +++---
 .../five-levels-nested-groups-app/scripts/common/undeploy.sh  | 6 ++----
 .../single-level-nested-group-app/scripts/common/undeploy.sh  | 5 ++---
 .../single-level-nested-groups-app/scripts/common/undeploy.sh | 6 +++---
 .../scaling/app-bursting-pattern/scripts/common/undeploy.sh   | 6 +++---
 .../sample-cartridges/scripts/common/undeploy.sh              | 5 ++---
 .../sample-groups/scripts/common/undeploy.sh                  | 6 +++---
 .../group-scaling-app/scripts/common/undeploy.sh              | 6 +++---
 .../group-scaling/group-scaling-v1/scripts/common/undeploy.sh | 6 +++---
 .../single-group-group-scaling/scripts/common/undeploy.sh     | 5 +++--
 .../simple/single-cartridge-app/scripts/common/undeploy.sh    | 6 +++---
 .../simple/single-group-app/scripts/common/undeploy.sh        | 7 ++++---
 16 files changed, 45 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh
b/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh
index b9fa3d0..1d0ada0 100644
--- a/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh
+++ b/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh
@@ -52,10 +52,10 @@ echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-2
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2
 
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh
b/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh
index 419074d..093aec5 100755
--- a/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh
+++ b/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh
@@ -41,10 +41,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-3
+echo "Removing network partitions..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-3
 
 echo "Removing application policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-2
 
-echo "Removing network partitions..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-3
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/complex/wordpress-app/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/complex/wordpress-app/scripts/common/undeploy.sh b/samples/applications/complex/wordpress-app/scripts/common/undeploy.sh
index 462691d..8a96273 100644
--- a/samples/applications/complex/wordpress-app/scripts/common/undeploy.sh
+++ b/samples/applications/complex/wordpress-app/scripts/common/undeploy.sh
@@ -46,9 +46,9 @@ echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-2
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2
+
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/nested/complex-app-with-lb/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/nested/complex-app-with-lb/scripts/common/undeploy.sh b/samples/applications/nested/complex-app-with-lb/scripts/common/undeploy.sh
index b115f03..8860f99 100644
--- a/samples/applications/nested/complex-app-with-lb/scripts/common/undeploy.sh
+++ b/samples/applications/nested/complex-app-with-lb/scripts/common/undeploy.sh
@@ -48,11 +48,10 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 
-
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 
 
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/nested/esb-php-nested-with-esb-php-nested-with-mysql-php-app/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/nested/esb-php-nested-with-esb-php-nested-with-mysql-php-app/scripts/common/undeploy.sh
b/samples/applications/nested/esb-php-nested-with-esb-php-nested-with-mysql-php-app/scripts/common/undeploy.sh
index 13b5787..0650635 100644
--- a/samples/applications/nested/esb-php-nested-with-esb-php-nested-with-mysql-php-app/scripts/common/undeploy.sh
+++ b/samples/applications/nested/esb-php-nested-with-esb-php-nested-with-mysql-php-app/scripts/common/undeploy.sh
@@ -47,9 +47,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2
+
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/nested/five-levels-nested-groups-app/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/nested/five-levels-nested-groups-app/scripts/common/undeploy.sh
b/samples/applications/nested/five-levels-nested-groups-app/scripts/common/undeploy.sh
index fd78115..724c97d 100644
--- a/samples/applications/nested/five-levels-nested-groups-app/scripts/common/undeploy.sh
+++ b/samples/applications/nested/five-levels-nested-groups-app/scripts/common/undeploy.sh
@@ -49,11 +49,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2
 
-
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/nested/single-level-nested-group-app/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/nested/single-level-nested-group-app/scripts/common/undeploy.sh
b/samples/applications/nested/single-level-nested-group-app/scripts/common/undeploy.sh
index c310b68..1225436 100644
--- a/samples/applications/nested/single-level-nested-group-app/scripts/common/undeploy.sh
+++ b/samples/applications/nested/single-level-nested-group-app/scripts/common/undeploy.sh
@@ -47,11 +47,10 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-2
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2
 
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/nested/single-level-nested-groups-app/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/nested/single-level-nested-groups-app/scripts/common/undeploy.sh
b/samples/applications/nested/single-level-nested-groups-app/scripts/common/undeploy.sh
index 453523c..ca8b946 100644
--- a/samples/applications/nested/single-level-nested-groups-app/scripts/common/undeploy.sh
+++ b/samples/applications/nested/single-level-nested-groups-app/scripts/common/undeploy.sh
@@ -48,9 +48,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/scaling/app-bursting-pattern/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/scaling/app-bursting-pattern/scripts/common/undeploy.sh
b/samples/applications/scaling/app-bursting-pattern/scripts/common/undeploy.sh
index fc43693..a47531c 100644
--- a/samples/applications/scaling/app-bursting-pattern/scripts/common/undeploy.sh
+++ b/samples/applications/scaling/app-bursting-pattern/scripts/common/undeploy.sh
@@ -42,12 +42,12 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-4
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-4
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-3
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-4
 
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-4
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh
b/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh
index 26fca1d..26d9c0c 100644
--- a/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh
+++ b/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh
@@ -43,9 +43,8 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh
b/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh
index f2d19d2..178bb29 100644
--- a/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh
+++ b/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh
@@ -47,9 +47,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh
b/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh
index 718c913..e7956c0 100644
--- a/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh
+++ b/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh
@@ -51,9 +51,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh
b/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh
index 2183fbc..00c2384 100644
--- a/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh
+++ b/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh
@@ -47,9 +47,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh
b/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh
index 8eb5dd0..fcc543a 100644
--- a/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh
+++ b/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh
@@ -45,11 +45,12 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 
+echo "Removing network partitions..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
+
 echo "Removing application policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
 
-echo "Removing network partitions..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 
 
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh b/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh
index 938c778..3076ee0 100644
--- a/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh
+++ b/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh
@@ -42,10 +42,10 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2
 
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/bcb38697/samples/applications/simple/single-group-app/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/simple/single-group-app/scripts/common/undeploy.sh b/samples/applications/simple/single-group-app/scripts/common/undeploy.sh
index e294fd1..5e540c5 100644
--- a/samples/applications/simple/single-group-app/scripts/common/undeploy.sh
+++ b/samples/applications/simple/single-group-app/scripts/common/undeploy.sh
@@ -47,10 +47,11 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin
https://
 echo "Removing deployment policies..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
 
-echo "Removing application policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
-
 echo "Removing network partitions..."
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2
 
+echo "Removing application policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1
+
+


Mime
View raw message