From db7aaec7462e10538871a3f74b1ffef1b5e0b373 Mon Sep 17 00:00:00 2001 From: Shivam Shukla Date: Mon, 4 Aug 2025 10:01:24 +0000 Subject: [PATCH] Fix Tacker CI Failures from Tosca-Parser, TackerClient, and Neutron/Setuptools Tacker CI jobs have been failing due to multiple issues: 1. DevStack builds failed with Neutron logger errors and setuptools incompatibility when Global_Venv=False. 2. python-tackerclient was always installed from PyPI instead of Git due to missing installation function in Tacker's DevStack plugin. 3. Stricter relationship validation in tosca-parser v2.13.0 caused template validation errors. This patch updates sample test data for Tosca-parser validation, enables Git installation for python-tackerclient, and adjusts job configurations (Neutron driver and Global_Venv) to resolve Neutron and setuptools related errors. Closes-Bug: https://bugs.launchpad.net/tacker/+bug/2118586 Closes-Bug: https://bugs.launchpad.net/tacker/+bug/2119435 Closes-Bug: https://bugs.launchpad.net/tacker/+bug/2119433 Change-Id: If9bb32267c3006bfda53053a5a2b4d59e62e1c2b Signed-off-by: Shivam Shukla --- devstack/lib/tacker | 12 ++++++++++++ devstack/plugin.sh | 1 + .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../Definitions/helloworld3_types.yaml | 4 ++++ .../Definitions/helloworld3_types.yaml | 4 ++++ .../functional/Definitions/helloworld3_types.yaml | 7 ++++++- .../functional2/Definitions/helloworld3_types.yaml | 7 ++++++- .../functional3/Definitions/helloworld3_types.yaml | 7 ++++++- .../functional4/Definitions/helloworld3_types.yaml | 7 ++++++- .../functional5/Definitions/helloworld3_types.yaml | 7 ++++++- .../functional6/Definitions/helloworld3_types.yaml | 7 ++++++- .../functional7/Definitions/helloworld3_types.yaml | 7 ++++++- .../Definitions/helloworld3_types.yaml | 7 ++++++- .../Definitions/helloworld3_types.yaml | 4 ++++ .../Definitions/helloworld3_types.yaml | 9 +++++++++ .../VNF.yaml | 8 ++++++++ .../nfv/sample_vnf_package_csar_manifest/VNF.yaml | 8 ++++++++ .../Definitions/helloworld3_types.yaml | 4 ++++ .../vnfd_helloworld_single.yaml | 8 ++++++++ .../Definitions/helloworld3_types.yaml | 4 ++++ .../Definitions/helloworld3_types.yaml | 7 ++++++- .../Definitions/helloworld3_types.yaml | 7 ++++++- .../test_cnf/Definitions/helloworld3_types.yaml | 4 ++++ .../Definitions/sample_types.yaml | 4 ++++ .../Definitions/sample_types.yaml | 4 ++++ .../Definitions/helloworld3_types.yaml | 4 ++++ .../Definitions/helloworld3_types.yaml | 4 ++++ .../Definitions/sample_vnfd_types.yaml | 4 ++++ .../Definitions/helloworld3_types.yaml | 4 ++++ .../Definitions/helloworld3_types.yaml | 4 ++++ .../vnfd_helloworld_single.yaml | 8 ++++++++ .../Definitions/helloworld3_types.yaml | 4 ++++ .../Definitions/sample_vnfd_types.yaml | 3 +++ .../test_heal_grant_unit/helloworld3_types.yaml | 3 +++ .../etsi/nfv/test_heal_grant_unit/sample_vnfd.yaml | 2 +- .../Definitions/helloworld3_types.yaml | 4 ++++ .../sample_lcm_with_user_data_types.yaml | 4 ++++ .../Definitions/helloworld3_types.yaml | 7 ++++++- .../Definitions/helloworld3_types.yaml | 5 +++++ .../nfv/vnflcm1/Definitions/helloworld3_types.yaml | 4 ++++ .../nfv/vnflcm2/Definitions/helloworld3_types.yaml | 4 ++++ .../nfv/vnflcm3/Definitions/helloworld3VNF.yaml | 4 ++++ .../nfv/vnflcm4/Definitions/helloworld3_types.yaml | 4 ++++ .../vnfpkgm2/Definitions/helloworld3_types.yaml | 4 ++++ .../etsi/nfv/vnfpkgm3/vnfd_helloworld_single.yaml | 8 ++++++++ .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../contents/Definitions/sample_cnf_types.yaml | 4 ++++ .../contents/Definitions/sample_types.yaml | 4 ++++ .../contents/Definitions/sample_types.yaml | 4 ++++ .../contents/Definitions/sample_cnf_types.yaml | 4 ++++ .../contents/Definitions/sample_cnf_types.yaml | 4 ++++ .../contents/Definitions/sample_cnf_types.yaml | 4 ++++ .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../contents/Definitions/sample_tf_types.yaml | 4 ++++ .../contents/Definitions/sample_tf_types.yaml | 4 ++++ .../contents/Definitions/v2_sample1_types.yaml | 7 ++++++- .../contents/Definitions/v2_sample3_types.yaml | 5 +++++ .../contents/Definitions/v2_sample2_types.yaml | 7 ++++++- .../contents/Definitions/v2_sample4_types.yaml | 7 ++++++- .../contents/Definitions/v2_sample3_types.yaml | 7 ++++++- .../contents/Definitions/v2_sample4_types.yaml | 7 ++++++- .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../contents/Definitions/v2_sample2_types.yaml | 7 ++++++- .../contents/Definitions/v2_sample1_types.yaml | 7 ++++++- .../contents/Definitions/v2_sample2_types.yaml | 5 +++++ .../contents/Definitions/change_vnf_pkg_types.yaml | 6 +++++- .../contents/Definitions/change_vnf_pkg_types.yaml | 6 +++++- .../contents/Definitions/change_vnf_pkg_types.yaml | 6 +++++- .../contents/Definitions/change_vnf_pkg_types.yaml | 6 +++++- .../contents/Definitions/v2_sample2_types.yaml | 7 ++++++- .../contents/Definitions/v2_sample3_types.yaml | 7 ++++++- .../contents/Definitions/v2_sample3_types.yaml | 7 ++++++- .../contents/Definitions/v2_sample6_types.yaml | 5 +++++ .../contents/Definitions/v2_sample4_types.yaml | 5 +++++ .../contents/Definitions/v2_sample5_types.yaml | 5 +++++ .../contents/Definitions/v2_sample7_types.yaml | 5 +++++ .../Definitions/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ .../Definitions/helloworld3_types.yaml | 4 ++++ .../functional/sol/vnfpkgm/test_vnf_package.py | 2 +- tacker/tests/functional/tools/test-setup-mgmt.sh | 7 ++++++- .../data/etsi_nfv/etsi_nfv_sol001_vnfd_types.yaml | 4 ++++ ...a_generate_hot_from_tosca_translator_error.yaml | 11 +++++++++++ zuul.d/jobs/base.yaml | 14 ++++++-------- 90 files changed, 446 insertions(+), 36 deletions(-) diff --git a/devstack/lib/tacker b/devstack/lib/tacker index 2401cc389..d9ee7e635 100644 --- a/devstack/lib/tacker +++ b/devstack/lib/tacker @@ -40,6 +40,10 @@ GITREPO["tacker-horizon"]=${TACKERHORIZON_REPO:-${GIT_BASE}/openstack/tacker-hor GITBRANCH["tacker-horizon"]=${TACKERHORIZON_BRANCH:-master} GITDIR["tacker-horizon"]=$DEST/tacker-horizon +GITREPO["python-tackerclient"]=${TACKERCLIENT_REPO:-${GIT_BASE}/openstack/python-tackerclient.git} +GITBRANCH["python-tackerclient"]=${TACKERCLIENT_BRANCH:-master} +GITDIR["python-tackerclient"]=$DEST/python-tackerclient + TACKER_DIR=$DEST/tacker # Support entry points installation of console scripts @@ -77,6 +81,14 @@ GLANCE_DEFAULT_BACKEND=${GLANCE_DEFAULT_BACKEND:=file} # Functions # --------- +# install_tackerclient - Collect source and prepare +function install_tackerclient { + if use_library_from_git "python-tackerclient"; then + git_clone_by_name "python-tackerclient" + setup_dev_lib "python-tackerclient" + fi +} + # function install_db_client_mysql() - ensure mysql client is installed function install_db_client_mysql { if is_oraclelinux; then diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 89f7bbf95..da036d459 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -14,6 +14,7 @@ if is_service_enabled tacker; then # Perform installation of service source echo_summary "Installing Tacker" install_tacker + install_tackerclient if use_library_from_git heat-translator; then git_clone_by_name heat-translator diff --git a/samples/free5gc/cnf/sample_free5gc_cnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/free5gc/cnf/sample_free5gc_cnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml index 23cdcc7ff..1b0bfd192 100644 --- a/samples/free5gc/cnf/sample_free5gc_cnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/free5gc/cnf/sample_free5gc_cnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/free5gc/cnf_on_vm/no_affinity/sample_free5gc_cnf_on_vm_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/free5gc/cnf_on_vm/no_affinity/sample_free5gc_cnf_on_vm_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml index 23cdcc7ff..1b0bfd192 100644 --- a/samples/free5gc/cnf_on_vm/no_affinity/sample_free5gc_cnf_on_vm_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/free5gc/cnf_on_vm/no_affinity/sample_free5gc_cnf_on_vm_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/free5gc/cnf_on_vm/no_affinity/sample_free5gc_cnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/free5gc/cnf_on_vm/no_affinity/sample_free5gc_cnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml index 23cdcc7ff..1b0bfd192 100644 --- a/samples/free5gc/cnf_on_vm/no_affinity/sample_free5gc_cnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/free5gc/cnf_on_vm/no_affinity/sample_free5gc_cnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/mgmt_driver/ansible/ansible_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/mgmt_driver/ansible/ansible_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml index 7514f3e22..a255072ba 100644 --- a/samples/mgmt_driver/ansible/ansible_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/mgmt_driver/ansible/ansible_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/mgmt_driver/kubernetes/private_registry_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/mgmt_driver/kubernetes/private_registry_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml index 73b51da2d..561247478 100644 --- a/samples/mgmt_driver/kubernetes/private_registry_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/mgmt_driver/kubernetes/private_registry_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/practical_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/practical_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml index fa0ef5011..e6166bc47 100644 --- a/samples/practical_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/practical_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/tests/etc/samples/etsi/nfv/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/tests/etc/samples/etsi/nfv/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml index 7514f3e22..a255072ba 100644 --- a/samples/tests/etc/samples/etsi/nfv/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/tests/etc/samples/etsi/nfv/common_artifact/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/common_artifact/Definitions/helloworld3_types.yaml index a2e7a474a..11cc51aa3 100644 --- a/samples/tests/etc/samples/etsi/nfv/common_artifact/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/common_artifact/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/Definitions/helloworld3_types.yaml index a2e7a474a..11cc51aa3 100644 --- a/samples/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/functional/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/functional/Definitions/helloworld3_types.yaml index 5c026d6a2..8c1afe490 100644 --- a/samples/tests/etc/samples/etsi/nfv/functional/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/functional/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/functional2/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/functional2/Definitions/helloworld3_types.yaml index 5c026d6a2..8c1afe490 100644 --- a/samples/tests/etc/samples/etsi/nfv/functional2/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/functional2/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/functional3/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/functional3/Definitions/helloworld3_types.yaml index 5c026d6a2..8c1afe490 100644 --- a/samples/tests/etc/samples/etsi/nfv/functional3/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/functional3/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/functional4/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/functional4/Definitions/helloworld3_types.yaml index 5c026d6a2..8c1afe490 100644 --- a/samples/tests/etc/samples/etsi/nfv/functional4/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/functional4/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/functional5/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/functional5/Definitions/helloworld3_types.yaml index 5c026d6a2..8c1afe490 100644 --- a/samples/tests/etc/samples/etsi/nfv/functional5/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/functional5/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/functional6/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/functional6/Definitions/helloworld3_types.yaml index 5c026d6a2..8c1afe490 100644 --- a/samples/tests/etc/samples/etsi/nfv/functional6/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/functional6/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/functional7/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/functional7/Definitions/helloworld3_types.yaml index 5c026d6a2..8c1afe490 100644 --- a/samples/tests/etc/samples/etsi/nfv/functional7/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/functional7/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/mt_functional1/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/mt_functional1/Definitions/helloworld3_types.yaml index 5c026d6a2..8c1afe490 100644 --- a/samples/tests/etc/samples/etsi/nfv/mt_functional1/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/mt_functional1/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/refactor_mgmt_driver1/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/refactor_mgmt_driver1/Definitions/helloworld3_types.yaml index abcee8a8a..6c3e27e12 100644 --- a/samples/tests/etc/samples/etsi/nfv/refactor_mgmt_driver1/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/refactor_mgmt_driver1/Definitions/helloworld3_types.yaml @@ -56,10 +56,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/sample_compliance_test/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/sample_compliance_test/Definitions/helloworld3_types.yaml index bd7967d90..0250d52f2 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_compliance_test/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/sample_compliance_test/Definitions/helloworld3_types.yaml @@ -42,6 +42,15 @@ node_types: flavour_description: type: string default: 'n-vnf' + requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. + - virtual_link_external: + capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] + - virtual_link_internal: + capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF.yaml b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF.yaml index 055a13c7e..37dc16e47 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF.yaml +++ b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF.yaml @@ -643,13 +643,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.Vdu.VirtualBlockStorage: derived_from: tosca.nodes.Root @@ -801,10 +805,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.yaml b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.yaml index 055a13c7e..37dc16e47 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.yaml +++ b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.yaml @@ -643,13 +643,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.Vdu.VirtualBlockStorage: derived_from: tosca.nodes.Root @@ -801,10 +805,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/Definitions/helloworld3_types.yaml index 12ff7446b..ce3cbef6b 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/Definitions/helloworld3_types.yaml @@ -56,10 +56,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml b/samples/tests/etc/samples/etsi/nfv/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml index a59f6a9aa..d54310923 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml +++ b/samples/tests/etc/samples/etsi/nfv/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml @@ -643,13 +643,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.Vdu.VirtualBlockStorage: derived_from: tosca.nodes.Root @@ -813,10 +817,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/Definitions/helloworld3_types.yaml index a2e7a474a..11cc51aa3 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/stack_update_in_heal/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/stack_update_in_heal/Definitions/helloworld3_types.yaml index 5c026d6a2..8c1afe490 100644 --- a/samples/tests/etc/samples/etsi/nfv/stack_update_in_heal/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/stack_update_in_heal/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/stack_update_in_scale/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/stack_update_in_scale/Definitions/helloworld3_types.yaml index 5c026d6a2..8c1afe490 100644 --- a/samples/tests/etc/samples/etsi/nfv/stack_update_in_scale/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/stack_update_in_scale/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf/Definitions/helloworld3_types.yaml index a2e7a474a..11cc51aa3 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/Definitions/sample_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/Definitions/sample_types.yaml index 858757767..7059cedbd 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/Definitions/sample_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/Definitions/sample_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_before/Definitions/sample_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_before/Definitions/sample_types.yaml index 96f90386f..4706cbd57 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_before/Definitions/sample_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_before/Definitions/sample_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf_ext_artifact/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf_ext_artifact/Definitions/helloworld3_types.yaml index a2e7a474a..11cc51aa3 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf_ext_artifact/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf_ext_artifact/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf_heal/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf_heal/Definitions/helloworld3_types.yaml index 74a2d3818..fe56ebf70 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf_heal/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf_heal/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf_helmchart/Definitions/sample_vnfd_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf_helmchart/Definitions/sample_vnfd_types.yaml index e0c6757ff..1cd2825d4 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf_helmchart/Definitions/sample_vnfd_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf_helmchart/Definitions/sample_vnfd_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf_multi_ns/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf_multi_ns/Definitions/helloworld3_types.yaml index bd93b4004..3e0929d06 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf_multi_ns/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf_multi_ns/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf_scale/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf_scale/Definitions/helloworld3_types.yaml index 754636d59..855e65381 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf_scale/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf_scale/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml b/samples/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml index 41bc8e133..fa834f7e8 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml @@ -632,13 +632,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.Vdu.VirtualBlockStorage: derived_from: tosca.nodes.Root @@ -790,10 +794,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_csar_utils_data/test_csar_utils_common/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_csar_utils_data/test_csar_utils_common/Definitions/helloworld3_types.yaml index a2e7a474a..11cc51aa3 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_csar_utils_data/test_csar_utils_common/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_csar_utils_data/test_csar_utils_common/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_enhanced_policy/Definitions/sample_vnfd_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_enhanced_policy/Definitions/sample_vnfd_types.yaml index 905012e14..089f9f51c 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_enhanced_policy/Definitions/sample_vnfd_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_enhanced_policy/Definitions/sample_vnfd_types.yaml @@ -56,8 +56,11 @@ node_types: type: string default: This is the default flavour description requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_heal_grant_unit/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_heal_grant_unit/helloworld3_types.yaml index c388b2f28..5068a60dc 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_heal_grant_unit/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_heal_grant_unit/helloworld3_types.yaml @@ -52,8 +52,11 @@ node_types: type: string default: "This is the default flavour description" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/test_heal_grant_unit/sample_vnfd.yaml b/samples/tests/etc/samples/etsi/nfv/test_heal_grant_unit/sample_vnfd.yaml index 1fdd78d37..d4c4e4efb 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_heal_grant_unit/sample_vnfd.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_heal_grant_unit/sample_vnfd.yaml @@ -79,7 +79,7 @@ topology_template: virtual_local_storage: - size_of_storage: 45 GB - PORT1: + VDU1_CP1: type: tosca.nodes.nfv.VduCp properties: layer_protocols: [ ipv4 ] diff --git a/samples/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/Definitions/helloworld3_types.yaml index 16a4ff5bc..af6a9f150 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/user_data_common/Definitions/sample_lcm_with_user_data_types.yaml b/samples/tests/etc/samples/etsi/nfv/user_data_common/Definitions/sample_lcm_with_user_data_types.yaml index 1703b559b..c8ea03a03 100644 --- a/samples/tests/etc/samples/etsi/nfv/user_data_common/Definitions/sample_lcm_with_user_data_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/user_data_common/Definitions/sample_lcm_with_user_data_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/user_data_sample_normal_scaling/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/user_data_sample_normal_scaling/Definitions/helloworld3_types.yaml index 5c026d6a2..8c1afe490 100644 --- a/samples/tests/etc/samples/etsi/nfv/user_data_sample_normal_scaling/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/user_data_sample_normal_scaling/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/user_data_sample_virtual_storage_missing/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/user_data_sample_virtual_storage_missing/Definitions/helloworld3_types.yaml index 3ad91f836..b2e59d07e 100644 --- a/samples/tests/etc/samples/etsi/nfv/user_data_sample_virtual_storage_missing/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/user_data_sample_virtual_storage_missing/Definitions/helloworld3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/vnflcm1/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/vnflcm1/Definitions/helloworld3_types.yaml index 16a4ff5bc..af6a9f150 100644 --- a/samples/tests/etc/samples/etsi/nfv/vnflcm1/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/vnflcm1/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "falvour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/vnflcm2/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/vnflcm2/Definitions/helloworld3_types.yaml index e8a0ed39a..66d83dbc1 100644 --- a/samples/tests/etc/samples/etsi/nfv/vnflcm2/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/vnflcm2/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/vnflcm3/Definitions/helloworld3VNF.yaml b/samples/tests/etc/samples/etsi/nfv/vnflcm3/Definitions/helloworld3VNF.yaml index 905c1197e..5f0982626 100644 --- a/samples/tests/etc/samples/etsi/nfv/vnflcm3/Definitions/helloworld3VNF.yaml +++ b/samples/tests/etc/samples/etsi/nfv/vnflcm3/Definitions/helloworld3VNF.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "test_flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/vnflcm4/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/vnflcm4/Definitions/helloworld3_types.yaml index 12ff7446b..ce3cbef6b 100644 --- a/samples/tests/etc/samples/etsi/nfv/vnflcm4/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/vnflcm4/Definitions/helloworld3_types.yaml @@ -56,10 +56,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/vnfpkgm2/Definitions/helloworld3_types.yaml b/samples/tests/etc/samples/etsi/nfv/vnfpkgm2/Definitions/helloworld3_types.yaml index 95ec40d9a..7b89c45c0 100644 --- a/samples/tests/etc/samples/etsi/nfv/vnfpkgm2/Definitions/helloworld3_types.yaml +++ b/samples/tests/etc/samples/etsi/nfv/vnfpkgm2/Definitions/helloworld3_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.yaml b/samples/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.yaml index 055a13c7e..37dc16e47 100644 --- a/samples/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.yaml +++ b/samples/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.yaml @@ -643,13 +643,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.Vdu.VirtualBlockStorage: derived_from: tosca.nodes.Root @@ -801,10 +805,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/etsi_nfv_sol001_vnfd_types.yaml index 7514f3e22..a255072ba 100755 --- a/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/tests/functional/sol_kubernetes_v2/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/tests/functional/sol_kubernetes_v2/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml index 0d51d36be..2be59b181 100644 --- a/samples/tests/functional/sol_kubernetes_v2/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/tests/functional/sol_kubernetes_v2/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/tests/functional/sol_kubernetes_v2/test_change_vnf_pkg_with_deployment/contents/Definitions/sample_cnf_types.yaml b/samples/tests/functional/sol_kubernetes_v2/test_change_vnf_pkg_with_deployment/contents/Definitions/sample_cnf_types.yaml index e51890bdd..63b231330 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_change_vnf_pkg_with_deployment/contents/Definitions/sample_cnf_types.yaml +++ b/samples/tests/functional/sol_kubernetes_v2/test_change_vnf_pkg_with_deployment/contents/Definitions/sample_cnf_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/Definitions/sample_types.yaml b/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/Definitions/sample_types.yaml index df6db8b6f..927b9d4a5 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/Definitions/sample_types.yaml +++ b/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/Definitions/sample_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_before/contents/Definitions/sample_types.yaml b/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_before/contents/Definitions/sample_types.yaml index df6db8b6f..927b9d4a5 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_before/contents/Definitions/sample_types.yaml +++ b/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_before/contents/Definitions/sample_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_kubernetes_v2/test_helm_change_vnf_pkg/contents/Definitions/sample_cnf_types.yaml b/samples/tests/functional/sol_kubernetes_v2/test_helm_change_vnf_pkg/contents/Definitions/sample_cnf_types.yaml index e51890bdd..63b231330 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_helm_change_vnf_pkg/contents/Definitions/sample_cnf_types.yaml +++ b/samples/tests/functional/sol_kubernetes_v2/test_helm_change_vnf_pkg/contents/Definitions/sample_cnf_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_kubernetes_v2/test_helm_instantiate/contents/Definitions/sample_cnf_types.yaml b/samples/tests/functional/sol_kubernetes_v2/test_helm_instantiate/contents/Definitions/sample_cnf_types.yaml index e51890bdd..63b231330 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_helm_instantiate/contents/Definitions/sample_cnf_types.yaml +++ b/samples/tests/functional/sol_kubernetes_v2/test_helm_instantiate/contents/Definitions/sample_cnf_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Definitions/sample_cnf_types.yaml b/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Definitions/sample_cnf_types.yaml index e51890bdd..63b231330 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Definitions/sample_cnf_types.yaml +++ b/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Definitions/sample_cnf_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_terraform_v2/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/tests/functional/sol_terraform_v2/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml index 0d51d36be..2be59b181 100644 --- a/samples/tests/functional/sol_terraform_v2/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/tests/functional/sol_terraform_v2/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/tests/functional/sol_terraform_v2/test_terraform_basic/contents/Definitions/sample_tf_types.yaml b/samples/tests/functional/sol_terraform_v2/test_terraform_basic/contents/Definitions/sample_tf_types.yaml index 7b0cd97fc..4f084802e 100644 --- a/samples/tests/functional/sol_terraform_v2/test_terraform_basic/contents/Definitions/sample_tf_types.yaml +++ b/samples/tests/functional/sol_terraform_v2/test_terraform_basic/contents/Definitions/sample_tf_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_terraform_v2/test_terraform_change_vnf_package/contents/Definitions/sample_tf_types.yaml b/samples/tests/functional/sol_terraform_v2/test_terraform_change_vnf_package/contents/Definitions/sample_tf_types.yaml index a83ac2438..7d53a04a4 100644 --- a/samples/tests/functional/sol_terraform_v2/test_terraform_change_vnf_package/contents/Definitions/sample_tf_types.yaml +++ b/samples/tests/functional/sol_terraform_v2/test_terraform_change_vnf_package/contents/Definitions/sample_tf_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/basic_lcms_max/contents/Definitions/v2_sample1_types.yaml b/samples/tests/functional/sol_v2_common/basic_lcms_max/contents/Definitions/v2_sample1_types.yaml index 8fff47c24..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/basic_lcms_max/contents/Definitions/v2_sample1_types.yaml +++ b/samples/tests/functional/sol_v2_common/basic_lcms_max/contents/Definitions/v2_sample1_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/basic_lcms_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml b/samples/tests/functional/sol_v2_common/basic_lcms_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml index 0aac5c339..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/basic_lcms_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml +++ b/samples/tests/functional/sol_v2_common/basic_lcms_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/basic_lcms_min/contents/Definitions/v2_sample2_types.yaml b/samples/tests/functional/sol_v2_common/basic_lcms_min/contents/Definitions/v2_sample2_types.yaml index 8fff47c24..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/basic_lcms_min/contents/Definitions/v2_sample2_types.yaml +++ b/samples/tests/functional/sol_v2_common/basic_lcms_min/contents/Definitions/v2_sample2_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/basic_lcms_min_individual_vnfc/contents/Definitions/v2_sample4_types.yaml b/samples/tests/functional/sol_v2_common/basic_lcms_min_individual_vnfc/contents/Definitions/v2_sample4_types.yaml index 8fff47c24..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/basic_lcms_min_individual_vnfc/contents/Definitions/v2_sample4_types.yaml +++ b/samples/tests/functional/sol_v2_common/basic_lcms_min_individual_vnfc/contents/Definitions/v2_sample4_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/change_vnfpkg_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml b/samples/tests/functional/sol_v2_common/change_vnfpkg_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml index 8fff47c24..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/change_vnfpkg_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml +++ b/samples/tests/functional/sol_v2_common/change_vnfpkg_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/change_vnfpkg_or_update_min_individual_vnfc/contents/Definitions/v2_sample4_types.yaml b/samples/tests/functional/sol_v2_common/change_vnfpkg_or_update_min_individual_vnfc/contents/Definitions/v2_sample4_types.yaml index 8fff47c24..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/change_vnfpkg_or_update_min_individual_vnfc/contents/Definitions/v2_sample4_types.yaml +++ b/samples/tests/functional/sol_v2_common/change_vnfpkg_or_update_min_individual_vnfc/contents/Definitions/v2_sample4_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/tests/functional/sol_v2_common/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml index 0d51d36be..2be59b181 100644 --- a/samples/tests/functional/sol_v2_common/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/tests/functional/sol_v2_common/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/tests/functional/sol_v2_common/error_network/contents/Definitions/v2_sample2_types.yaml b/samples/tests/functional/sol_v2_common/error_network/contents/Definitions/v2_sample2_types.yaml index 8fff47c24..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/error_network/contents/Definitions/v2_sample2_types.yaml +++ b/samples/tests/functional/sol_v2_common/error_network/contents/Definitions/v2_sample2_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/scale_ng/contents/Definitions/v2_sample1_types.yaml b/samples/tests/functional/sol_v2_common/scale_ng/contents/Definitions/v2_sample1_types.yaml index 8fff47c24..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/scale_ng/contents/Definitions/v2_sample1_types.yaml +++ b/samples/tests/functional/sol_v2_common/scale_ng/contents/Definitions/v2_sample1_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/server_notification/contents/Definitions/v2_sample2_types.yaml b/samples/tests/functional/sol_v2_common/server_notification/contents/Definitions/v2_sample2_types.yaml index 3bf199dde..7f52636f5 100644 --- a/samples/tests/functional/sol_v2_common/server_notification/contents/Definitions/v2_sample2_types.yaml +++ b/samples/tests/functional/sol_v2_common/server_notification/contents/Definitions/v2_sample2_types.yaml @@ -72,12 +72,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: sample.test.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_new_image/contents/Definitions/change_vnf_pkg_types.yaml b/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_new_image/contents/Definitions/change_vnf_pkg_types.yaml index d33c10c35..d38c170e7 100644 --- a/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_new_image/contents/Definitions/change_vnf_pkg_types.yaml +++ b/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_new_image/contents/Definitions/change_vnf_pkg_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_new_volume/contents/Definitions/change_vnf_pkg_types.yaml b/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_new_volume/contents/Definitions/change_vnf_pkg_types.yaml index d33c10c35..d38c170e7 100644 --- a/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_new_volume/contents/Definitions/change_vnf_pkg_types.yaml +++ b/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_new_volume/contents/Definitions/change_vnf_pkg_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_update_failed/contents/Definitions/change_vnf_pkg_types.yaml b/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_update_failed/contents/Definitions/change_vnf_pkg_types.yaml index f37634d74..49047246d 100644 --- a/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_update_failed/contents/Definitions/change_vnf_pkg_types.yaml +++ b/samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_update_failed/contents/Definitions/change_vnf_pkg_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/test_instantiate_vnf_with_old_image_or_volume/contents/Definitions/change_vnf_pkg_types.yaml b/samples/tests/functional/sol_v2_common/test_instantiate_vnf_with_old_image_or_volume/contents/Definitions/change_vnf_pkg_types.yaml index 2934b6c7d..544bdd371 100644 --- a/samples/tests/functional/sol_v2_common/test_instantiate_vnf_with_old_image_or_volume/contents/Definitions/change_vnf_pkg_types.yaml +++ b/samples/tests/functional/sol_v2_common/test_instantiate_vnf_with_old_image_or_volume/contents/Definitions/change_vnf_pkg_types.yaml @@ -44,10 +44,14 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/update_vnf/contents/Definitions/v2_sample2_types.yaml b/samples/tests/functional/sol_v2_common/update_vnf/contents/Definitions/v2_sample2_types.yaml index 8fff47c24..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/update_vnf/contents/Definitions/v2_sample2_types.yaml +++ b/samples/tests/functional/sol_v2_common/update_vnf/contents/Definitions/v2_sample2_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/update_vnf_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml b/samples/tests/functional/sol_v2_common/update_vnf_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml index 8fff47c24..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/update_vnf_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml +++ b/samples/tests/functional/sol_v2_common/update_vnf_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/userdata_standard/contents/Definitions/v2_sample3_types.yaml b/samples/tests/functional/sol_v2_common/userdata_standard/contents/Definitions/v2_sample3_types.yaml index 8fff47c24..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/userdata_standard/contents/Definitions/v2_sample3_types.yaml +++ b/samples/tests/functional/sol_v2_common/userdata_standard/contents/Definitions/v2_sample3_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: - type: tosca.interfaces.nfv.Vnflcm \ No newline at end of file + type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/userdata_standard_az_retry/contents/Definitions/v2_sample6_types.yaml b/samples/tests/functional/sol_v2_common/userdata_standard_az_retry/contents/Definitions/v2_sample6_types.yaml index 0aac5c339..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/userdata_standard_az_retry/contents/Definitions/v2_sample6_types.yaml +++ b/samples/tests/functional/sol_v2_common/userdata_standard_az_retry/contents/Definitions/v2_sample6_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg/contents/Definitions/v2_sample4_types.yaml b/samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg/contents/Definitions/v2_sample4_types.yaml index 0aac5c339..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg/contents/Definitions/v2_sample4_types.yaml +++ b/samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg/contents/Definitions/v2_sample4_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg_nw/contents/Definitions/v2_sample5_types.yaml b/samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg_nw/contents/Definitions/v2_sample5_types.yaml index 0aac5c339..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg_nw/contents/Definitions/v2_sample5_types.yaml +++ b/samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg_nw/contents/Definitions/v2_sample5_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/tests/functional/sol_v2_common/userdata_standard_with_non_boot_volume/contents/Definitions/v2_sample7_types.yaml b/samples/tests/functional/sol_v2_common/userdata_standard_with_non_boot_volume/contents/Definitions/v2_sample7_types.yaml index 0aac5c339..d374c1516 100644 --- a/samples/tests/functional/sol_v2_common/userdata_standard_with_non_boot_volume/contents/Definitions/v2_sample7_types.yaml +++ b/samples/tests/functional/sol_v2_common/userdata_standard_with_non_boot_volume/contents/Definitions/v2_sample7_types.yaml @@ -44,12 +44,17 @@ node_types: type: string default: "flavour" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external1: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_external2: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/samples/vnf_packages/Definitions/etsi_nfv_sol001_vnfd_types.yaml b/samples/vnf_packages/Definitions/etsi_nfv_sol001_vnfd_types.yaml index b57d79a85..c928254a1 100644 --- a/samples/vnf_packages/Definitions/etsi_nfv_sol001_vnfd_types.yaml +++ b/samples/vnf_packages/Definitions/etsi_nfv_sol001_vnfd_types.yaml @@ -1207,13 +1207,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/samples/vnf_packages/Definitions/helloworld3_types.yaml b/samples/vnf_packages/Definitions/helloworld3_types.yaml index cefb56d0a..061a53a5c 100644 --- a/samples/vnf_packages/Definitions/helloworld3_types.yaml +++ b/samples/vnf_packages/Definitions/helloworld3_types.yaml @@ -56,10 +56,14 @@ node_types: type: string default: "This is the default flavour description" requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, 1] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py b/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py index 04446d269..7be6e9cb0 100644 --- a/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py +++ b/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py @@ -40,7 +40,7 @@ class VnfPackageTest(base.BaseTackerTest): # The size of CSAR zip file used while verifying downloaded package. # NOTE: It should be updated if some contents of packages under # `samples/tests/etc/samples` dir. - SIZE_CSAR_ZIP = 16389082 + SIZE_CSAR_ZIP = 16389461 def setUp(self): super(VnfPackageTest, self).setUp() diff --git a/tacker/tests/functional/tools/test-setup-mgmt.sh b/tacker/tests/functional/tools/test-setup-mgmt.sh index cd6b77686..34ea2e640 100755 --- a/tacker/tests/functional/tools/test-setup-mgmt.sh +++ b/tacker/tests/functional/tools/test-setup-mgmt.sh @@ -20,7 +20,12 @@ vnflcm_noop,mgmt-container-update" /etc/tacker/tacker.conf # Reload the tacker configuration file. cd /opt/stack/tacker/ -sudo python3 setup.py build +#TODO(Shivam): Earlier command 'sudo python3 setup.py build' used to reload Tacker +#is not able to make 'mgmt-container-update' available in registered mgmt driver +#list, causing tacker-conductor to miss the mgmt driver and fail with KeyError. +#Once the root cause with the previous command is resolved, this pip command +#can be reverted back to the original one. +sudo /opt/stack/data/venv/bin/pip install --editable . sudo chown -R stack:stack /opt/stack/tacker/ # Restart the tacker service for the diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/etsi_nfv_sol001_vnfd_types.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/etsi_nfv_sol001_vnfd_types.yaml index 49e2fc8f0..5e653afe6 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/etsi_nfv_sol001_vnfd_types.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/etsi_nfv_sol001_vnfd_types.yaml @@ -1096,13 +1096,17 @@ node_types: constraints: - valid_values: [ normal, virtio, direct-physical ] requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute + occurrences: [0, 1] tosca.nodes.nfv.VnfVirtualLink: derived_from: tosca.nodes.Root diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_translator_error.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_translator_error.yaml index 6bd6719dd..1ca1a7f20 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_translator_error.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_translator_error.yaml @@ -46,3 +46,14 @@ topology_template: type: tosca.nodes.nfv.VnfExtCp properties: layer_protocols: [ ipv4 ] + requirements: + #Tosca-parser 2.13.0 adds validation for relationship occurrences. Since SOL001 v2.6.1 does not have these occurrences + #set, validation fails. Aligning with SOL001 v5.1.1 by adding occurrences to pass the validation. + - external_virtual_link: + capability: tosca.capabilities.nfv.VirtualLinkable + relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] + - internal_virtual_link: + capability: tosca.capabilities.nfv.VirtualLinkable + relationship: tosca.relationships.nfv.VirtualLinksTo + occurrences: [0, 1] diff --git a/zuul.d/jobs/base.yaml b/zuul.d/jobs/base.yaml index d67fcc981..ebb6f78a9 100644 --- a/zuul.d/jobs/base.yaml +++ b/zuul.d/jobs/base.yaml @@ -40,7 +40,7 @@ DEVSTACK_PARALLEL: True OVN_L3_CREATE_PUBLIC_NETWORK: true OVN_DBS_LOG_LEVEL: dbg - Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger + Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn test_matrix_configs: [neutron] zuul_work_dir: src/opendev.org/openstack/tacker host-vars: @@ -151,7 +151,7 @@ ovn-router" L2_AGENT_EXTENSIONS: qos ENABLE_CHASSIS_AS_GW: false - Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger + Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn devstack_services: # To override the parent job's definitions. tls-proxy: false @@ -286,9 +286,8 @@ TACKER_MODE: standalone USE_PYTHON3: true ENABLE_CHASSIS_AS_GW: false - Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger - # TODO(ueha): Remove this workarround if the Zuul jobs succeed with GLOBAL_VENV=true - GLOBAL_VENV: false + Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn + GLOBAL_VENV: true K8S_TOKEN: "9agf12.zsu5uh2m4pzt3qba" devstack_services: dstat: false @@ -324,9 +323,8 @@ DEVSTACK_PARALLEL: True OVN_L3_CREATE_PUBLIC_NETWORK: true OVN_DBS_LOG_LEVEL: dbg - Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger - # TODO(ueha): Remove this workarround if the Zuul jobs succeed with GLOBAL_VENV=true - GLOBAL_VENV: false + Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn + GLOBAL_VENV: true devstack_local_conf: post-config: $NEUTRON_DHCP_CONF: