updating nested-group-v2 with correct application deployment policy
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e760f680 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e760f680 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e760f680 Branch: refs/heads/master Commit: e760f680147f70003926dce01657a270ae0d3927 Parents: 4673277 Author: reka <[email protected]> Authored: Thu Apr 23 17:15:39 2015 +0530 Committer: reka <[email protected]> Committed: Thu Apr 23 17:15:39 2015 +0530 ---------------------------------------------------------------------- .../application-policy-5.json | 18 ++++++++++++++++++ .../nested-group-v2/scripts/common/deploy.sh | 4 ++-- .../nested-group-v2/scripts/common/undeploy.sh | 4 ++-- 3 files changed, 22 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e760f680/samples/application-policies/application-policy-5.json ---------------------------------------------------------------------- diff --git a/samples/application-policies/application-policy-5.json b/samples/application-policies/application-policy-5.json new file mode 100644 index 0000000..4e1a971 --- /dev/null +++ b/samples/application-policies/application-policy-5.json @@ -0,0 +1,18 @@ +{ + "id": "application-policy-5", + "algorithm":"one-after-another", + "networkPartitions":[ + "network-partition-1", + "network-partition-2" + ], + "properties":[ + { + "name": "networkPartitionGroups", + "value": "network-partition-1,network-partition-2" + }, + { + "name": "key-2", + "value": "value-2" + }, + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/e760f680/samples/applications/nested-group-v2/scripts/common/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/nested-group-v2/scripts/common/deploy.sh b/samples/applications/nested-group-v2/scripts/common/deploy.sh index 37f3b55..7708346 100755 --- a/samples/applications/nested-group-v2/scripts/common/deploy.sh +++ b/samples/applications/nested-group-v2/scripts/common/deploy.sh @@ -53,7 +53,7 @@ curl -X POST -H "Content-Type: application/json" -d "@${cartridges_groups_path}/ sleep 1 echo "Adding application policy..." -curl -X POST -H "Content-Type: application/json" -d "@${application_policies_path}/application-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies +curl -X POST -H "Content-Type: application/json" -d "@${application_policies_path}/application-policy-5.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies sleep 1 @@ -63,4 +63,4 @@ curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/applicat sleep 1 echo "Deploying application..." -curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/nested-group-app/deploy/application-policy-1 +curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/nested-group-app/deploy/application-policy-5 http://git-wip-us.apache.org/repos/asf/stratos/blob/e760f680/samples/applications/nested-group-v2/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/nested-group-v2/scripts/common/undeploy.sh b/samples/applications/nested-group-v2/scripts/common/undeploy.sh index 038933e..5b4aa59 100644 --- a/samples/applications/nested-group-v2/scripts/common/undeploy.sh +++ b/samples/applications/nested-group-v2/scripts/common/undeploy.sh @@ -22,8 +22,8 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/tomcat2 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 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-5 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 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-5
