Merge "Fix UT and FT VNFD yaml because lack of properties"

2021-04-01 08:34:25 +00:00 · 2021-04-01 08:34:25 +00:00 · a6811d2c59
commit a6811d2c59
parent ae3ad13f27 e6a7ff593f
12 changed files with 18 additions and 12 deletions
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@ -160,5 +160,5 @@ wrapt==1.10.11
 # but the latest revision from git repo for development.
 # If you install packages, comment out two lines of `install_package_gitrepo` in
 # `devstack/plugin.sh` in addition to activate following lines.
-heat-translator==2.2.0 # Apache-2.0
+heat-translator==2.3.0 # Apache-2.0
 tosca-parser==2.3.0 # Apache-2.0
--- a/requirements.txt
+++ b/requirements.txt
@ -60,5 +60,5 @@ glance-store>=2.4.0 # Apache-2.0
 # but the latest revision from git repo for development.
 # If you install packages, comment out two lines of `install_package_gitrepo` in
 # `devstack/plugin.sh` in addition to activate following lines.
-heat-translator>=2.2.0 # Apache-2.0
+heat-translator>=2.3.0 # Apache-2.0
 tosca-parser>=2.3.0 # Apache-2.0
--- a/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml
+++ b/samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml
@ -40,8 +40,8 @@ topology_template:
  policies:
    - SP1:
        type: tosca.policies.tacker.Scaling
-        targets: [VDU1]
        properties:
+          targets: [VDU1]
          increment: 1
          cooldown: 120
          min_instances: 1
--- a/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml
+++ b/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml
@ -56,8 +56,8 @@ topology_template:
  policies:
    - SP1:
        type: tosca.policies.tacker.Scaling
-        targets: [VDU1, VDU2]
        properties:
+          targets: [VDU1, VDU2]
          increment: 1
          cooldown: 120
          min_instances: 1
--- a/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml
+++ b/tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml
@ -40,8 +40,8 @@ topology_template:
  policies:
    - SP1:
        type: tosca.policies.tacker.Scaling
-        targets: [VDU1]
        properties:
+          targets: [VDU1]
          increment: 1
          cooldown: 60
          min_instances: 1
--- a/tacker/tests/etc/samples/sample-tosca-scale-all.yaml
+++ b/tacker/tests/etc/samples/sample-tosca-scale-all.yaml
@ -41,8 +41,8 @@ topology_template:
  policies:
    - SP1:
        type: tosca.policies.tacker.Scaling
-        targets: [VDU1]
        properties:
+          targets: [VDU1]
          increment: 1
          cooldown: 60
          min_instances: 1
--- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_scale.yaml
+++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_scale.yaml
@ -36,8 +36,8 @@ topology_template:
  policies:
    - SP1:
        type: tosca.policies.tacker.Scaling
-        targets: [VDU1]
        properties:
+          targets: [VDU1]
          increment: 1
          cooldown: 60
          min_instances: 1
--- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_scale.yaml
+++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_scale.yaml
@ -35,8 +35,8 @@ topology_template:
  policies:
    - SP1:
        type: tosca.policies.tacker.Scaling
-        targets: [VDU1]
        properties:
+          targets: [VDU1]
          increment: 1
          cooldown: 60
          min_instances: 1
--- a/tacker/tosca/lib/tacker_defs.yaml
+++ b/tacker/tosca/lib/tacker_defs.yaml
@ -330,6 +330,12 @@ 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