Update node and data types for SOL001 3.3.1 + CNF enhancements

Types in 2.7.1 folder are types valid for v3.3.1 that have not changed from v2.7.1
Types in 4.1.1 folder are the CNF enhancements which it is assumed will be in v4.1.1

Includes some changes in functionality to support:
1. Deployment of both existing (2.5.1) versions of types and new versions of types through sdc-BE-init
2. Selection of the correct node type definition version at onboarding of an ETSI SOL004 VNF/CNF csar,
based on the declared version supported in the csar (i.e. when a 3.3.1 csar is imported, the node type
definitions valid for 3.3.1 are used (rather than current logic which always selects the latest version)

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-3470
Change-Id: Iff835d230b173b9d44349caa6b0b11d783e8f8d3

1 files changed, 43 insertions, 0 deletions

diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCp/vduCp.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCp/vduCp.yml
new file mode 100644
index 0000000000..942d8e65a1
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCp/vduCp.yml
@@ -0,0 +1,43 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+    tosca.nodes.nfv.VduCp:
+      derived_from: tosca.nodes.nfv.Cp
+      description: describes network connectivity between a VNFC instance based on this VDU and an internal VL
+      properties:
+        bitrate_requirement:
+          type: integer   # in bits per second
+          description: Bitrate requirement in bit per second on this connection point
+          required: false
+          constraints:
+            - greater_or_equal: 0
+        virtual_network_interface_requirements:
+          type: list
+          description: Specifies requirements on a virtual network interface realising the CPs instantiated from this CPD
+          required: false
+          entry_schema:
+            type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements
+        order:
+          type: integer
+          description: The order of the NIC on the compute instance (e.g.eth2)
+          required: false
+          constraints:
+            - greater_or_equal: 0
+        vnic_type:
+          type: string
+          description: Describes the type of the virtual network interface realizing the CPs instantiated from this CPD
+          required: false
+          constraints:
+          - valid_values: [ normal, macvtap, direct, baremetal, virtio-forwarder, direct-physical, smart-nic, virtio ] 
+        vnic_name: # Introduced from Beijing release, aligned with ONAP resource IM, outside the scope of SOL001 v2.5.1
+          type: string
+          required: false
+      requirements:
+        - 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: [1, 1]