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

diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainerGroup/osContainerGroup.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainerGroup/osContainerGroup.yml
new file mode 100644
index 0000000000..cf0ffc76e1
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainerGroup/osContainerGroup.yml
@@ -0,0 +1,51 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+  tosca.nodes.nfv.Vdu.osContainerGroup:
+    derived_from: tosca.nodes.Root
+    description: Describes the aggregate of container(s) of a VDU which is a construct supporting the description of the deployment and operational behavior of a VNFC; Corresponds to a "Pod" in K8S; Can have multiple constitute containers. 
+    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
+      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; Per Container on IFA011 v4.1.1 but more relevant at the VDU (Pod) Level
+        required: false
+        entry_schema:
+          type: tosca.datatypes.nfv.VnfcMonitoringParameter
+      #configurable_properties:
+        #type: tosca.datatypes.nfv.VnfcConfigurableProperties
+        #description: derived types are expected to introduce configurable_properties with its type derived from tosca.datatypes.nfv.VnfcConfigurableProperties
+        #required: false;
+      vdu_profile:
+        type: tosca.datatypes.nfv.VduProfile
+        required: true
+        description: Defines additional instantiation data for the Vdu.OsContainerGroup node
+      boot_data:
+        type: tosca.datatypes.nfv.BootData
+        required: false
+        description: Contains the information used to customize a container compute resource at boot time. The bootData may contain variable parts that are replaced by deployment specific values before being sent Per Container on IFA011 v4.1.1 but more relevant at the VDU (Pod) Level
+    capabilities:
+      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 ]
+      - container_grouping:
+          capability: tosca.capabilities.nfv.ContainerGroupable
+          relationship: tosca.relationships.nfv.GroupsTo
+          occurrences:  [ 1, UNBOUNDED ]