openstack/tacker
Code Issues Proposed changes

Fix Tacker CI Failures from Tosca-Parser, TackerClient, and Neutron/Setuptools

Browse Source 
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 <shivam.shukla3@india.nec.com>
This commit is contained in:
Shivam Shukla
2025-08-04 10:01:24 +00:00
parent 3e95112fe4
commit db7aaec746
90 changed files with 446 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/lib/tacker
View File

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

1
devstack/plugin.sh
View File

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

4
samples/free5gc/cnf/sample_free5gc_cnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

4
samples/free5gc/cnf_on_vm/no_affinity/sample_free5gc_cnf_on_vm_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

4
samples/free5gc/cnf_on_vm/no_affinity/sample_free5gc_cnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

4
samples/mgmt_driver/ansible/ansible_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

4
samples/mgmt_driver/kubernetes/private_registry_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

4
samples/practical_vnf_package/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/common_artifact/Definitions/helloworld3_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/csar_with_short_notation_for_artifacts/Definitions/helloworld3_types.yaml
View File

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

7
samples/tests/etc/samples/etsi/nfv/functional/Definitions/helloworld3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/etc/samples/etsi/nfv/functional2/Definitions/helloworld3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/etc/samples/etsi/nfv/functional3/Definitions/helloworld3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/etc/samples/etsi/nfv/functional4/Definitions/helloworld3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/etc/samples/etsi/nfv/functional5/Definitions/helloworld3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/etc/samples/etsi/nfv/functional6/Definitions/helloworld3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/etc/samples/etsi/nfv/functional7/Definitions/helloworld3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/etc/samples/etsi/nfv/mt_functional1/Definitions/helloworld3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

4
samples/tests/etc/samples/etsi/nfv/refactor_mgmt_driver1/Definitions/helloworld3_types.yaml
View File

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

9
samples/tests/etc/samples/etsi/nfv/sample_compliance_test/Definitions/helloworld3_types.yaml
View File

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

8
samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF.yaml
View File

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

8
samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_with_short_notation/Definitions/helloworld3_types.yaml
View File

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

8
samples/tests/etc/samples/etsi/nfv/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/sample_vnfpkg_tosca_vnfd/Definitions/helloworld3_types.yaml
View File

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

7
samples/tests/etc/samples/etsi/nfv/stack_update_in_heal/Definitions/helloworld3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/etc/samples/etsi/nfv/stack_update_in_scale/Definitions/helloworld3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

4
samples/tests/etc/samples/etsi/nfv/test_cnf/Definitions/helloworld3_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/Definitions/sample_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_before/Definitions/sample_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/test_cnf_ext_artifact/Definitions/helloworld3_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/test_cnf_heal/Definitions/helloworld3_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/test_cnf_helmchart/Definitions/sample_vnfd_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/test_cnf_multi_ns/Definitions/helloworld3_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/test_cnf_scale/Definitions/helloworld3_types.yaml
View File

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

8
samples/tests/etc/samples/etsi/nfv/test_csar_utils_data/sample_vnfpkg_no_meta_single_vnfd/vnfd_helloworld_single.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/test_csar_utils_data/test_csar_utils_common/Definitions/helloworld3_types.yaml
View File

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

3
samples/tests/etc/samples/etsi/nfv/test_enhanced_policy/Definitions/sample_vnfd_types.yaml
View File

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

3
samples/tests/etc/samples/etsi/nfv/test_heal_grant_unit/helloworld3_types.yaml
View File

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

2
samples/tests/etc/samples/etsi/nfv/test_heal_grant_unit/sample_vnfd.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/test_inst_terminate_vnf_with_vnflcmnoop/Definitions/helloworld3_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/user_data_common/Definitions/sample_lcm_with_user_data_types.yaml
View File

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

7
samples/tests/etc/samples/etsi/nfv/user_data_sample_normal_scaling/Definitions/helloworld3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

5
samples/tests/etc/samples/etsi/nfv/user_data_sample_virtual_storage_missing/Definitions/helloworld3_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/vnflcm1/Definitions/helloworld3_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/vnflcm2/Definitions/helloworld3_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/vnflcm3/Definitions/helloworld3VNF.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/vnflcm4/Definitions/helloworld3_types.yaml
View File

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

