You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/03/04 16:02:36 UTC
stratos git commit: updating more-complex-app sample
Repository: stratos
Updated Branches:
refs/heads/master 0c2ce8b17 -> dbdd9a429
updating more-complex-app sample
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dbdd9a42
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dbdd9a42
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dbdd9a42
Branch: refs/heads/master
Commit: dbdd9a429869eff8422a9a625d50fea31b9ade3f
Parents: 0c2ce8b
Author: R-Rajkumar <rr...@gmail.com>
Authored: Wed Mar 4 20:32:24 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Wed Mar 4 20:32:24 2015 +0530
----------------------------------------------------------------------
.../artifacts/application-policy.json | 8 --------
.../artifacts/autoscaling-policy.json | 14 --------------
.../artifacts/deployment-policy.json | 15 ---------------
.../more-complex-app/scripts/common/deploy.sh | 8 +++++++-
.../more-complex-app/scripts/common/undeploy.sh | 6 +++++-
5 files changed, 12 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/dbdd9a42/samples/applications/more-complex-app/artifacts/application-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/artifacts/application-policy.json b/samples/applications/more-complex-app/artifacts/application-policy.json
deleted file mode 100644
index 9d2c6a1..0000000
--- a/samples/applications/more-complex-app/artifacts/application-policy.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "networkPartition":[
- {
- "id":"network-partition-1",
- "activeByDefault":"true"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/dbdd9a42/samples/applications/more-complex-app/artifacts/autoscaling-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/artifacts/autoscaling-policy.json b/samples/applications/more-complex-app/artifacts/autoscaling-policy.json
deleted file mode 100755
index b41726e..0000000
--- a/samples/applications/more-complex-app/artifacts/autoscaling-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-1",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 80
- },
- "memoryConsumption": {
- "threshold": 90
- },
- "loadAverage": {
- "threshold": 50
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/dbdd9a42/samples/applications/more-complex-app/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/artifacts/deployment-policy.json b/samples/applications/more-complex-app/artifacts/deployment-policy.json
deleted file mode 100644
index 666c299..0000000
--- a/samples/applications/more-complex-app/artifacts/deployment-policy.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "deployment-policy-1",
- "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/dbdd9a42/samples/applications/more-complex-app/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/scripts/common/deploy.sh b/samples/applications/more-complex-app/scripts/common/deploy.sh
index 1adc53b..a6e9bea 100755
--- a/samples/applications/more-complex-app/scripts/common/deploy.sh
+++ b/samples/applications/more-complex-app/scripts/common/deploy.sh
@@ -14,6 +14,7 @@ cartridges_groups_path=`cd "${script_path}/../../../../cartridges-groups"; pwd`
autoscaling_policies_path=`cd "${script_path}/../../../../autoscaling-policies"; pwd`
network_partitions_path=`cd "${script_path}/../../../../network-partitions/${iaas}"; pwd`
deployment_policies_path=`cd "${script_path}/../../../../deployment-policies"; pwd`
+application_policies_path=`cd "${script_path}/../../../../application-policies"; pwd`
set -e
@@ -49,10 +50,15 @@ 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.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies
+
+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 "@${artifacts_path}/application-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/more-complex-app/deploy
\ No newline at end of file
+curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/more-complex-app/deploy/application-policy-1
http://git-wip-us.apache.org/repos/asf/stratos/blob/dbdd9a42/samples/applications/more-complex-app/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/scripts/common/undeploy.sh b/samples/applications/more-complex-app/scripts/common/undeploy.sh
index efa7af8..7c45c57 100644
--- a/samples/applications/more-complex-app/scripts/common/undeploy.sh
+++ b/samples/applications/more-complex-app/scripts/common/undeploy.sh
@@ -24,4 +24,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
\ No newline at end of file
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-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
+