From 69d61a82dc7fb02f610749856e4b075728ad874f Mon Sep 17 00:00:00 2001 From: Dinithi Date: Tue, 3 Mar 2015 10:27:15 +0530 Subject: [PATCH 1/2] Adding tomcat-group.json --- .../single-group-v2/artifacts/application.json | 6 +++--- .../single-group-v2/scripts/common/deploy.sh | 4 ++-- .../single-group-v2/scripts/common/undeploy.sh | 2 +- samples/cartridges-groups/tomcat-group.json | 16 ++++++++++++++++ 4 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 samples/cartridges-groups/tomcat-group.json diff --git a/samples/applications/single-group-v2/artifacts/application.json b/samples/applications/single-group-v2/artifacts/application.json index c738a7fddd..df537bb470 100644 --- a/samples/applications/single-group-v2/artifacts/application.json +++ b/samples/applications/single-group-v2/artifacts/application.json @@ -4,8 +4,8 @@ "components": { "groups": [ { - "name": "group6", - "alias": "my-group6", + "name": "tomcat-group", + "alias": "my-tomcat-group", "groupMinInstances": 1, "groupMaxInstances": 1, "deploymentPolicy":"deployment-policy-3", @@ -63,7 +63,7 @@ ], "dependencies": { "startupOrders": [ - "group.my-group6,cartridge.my-tomcat" + "group.my-tomcat-group,cartridge.my-tomcat" ], "terminationBehaviour": "terminate-none" } diff --git a/samples/applications/single-group-v2/scripts/common/deploy.sh b/samples/applications/single-group-v2/scripts/common/deploy.sh index 7504859339..62c6f60242 100755 --- a/samples/applications/single-group-v2/scripts/common/deploy.sh +++ b/samples/applications/single-group-v2/scripts/common/deploy.sh @@ -41,8 +41,8 @@ curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/tomcat1 echo "Adding tomcat2 cartridge..." curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/tomcat2.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges -echo "Adding group6c group..." -curl -X POST -H "Content-Type: application/json" -d "@${cartridges_groups_path}/group6c.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups +echo "Adding tomcat-group group..." +curl -X POST -H "Content-Type: application/json" -d "@${cartridges_groups_path}/tomcat-group.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups sleep 1 diff --git a/samples/applications/single-group-v2/scripts/common/undeploy.sh b/samples/applications/single-group-v2/scripts/common/undeploy.sh index 032d05e907..2d29554f34 100644 --- a/samples/applications/single-group-v2/scripts/common/undeploy.sh +++ b/samples/applications/single-group-v2/scripts/common/undeploy.sh @@ -14,7 +14,7 @@ echo "Deleting application..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single_group_v2 echo "Removing groups..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/group6 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/tomcat-group echo "Removing cartridges..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/tomcat diff --git a/samples/cartridges-groups/tomcat-group.json b/samples/cartridges-groups/tomcat-group.json new file mode 100644 index 0000000000..2bdcfb66fa --- /dev/null +++ b/samples/cartridges-groups/tomcat-group.json @@ -0,0 +1,16 @@ +{ + "name": "tomcat-group", + "groups": [ + { + "name": "tomcat-group", + "cartridges": [ + "tomcat1", + "tomcat2" + ] + } + ], + "dependencies": { + "terminationBehaviour": "terminate-all" + } +} + From 7c88a15aa99036da7df471b875f33310422a3631 Mon Sep 17 00:00:00 2001 From: Dinithi Date: Tue, 3 Mar 2015 11:56:48 +0530 Subject: [PATCH 2/2] Fixing single-group-v3 sample application --- .../artifacts/application-policy.json | 8 +++++++ .../artifacts/application.json | 11 +++++---- .../artifacts/deployment-policy.json | 2 +- .../single-group-v3/scripts/common/deploy.sh | 23 ++++++++++--------- .../scripts/common/undeploy.sh | 9 +++----- 5 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 samples/applications/single-group-v3/artifacts/application-policy.json diff --git a/samples/applications/single-group-v3/artifacts/application-policy.json b/samples/applications/single-group-v3/artifacts/application-policy.json new file mode 100644 index 0000000000..9d2c6a1037 --- /dev/null +++ b/samples/applications/single-group-v3/artifacts/application-policy.json @@ -0,0 +1,8 @@ +{ + "networkPartition":[ + { + "id":"network-partition-1", + "activeByDefault":"true" + } + ] +} diff --git a/samples/applications/single-group-v3/artifacts/application.json b/samples/applications/single-group-v3/artifacts/application.json index 6f09754d2b..a050de4827 100644 --- a/samples/applications/single-group-v3/artifacts/application.json +++ b/samples/applications/single-group-v3/artifacts/application.json @@ -1,20 +1,21 @@ { - "applicationId": "single_group_v3", - "alias": "single_group_v3", + "applicationId": "single-group-v3", + "alias": "my-single-group-v3", "components": { "groups": [ { - "name": "group6", - "alias": "mygroup6", + "name": "tomcat2-group", + "alias": "my-tomcat2-group", "groupMinInstances": 2, "groupMaxInstances": 3, + "deploymentPolicy":"deployment-policy-1", "cartridges": [ { "type": "tomcat2", "cartridgeMin": 1, "cartridgeMax": 1, "subscribableInfo": { - "alias": "tom2group6", + "alias": "my-tomcat2", "autoscalingPolicy": "autoscaling-policy-1", "artifactRepository":{ "privateRepo":false, diff --git a/samples/applications/single-group-v3/artifacts/deployment-policy.json b/samples/applications/single-group-v3/artifacts/deployment-policy.json index d858aed9d7..666c2997f8 100644 --- a/samples/applications/single-group-v3/artifacts/deployment-policy.json +++ b/samples/applications/single-group-v3/artifacts/deployment-policy.json @@ -1,5 +1,5 @@ { - "id": "deployment-policy-2", + "id": "deployment-policy-1", "networkPartition": [ { "id": "network-partition-1", diff --git a/samples/applications/single-group-v3/scripts/common/deploy.sh b/samples/applications/single-group-v3/scripts/common/deploy.sh index f462f2d2f1..41342af713 100755 --- a/samples/applications/single-group-v3/scripts/common/deploy.sh +++ b/samples/applications/single-group-v3/scripts/common/deploy.sh @@ -11,6 +11,9 @@ artifacts_path=`cd "${script_path}/../../artifacts"; pwd` iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd` cartridges_path=`cd "${script_path}/../../../../cartridges/${iaas}"; pwd` 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` set -e @@ -19,28 +22,26 @@ if [[ -z "${iaas}" ]]; then exit fi -echo ${artifacts_path}/autoscaling-policy.json +echo ${autoscaling_policies_path}/autoscaling-policy-1.json echo "Adding autoscale policy..." -curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/autoscaling-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies +curl -X POST -H "Content-Type: application/json" -d "@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies -echo "Adding tomcat cartridge..." -curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/tomcat.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges +echo "Adding network partitions..." +curl -X POST -H "Content-Type: application/json" -d "@${network_partitions_path}/network-partition-1.json" -k -v -u admin:admin https://${host_ip}:9443/api/networkPartitions -echo "Adding tomcat1 cartridge..." -curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/tomcat1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges +echo "Adding deployment policies..." +curl -X POST -H "Content-Type: application/json" -d "@${deployment_policies_path}/deployment-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies echo "Adding tomcat2 cartridge..." curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/tomcat2.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges -echo "Adding group6c group..." -curl -X POST -H "Content-Type: application/json" -d "@${cartridges_groups_path}/group6c.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups +echo "Adding tomcat2-group group..." +curl -X POST -H "Content-Type: application/json" -d "@${cartridges_groups_path}/tomcat2-group.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups 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 "@${iaas_artifacts_path}/deployment-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single_group_v3/deploy +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/single-group-v3/deploy diff --git a/samples/applications/single-group-v3/scripts/common/undeploy.sh b/samples/applications/single-group-v3/scripts/common/undeploy.sh index 3ad581042e..cce2dd673d 100644 --- a/samples/applications/single-group-v3/scripts/common/undeploy.sh +++ b/samples/applications/single-group-v3/scripts/common/undeploy.sh @@ -6,20 +6,17 @@ host_port=9443 set -e echo "Undeploying application..." -curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single_group_v3/undeploy +curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-group-v3/undeploy sleep 10 echo "Deleting application..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single_group_v3 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-group-v3 echo "Removing groups..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/group8 -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/group6 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/tomcat2-group echo "Removing cartridges..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/tomcat -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/tomcat1 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..."