4
samples/tests/etc/samples/etsi/nfv/vnfpkgm2/Definitions/helloworld3_types.yaml
View File

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

8
samples/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.yaml
View File

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

4
samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

4
samples/tests/functional/sol_kubernetes_v2/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

4
samples/tests/functional/sol_kubernetes_v2/test_change_vnf_pkg_with_deployment/contents/Definitions/sample_cnf_types.yaml
View File

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

4
samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/Definitions/sample_types.yaml
View File

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

4
samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_before/contents/Definitions/sample_types.yaml
View File

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

4
samples/tests/functional/sol_kubernetes_v2/test_helm_change_vnf_pkg/contents/Definitions/sample_cnf_types.yaml
View File

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

4
samples/tests/functional/sol_kubernetes_v2/test_helm_instantiate/contents/Definitions/sample_cnf_types.yaml
View File

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

4
samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Definitions/sample_cnf_types.yaml
View File

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

4
samples/tests/functional/sol_terraform_v2/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

4
samples/tests/functional/sol_terraform_v2/test_terraform_basic/contents/Definitions/sample_tf_types.yaml
View File

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

4
samples/tests/functional/sol_terraform_v2/test_terraform_change_vnf_package/contents/Definitions/sample_tf_types.yaml
View File

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

7
samples/tests/functional/sol_v2_common/basic_lcms_max/contents/Definitions/v2_sample1_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

5
samples/tests/functional/sol_v2_common/basic_lcms_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml
View File

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

7
samples/tests/functional/sol_v2_common/basic_lcms_min/contents/Definitions/v2_sample2_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/functional/sol_v2_common/basic_lcms_min_individual_vnfc/contents/Definitions/v2_sample4_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/functional/sol_v2_common/change_vnfpkg_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/functional/sol_v2_common/change_vnfpkg_or_update_min_individual_vnfc/contents/Definitions/v2_sample4_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

4
samples/tests/functional/sol_v2_common/common/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

7
samples/tests/functional/sol_v2_common/error_network/contents/Definitions/v2_sample2_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/functional/sol_v2_common/scale_ng/contents/Definitions/v2_sample1_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

5
samples/tests/functional/sol_v2_common/server_notification/contents/Definitions/v2_sample2_types.yaml
View File

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

6
samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_new_image/contents/Definitions/change_vnf_pkg_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

6
samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_new_volume/contents/Definitions/change_vnf_pkg_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

6
samples/tests/functional/sol_v2_common/test_change_vnf_pkg_with_update_failed/contents/Definitions/change_vnf_pkg_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

6
samples/tests/functional/sol_v2_common/test_instantiate_vnf_with_old_image_or_volume/contents/Definitions/change_vnf_pkg_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/functional/sol_v2_common/update_vnf/contents/Definitions/v2_sample2_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/functional/sol_v2_common/update_vnf_max_individual_vnfc/contents/Definitions/v2_sample3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

7
samples/tests/functional/sol_v2_common/userdata_standard/contents/Definitions/v2_sample3_types.yaml
View File

@@ -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
type: tosca.interfaces.nfv.Vnflcm

5
samples/tests/functional/sol_v2_common/userdata_standard_az_retry/contents/Definitions/v2_sample6_types.yaml
View File

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

5
samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg/contents/Definitions/v2_sample4_types.yaml
View File

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

5
samples/tests/functional/sol_v2_common/userdata_standard_change_vnfpkg_nw/contents/Definitions/v2_sample5_types.yaml
View File

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

5
samples/tests/functional/sol_v2_common/userdata_standard_with_non_boot_volume/contents/Definitions/v2_sample7_types.yaml
View File

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

4
samples/vnf_packages/Definitions/etsi_nfv_sol001_vnfd_types.yaml
View File

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

4
samples/vnf_packages/Definitions/helloworld3_types.yaml
View File

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

2
tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py
View File

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

7
tacker/tests/functional/tools/test-setup-mgmt.sh
View File

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

4
tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/etsi_nfv_sol001_vnfd_types.yaml
View File

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

11
tacker/tests/unit/vnfm/infra_drivers/openstack/data/etsi_nfv/tosca_generate_hot_from_tosca_translator_error.yaml
View File

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

14
zuul.d/jobs/base.yaml
View File

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