Repository: stratos Updated Branches: refs/heads/master 44b311d7f -> c77d90686
Revert "Fix undeploy script such that it will delete network partitions before applicaiton policy" This reverts commit bcb386975a5c0acc46e58ce58e585fdad38812a9. Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c77d9068 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c77d9068 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c77d9068 Branch: refs/heads/master Commit: c77d90686b14518ba0fbb17bca9278884d759b77 Parents: 44b311d Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Jun 10 15:33:00 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Jun 10 15:33:00 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, 49 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/c77d9068/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 1d0ada0..b9fa3d0 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/c77d9068/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 093aec5..419074d 100755 --- a/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh +++ b/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh @@ -41,9 +41,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-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/c77d9068/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 8a96273..462691d 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/c77d9068/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 8860f99..b115f03 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,10 +48,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 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/c77d9068/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 0650635..13b5787 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/c77d9068/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 724c97d..fd78115 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,9 +49,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 + http://git-wip-us.apache.org/repos/asf/stratos/blob/c77d9068/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 1225436..c310b68 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,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-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/c77d9068/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 ca8b946..453523c 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 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/c77d9068/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 a47531c..fc43693 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/c77d9068/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 26d9c0c..26fca1d 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,8 +43,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/c77d9068/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 178bb29..f2d19d2 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 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/c77d9068/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 e7956c0..718c913 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 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/c77d9068/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 00c2384..2183fbc 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 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/c77d9068/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 fcc543a..8eb5dd0 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,12 +45,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 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/c77d9068/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 3076ee0..938c778 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/c77d9068/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 5e540c5..e294fd1 100644 --- a/samples/applications/simple/single-group-app/scripts/common/undeploy.sh +++ b/samples/applications/simple/single-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-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 +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
