Browse Source

Fix UT and FT VNFD yaml because lack of properties

An error occurs in tox due to an incorrect setting of
properties related to tosca.policies.tacker.Scaling.
Therefore, this patch fixes the related VNFDs.
The error is occurring in unittest and FT, so fix both.

At the same time, there was a problem with the version of
heat-translator, so modify the following files as well.
- lower-constraints.txt
- requirements.txt

Co-Authored-By: Yasufumi Ogawa <yasufum.o@gmail.com>
Change-Id: Iae2b25abe53eda483e811171306d3d375a7e1687
Closes-Bug: #1921996
changes/00/784000/4
Hiroo Kitamura 3 months ago
parent
commit
e6a7ff593f
12 changed files with 18 additions and 12 deletions
  1. +1
    -1
      lower-constraints.txt
  2. +1
    -1
      requirements.txt
  3. +1
    -1
      samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml
  4. +1
    -1
      samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml
  5. +1
    -1
      tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml
  6. +1
    -1
      tacker/tests/etc/samples/sample-tosca-scale-all.yaml
  7. +1
    -1
      tacker/tests/etc/samples/sample-tosca-vnfd-instance-reservation.yaml
  8. +2
    -2
      tacker/tests/etc/samples/sample-tosca-vnfd-maintenance.yaml
  9. +1
    -1
      tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml
  10. +1
    -1
      tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_scale.yaml
  11. +1
    -1
      tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_scale.yaml
  12. +6
    -0
      tacker/tosca/lib/tacker_defs.yaml

+ 1
- 1
lower-constraints.txt View File

@ -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

+ 1
- 1
requirements.txt View File

@ -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

+ 1
- 1
samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml View File

@ -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


+ 1
- 1
samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml View File

@ -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


+ 1
- 1
tacker/tests/etc/samples/sample-tosca-alarm-scale.yaml View File

@ -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


+ 1
- 1
tacker/tests/etc/samples/sample-tosca-scale-all.yaml View File

@ -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


+ 1
- 1
tacker/tests/etc/samples/sample-tosca-vnfd-instance-reservation.yaml View File

@ -87,4 +87,4 @@ topology_template:
min_instances: 0
max_instances: 2
default_instances: 0
targets: [VDU1]
targets: [VDU1]

+ 2
- 2
tacker/tests/etc/samples/sample-tosca-vnfd-maintenance.yaml View File

@ -46,6 +46,6 @@ topology_template:
increment: 1
max_instances: 3
min_instances: 1
targets:
- VDU1
targets:
- VDU1
type: tosca.policies.tacker.Scaling

+ 1
- 1
tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml View File

@ -46,7 +46,7 @@ topology_template:
min_instances: 1
max_instances: 3
default_instances: 2
targets: [ VDU1 ]
targets: [ VDU1 ]
- vdu1_cpu_usage_monitoring_policy:
type: tosca.policies.tacker.Alarming


+ 1
- 1
tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_scale.yaml View File

@ -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


+ 1
- 1
tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_scale.yaml View File

@ -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


+ 6
- 0
tacker/tosca/lib/tacker_defs.yaml View File

@ -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


Loading…
Cancel
Save