Merge "tosca.policies.tacker.Scaling of tacker_defs.yaml define incorrect"

doc/source/user/scale_usage_guide.rst

@@ -41,12 +41,6 @@ Tacker defines TOSCA schema for the scaling policy as given below:
         type: integer
         required: true
         description: Number of nodes to add or remove during the scale out/in.
-      targets:
-        type: list
-        entry_schema:
-          type: string
-        required: true
-        description: List of Scaling nodes.
       min_instances:
         type: integer
         required: true
@@ -65,6 +59,12 @@ Tacker defines TOSCA schema for the scaling policy as given below:
         default: 120
         description: Wait time (in seconds) between consecutive scaling
         operations. During the cooldown period, scaling action will be ignored
+    targets:
+      type: list
+      entry_schema:
+        type: string
+      required: true
+      description: List of Scaling nodes.
 
 
 Sample TOSCA with scaling policy
@@ -77,12 +77,14 @@ and vdu2 are already defined VDUs.
 
      policies:
 
-        sp1:
+       - sp1:
 
            type: tosca.policies.tacker.Scaling
 
            description: Simple VDU scaling
 
+           targets: [vdu1, vdu2]
+
            properties:
              min_instances: 1
 
@@ -92,9 +94,6 @@ and vdu2 are already defined VDUs.
 
              increment: 1
 
-             targets: [vdu1, vdu2]
-
-
 Deploying scaling TOSCA template using Tacker
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

tacker/tosca/lib/tacker_defs.yaml

@@ -317,12 +317,6 @@ policy_types:
         type: integer
         required: true
         description: Number of nodes to add or remove during the scale out/in.
-      targets:
-        type: list
-        entry_schema:
-          type: string
-        required: true
-        description: List of Scaling nodes.
       target_cpu_utilization_percentage:
         type: integer
         required: false