Master deployment policy fix merge

samples/applications/dependent-scaling/sample-groups/scripts/common/deploy.sh

@@ -51,4 +51,5 @@ 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" -d "@${iaas_artifacts_path}/deployment-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/dependency-scaling-groups-app/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/dependency-scaling-groups-app/deploy

samples/applications/group-cartridges/README.md

@@ -1,4 +1,4 @@
-single_group_v3
+group-cartridges-app
 ===============
 
 Application folder structure

samples/applications/group-cartridges/artifacts/application-policy.json

@@ -0,0 +1,12 @@
+{
+   "networkPartition":[
+      {
+         "id":"network-partition-1",
+         "activeByDefault":"true"
+      },
+      {
+         "id":"network-partition-2",
+         "activeByDefault":"false"
+      }
+   ]
+}

samples/applications/group-cartridges/artifacts/application.json

@@ -1,43 +1,52 @@
 {
-    "applicationId": "single_group_v3",
-    "alias": "single_group_v3",
+    "applicationId": "group-cartridges-app",
+    "alias": "my-group-cartridges-app",
     "components": {
-      "cartridges":[  
-         {  
-            "type": "tomcat1",
-            "cartridgeMin": 1,
-            "cartridgeMax": 2,
-            "subscribableInfo": {
-                "alias": "mytomcat",
-                "autoscalingPolicy": "autoscaling-policy-1",
-                "artifactRepository":{
-                      "privateRepo":false,
-                      "repoUrl":"https://github.com/imesh/stratos-tomcat1-applications.git",
-                      "repoUsername":"",
-                      "repoPassword":""
-                }
-            }
-         },
-         {  
-            "type":"mysql",
-            "cartridgeMin": 1,
-            "cartridgeMax": 10,    
-			"subscribableInfo":{  
-                "alias":"mymysql",
-                "autoscalingPolicy":"autoscaling-policy-1",
-                "artifactRepository":{
-                    "privateRepo":false,
-                    "repoUrl":"",
-                    "repoUsername":"",
-                    "repoPassword":""
-                }
+        "groups": [
+            {
+                "name": "tomcat1-mysql-group",
+                "alias": "my-tomcat1-mysql-group",
+                "groupMinInstances": 1,
+                "groupMaxInstances": 2,
+                "deploymentPolicy": "deployment-policy-1",
+                "cartridges": [
+                    {
+                        "type": "tomcat1",
+                        "cartridgeMin": 1,
+                        "cartridgeMax": 2,
+                        "subscribableInfo": {
+                            "alias": "my-tomcat1",
+                            "autoscalingPolicy": "autoscaling-policy-1",
+                            "artifactRepository": {
+                                "privateRepo": false,
+                                "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git",
+                                "repoUsername": "",
+                                "repoPassword": ""
+                            }
+                        }
+                    },
+                    {
+                        "type": "mysql",
+                        "cartridgeMin": 1,
+                        "cartridgeMax": 10,
+                        "subscribableInfo": {
+                            "alias": "my-mysql",
+                            "autoscalingPolicy": "autoscaling-policy-1",
+                            "artifactRepository": {
+                                "privateRepo": false,
+                                "repoUrl": "",
+                                "repoUsername": "",
+                                "repoPassword": ""
+                            }
+                        }
+
+                    }
+                ]
             }
-
-         }
-      ],
+        ],
        "dependencies": {
             "startupOrders": [
-                "cartridge.mysql,cartridge.tomcat1"
+                "cartridge.my-tomcat1,cartridge.my-mysql"
             ],
             "terminationBehaviour": "terminate-all"
         }

samples/applications/group-cartridges/artifacts/deployment-policy.json

@@ -1,5 +1,5 @@
 {
-   "id": "deployment-policy-2",
+   "id": "deployment-policy-1",
    "networkPartition": [
       {
          "id": "network-partition-1",