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, 69 insertions, 0 deletions

diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCompute/vduCompute.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCompute/vduCompute.yml
new file mode 100644
index 0000000000..5322197a0e
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCompute/vduCompute.yml
@@ -0,0 +1,69 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+    tosca.nodes.nfv.Vdu.Compute:
+      derived_from: tosca.nodes.Root
+      description:  Describes the virtual compute part of a VDU which is a construct   supporting the description of the deployment and operational behavior of a VNFC
+      properties:
+        name:
+          type: string
+          description: Human readable name of the VDU
+          required: true
+        description:
+          type: string
+          description: Human readable description of the VDU
+          required: true
+        boot_order:
+          type: boolean
+          description: It indicates whether the order of the virtual_storage requirements is used as the boot index (the first requirement represents the lowest index and defines highest boot priority).
+          default: false
+          required: false
+        nfvi_constraints:
+          type: map
+          description: Describes constraints on the NFVI for the VNFC instance(s) created from this VDU. This property is reserved for future use in the present document.
+          required: false
+          entry_schema:
+            type: string
+        monitoring_parameters:
+          type: list
+          description: Describes monitoring parameters applicable to a VNFC instantiated from this VDU
+          required: false
+          entry_schema:
+            type: tosca.datatypes.nfv.VnfcMonitoringParameter
+        #configurable_properties:
+           #type: tosca.datatypes.nfv.VnfcConfigurableProperties
+           #required: false
+           # derived types are expected to introduce
+           # configurable_properties with its type derived from
+           # tosca.datatypes.nfv.VnfcConfigurableProperties
+        vdu_profile:
+          type: tosca.datatypes.nfv.VduProfile
+          description: Defines additional instantiation data for the VDU.Compute node
+          required: true
+        sw_image_data:
+          type: tosca.datatypes.nfv.SwImageData
+          description: Defines information related to a SwImage artifact used by this Vdu.Compute node
+          required: false # property is required when the node template has an associated artifact of type tosca.artifacts.nfv.SwImage and not required otherwise
+        boot_data:
+          type: tosca.datatypes.nfv.BootData 
+          description: Contains the information used to customize a virtualised compute resource at boot time. The bootData may contain variable parts that are replaced by deployment specific values before being sent to the VIM.
+          required: false
+        inject_files: #Introduced from Beijing release, used for vCPE usecase, outside the scope of SOL001 v2.5.1
+          type: tosca.datatypes.nfv.injectFile
+          required: false  #Aligned with ONAP R2 IM. it should be false.
+        meta_data: #Introduced from Beijing release, used for metadata attached to the VM or container, outside the scope of SOL001 v2.5.1
+          type: map
+          entry_schema:
+            type: string
+          required: false
+      capabilities:
+        virtual_compute:
+          type: tosca.capabilities.nfv.VirtualCompute
+          occurrences: [ 1, 1 ]
+        virtual_binding:
+          type: tosca.capabilities.nfv.VirtualBindable
+          occurrences: [ 1, UNBOUNDED ]
+      requirements:
+        - virtual_storage:
+            capability: tosca.capabilities.nfv.VirtualStorage
+            relationship: tosca.relationships.nfv.AttachesTo
+            occurrences: [ 0, UNBOUNDED ]