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

diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainer/osContainer.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainer/osContainer.yml
new file mode 100644
index 0000000000..a8f9200d25
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainer/osContainer.yml
@@ -0,0 +1,54 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+  tosca.nodes.nfv.Vdu.osContainer:
+    derived_from: tosca.nodes.Root
+    description: Describes the resources of a single container within a VDU 
+    properties:
+      name: 
+        type: string
+        description: Human readable name of the Container
+        required: true
+      description:
+        type: string
+        description: Human readable description of the Container
+        required: true
+      logical_node:
+        type: map
+        description: Describes the logical node requirements
+        required: false
+        entry_schema:
+          type: tosca.datatypes.nfv.LogicalNodeData
+      requested_additional_capabilities:
+        type: map
+        description: Describes additional capabilities to host this container
+        required: false
+        entry_schema:
+          type: tosca.datatypes.nfv.RequestedAdditionalCapability
+      requestedCpuResources:
+        type: integer
+        required: false
+        description: Number of milli-Cpus
+      cpuResourcesLimit:
+        type: integer
+        required: false
+        description: Limit (Max) Number of milli-Cpus
+      requestedMemoryResources:
+        type: scalar-unit.size
+        required: false
+        description: Amount of Memory requested
+      memoryResourcesLimit:
+        type: scalar-unit.size
+        required: false
+        description: Limit (Max) Memory
+      requestedEphemeralStorageResources:
+        type: scalar-unit.size
+        required: false
+        description: Amount of Ephemeral Storage Requested
+      ephemeralStorageResourcesLimit:
+        type: scalar-unit.size
+        required: false
+        description: Limit on Ephemeral Storage
+    capabilities:
+      containerGroupable:
+        type: tosca.capabilities.nfv.ContainerGroupable
+        occurrences: [ 1, UNBOUNDED ]