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

23 files changed, 717 insertions, 4 deletions

diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCompute/vduCompute.json b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCompute/vduCompute.json
new file mode 100644
index 0000000000..eec2edb73e
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCompute/vduCompute.json
@@ -0,0 +1,17 @@
+{
+	"payloadName": "vduCompute.yml",
+	"contactId": "jh0003",
+	"name": "VDU Compute",
+	"description": "VDU Compute",
+	"resourceIconPath": "compute",
+	"resourceType": "VFC",
+	"categories": [{
+		"name": "Generic",
+		"subcategories": [{
+			"name": "Infrastructure"
+		}]
+	}],
+        "vendorName": "ETSI",
+	"vendorRelease": "2.7.1",
+	"tags": ["VDU Compute"]
+}
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 ]
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCp/vduCp.json b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCp/vduCp.json
new file mode 100644
index 0000000000..0cddba8ec3
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCp/vduCp.json
@@ -0,0 +1,17 @@
+{
+	"payloadName": "vduCp.yml",
+	"contactId": "jh0003",
+	"name": "VDU Cp",
+	"description": "VDU Cp",
+	"resourceIconPath": "port",
+	"resourceType": "CP",
+	"categories": [{
+		"name": "Generic",
+		"subcategories": [{
+			"name": "Network Elements"
+		}]
+	}],
+        "vendorName": "ETSI",
+        "vendorRelease": "2.7.1", 
+	"tags": ["VDU Cp"]
+}
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]
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduVirtualFileStorage/vduVirtualFileStorage.json b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduVirtualFileStorage/vduVirtualFileStorage.json
new file mode 100644
index 0000000000..f0112eddd7
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduVirtualFileStorage/vduVirtualFileStorage.json
@@ -0,0 +1,17 @@
+{
+	"payloadName": "vduVirtualFileStorage.yml",
+	"contactId": "jh0003",
+	"name": "VDU VirtualFileStorage",
+	"description": "VDU VirtualFileStorage",
+	"resourceIconPath": "objectStorage",
+	"resourceType": "VFC",
+	"categories": [{
+		"name": "Generic",
+		"subcategories": [{
+			"name": "Infrastructure"
+		}]
+	}],
+        "vendorName": "ETSI",
+	"vendorRelease": "2.7.1",
+	"tags": ["VDU VirtualFileStorage"]
+}
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduVirtualFileStorage/vduVirtualFileStorage.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduVirtualFileStorage/vduVirtualFileStorage.yml
new file mode 100644
index 0000000000..ee8a6b527a
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduVirtualFileStorage/vduVirtualFileStorage.yml
@@ -0,0 +1,20 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+  tosca.nodes.nfv.Vdu.VirtualFileStorage:
+    derived_from: tosca.nodes.Root
+    description: This node type describes the specifications of requirements related to virtual file storage resources
+    properties:
+      virtual_file_storage_data:
+        type: tosca.datatypes.nfv.VirtualFileStorageData
+        description: Describes the file  storage characteristics.
+        required: true
+    capabilities:
+      virtual_storage:
+        type: tosca.capabilities.nfv.VirtualStorage
+        description: Defines the capabilities of virtual_storage.
+    requirements:
+     - virtual_link:
+         capability: tosca.capabilities.nfv.VirtualLinkable
+         relationship: tosca.relationships.nfv.VirtualLinksTo
+         occurrences: [1, 1]
+         #description: Describes the requirements for linking to virtual link
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vipCp/vipCp.json b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vipCp/vipCp.json
new file mode 100644
index 0000000000..f9a70225d2
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vipCp/vipCp.json
@@ -0,0 +1,17 @@
+{
+	"payloadName": "vipCp.yml",
+	"contactId": "jh0003",
+	"name": "VIP Cp",
+	"description": "VIP Cp",
+	"resourceIconPath": "port",
+	"resourceType": "CP",
+	"categories": [{
+		"name": "Generic",
+		"subcategories": [{
+			"name": "Network Elements"
+		}]
+	}],
+        "vendorName": "ETSI",
+        "vendorRelease": "2.7.1",
+	"tags": ["VIP Cp"]
+}
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vipCp/vipCp.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vipCp/vipCp.yml
new file mode 100644
index 0000000000..b1c80705fe
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vipCp/vipCp.yml
@@ -0,0 +1,21 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+    tosca.nodes.nfv.VipCp:
+      derived_from: tosca.nodes.nfv.Cp
+      description: Describes a connection point to allocate one or a set of virtual IP addresses
+      properties:
+        vip_function:
+          type: string
+          description: "Indicates the function the virtual IP address is used for: high availability or load balancing. When used for high availability, only one of the internal VDU CP instances or VNF external CP instances that share the virtual IP is bound to the VIP address at a time. When used for load balancing purposes all CP instances that share the virtual IP are bound to it." 
+          required: true
+          constraints:
+            - valid_values: [ high_availability, load_balance ]
+      requirements:
+        - target:
+            capability: tosca.capabilities.Node
+            relationship: tosca.relationships.DependsOn
+            occurrences: [ 1, UNBOUNDED ]
+        - virtual_link:
+            capability: tosca.capabilities.nfv.VirtualLinkable
+            relationship: tosca.relationships.nfv.VipVirtualLinksTo
+            occurrences: [1, 1]
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vnfExtCp/vnfExtCp.json b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vnfExtCp/vnfExtCp.json
new file mode 100644
index 0000000000..7a6d15a2cb
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vnfExtCp/vnfExtCp.json
@@ -0,0 +1,17 @@
+{
+	"payloadName": "vnfExtCp.yml",
+	"contactId": "jh0003",
+	"name": "VNF External CP",
+	"description": "VNF External CP",
+	"resourceIconPath": "network",
+	"resourceType": "CP",
+	"categories": [{
+		"name": "Generic",
+		"subcategories": [{
+			"name": "Infrastructure"
+		}]
+	}],
+        "vendorName": "ETSI",
+	"vendorRelease": "2.7.1",
+	"tags": ["VNF External CP"]
+}
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vnfExtCp/vnfExtCp.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vnfExtCp/vnfExtCp.yml
new file mode 100644
index 0000000000..8b77aceb70
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vnfExtCp/vnfExtCp.yml
@@ -0,0 +1,21 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+  tosca.nodes.nfv.VnfExtCp:
+    derived_from: tosca.nodes.nfv.Cp
+    description: Describes a logical external connection point, exposed by the VNF enabling connection with an external Virtual Link
+    properties:
+      virtual_network_interface_requirements:
+        type: list
+        description: The actual virtual NIC requirements that is been assigned when instantiating the connection point
+        required: false
+        entry_schema:
+          type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements
+    requirements:
+      - external_virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - internal_virtual_link: #name in ETSI NFV IFA011 v0.7.3: intVirtualLinkDesc
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [1, 1]
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/VNF/VNF.json b/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/VNF/VNF.json
new file mode 100644
index 0000000000..5460dffbdb
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/VNF/VNF.json
@@ -0,0 +1,17 @@
+{
+	"payloadName": "VNF.yml",
+	"contactId": "jh0003",
+	"name": "VNF",
+	"description": "VNF",
+	"resourceIconPath": "compute",
+	"resourceType": "VFC",
+	"categories": [{
+		"name": "Generic",
+		"subcategories": [{
+			"name": "Infrastructure"
+		}]
+	}],
+        "vendorName": "ETSI",
+	"vendorRelease": "3.3.1",
+	"tags": ["VNF"]
+}
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/VNF/VNF.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/VNF/VNF.yml
new file mode 100644
index 0000000000..829ce185b6
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/VNF/VNF.yml
@@ -0,0 +1,101 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+  tosca.nodes.nfv.VNF:
+    derived_from: tosca.nodes.Root
+    description: The generic abstract type from which all VNF specific abstract node types shall be derived to form, together with other node types, the TOSCA service template(s) representing the VNFD
+    properties:
+      descriptor_id: # instead of vnfd_id
+        type: string # GUID
+        description: Globally unique identifier of the VNFD
+        required: true
+      descriptor_version: # instead of vnfd_version
+        type: string
+        description: Identifies the version of the VNFD
+        required: true
+      provider: # instead of vnf_provider
+        type: string
+        description: Provider of the VNF and of the VNFD
+        required: true
+      product_name: # instead of vnf_product_name
+        type: string
+        description: Human readable name for the VNF Product
+        required: true
+      software_version: # instead of vnf_software_version
+        type: string
+        description: Software version of the VNF
+        required: true
+      product_info_name: # instead of vnf_product_info_name
+        type: string
+        description: Human readable name for the VNF Product
+        required: false
+      product_info_description: # instead of vnf_product_info_description
+        type: string
+        description: Human readable description of the VNF Product
+        required: false
+      vnfm_info:
+        type: list
+        required: true
+        description: Identifies VNFM(s) compatible with the VNF
+        entry_schema:
+          type: string
+      localization_languages:
+        type: list
+        description: Information about localization languages of the VNF
+        required: false
+        entry_schema:
+          type: string #IETF RFC 5646 string
+      default_localization_language:
+        type: string #IETF RFC 5646 string
+        description: Default localization language that is instantiated if no information about selected localization language is available
+        required: false
+      #configurable_properties:
+        #type: tosca.datatypes.nfv.VnfConfigurableProperties
+        #description: Describes the configurable properties of the VNF
+        #required: false
+        # derived types are expected to introduce configurable_properties
+        # with its type derived from
+        # tosca.datatypes.nfv.VnfConfigurableProperties
+      #modifiable_attributes:
+        #type: tosca.datatypes.nfv.VnfInfoModifiableAttributes
+        #description: Describes the modifiable attributes of the VNF
+        #required: false
+        # derived types are expected to introduce modifiable_attributes
+        # with its type derived from
+        # tosca.datatypes.nfv.VnfInfoModifiableAttributes
+      lcm_operations_configuration:
+        type: tosca.datatypes.nfv.VnfLcmOperationsConfiguration
+        description: Describes the configuration parameters for the VNF LCM operations
+        required: false
+      monitoring_parameters:
+        type: list
+        entry_schema:
+          type: tosca.datatypes.nfv.VnfMonitoringParameter
+        description: Describes monitoring parameters applicable to the VNF.
+        required: false
+      flavour_id:
+        type: string
+        description: Identifier of the Deployment Flavour within the VNFD
+        required: true
+      flavour_description:
+        type: string
+        description: Human readable description of the DF
+        required: true
+      vnf_profile:
+        type: tosca.datatypes.nfv.VnfProfile
+        description: Describes a profile for instantiating VNFs of a particular NS DF according to a specific VNFD and VNF DF
+        required: false
+    attributes:
+      scale_status:
+        type: map # key: aspectId
+        description: Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how "big" the VNF has been scaled w.r.t. that aspect.
+        entry_schema:
+          type: tosca.datatypes.nfv.ScaleInfo
+    requirements:
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [ 0, 1 ]
+  # Additional requirements shall be defined in the VNF specific node type (deriving from tosca.nodes.nfv.VNF) corresponding to NS virtual links that need to connect to VnfExtCps
+    interfaces:
+      Vnflcm:
+        type: tosca.interfaces.nfv.Vnflcm
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/vduVirtualBlockStorage/vduVirtualBlockStorage.json b/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/vduVirtualBlockStorage/vduVirtualBlockStorage.json
new file mode 100644
index 0000000000..63b1162e62
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/vduVirtualBlockStorage/vduVirtualBlockStorage.json
@@ -0,0 +1,17 @@
+{
+	"payloadName": "vduVirtualBlockStorage.yml",
+	"contactId": "jh0003",
+	"name": "VDU VirtualBlockStorage",
+	"description": "VDU VirtualBlockStorage",
+	"resourceIconPath": "objectStorage",
+	"resourceType": "VFC",
+	"categories": [{
+		"name": "Generic",
+		"subcategories": [{
+			"name": "Infrastructure"
+		}]
+	}],
+        "vendorName": "ETSI",
+	"vendorRelease": "3.3.1",
+	"tags": ["VDU VirtualBlockStorage"]
+}
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/vduVirtualBlockStorage/vduVirtualBlockStorage.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/vduVirtualBlockStorage/vduVirtualBlockStorage.yml
new file mode 100644
index 0000000000..562cbad15a
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/vduVirtualBlockStorage/vduVirtualBlockStorage.yml
@@ -0,0 +1,19 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+  tosca.nodes.nfv.Vdu.VirtualBlockStorage:
+    derived_from: tosca.nodes.Root
+    description: This node type describes the specifications of requirements related to virtual block storage resources
+    properties:
+      virtual_block_storage_data:
+        type: tosca.datatypes.nfv.VirtualBlockStorageData
+        description: Describes the block storage characteristics.
+        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
+        status: deprecated
+    capabilities:
+      virtual_storage:
+        type: tosca.capabilities.nfv.VirtualStorage
+        description: Defines the capabilities of virtual_storage.
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/VNF/VNF.json b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/VNF/VNF.json
new file mode 100644
index 0000000000..6cc6f687ac
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/VNF/VNF.json
@@ -0,0 +1,17 @@
+{
+	"payloadName": "VNF.yml",
+	"contactId": "jh0003",
+	"name": "VNF",
+	"description": "VNF",
+	"resourceIconPath": "compute",
+	"resourceType": "VFC",
+	"categories": [{
+		"name": "Generic",
+		"subcategories": [{
+			"name": "Infrastructure"
+		}]
+	}],
+        "vendorName": "ETSI",
+	"vendorRelease": "4.1.1",
+	"tags": ["VNF"]
+}
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/VNF/VNF.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/VNF/VNF.yml
new file mode 100644
index 0000000000..c9f922befa
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/VNF/VNF.yml
@@ -0,0 +1,106 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+  tosca.nodes.nfv.VNF:
+    derived_from: tosca.nodes.Root
+    description: The generic abstract type from which all VNF specific abstract node types shall be derived to form, together with other node types, the TOSCA service template(s) representing the VNFD
+    properties:
+      descriptor_id: # instead of vnfd_id
+        type: string # GUID
+        description: Globally unique identifier of the VNFD
+        required: true
+      descriptor_version: # instead of vnfd_version
+        type: string
+        description: Identifies the version of the VNFD
+        required: true
+      provider: # instead of vnf_provider
+        type: string
+        description: Provider of the VNF and of the VNFD
+        required: true
+      product_name: # instead of vnf_product_name
+        type: string
+        description: Human readable name for the VNF Product
+        required: true
+      software_version: # instead of vnf_software_version
+        type: string
+        description: Software version of the VNF
+        required: true
+      product_info_name: # instead of vnf_product_info_name
+        type: string
+        description: Human readable name for the VNF Product
+        required: false
+      product_info_description: # instead of vnf_product_info_description
+        type: string
+        description: Human readable description of the VNF Product
+        required: false
+      vnfm_info:
+        type: list
+        required: true
+        description: Identifies VNFM(s) compatible with the VNF
+        entry_schema:
+          type: string
+      localization_languages:
+        type: list
+        description: Information about localization languages of the VNF
+        required: false
+        entry_schema:
+          type: string #IETF RFC 5646 string
+      default_localization_language:
+        type: string #IETF RFC 5646 string
+        description: Default localization language that is instantiated if no information about selected localization language is available
+        required: false
+      #configurable_properties:
+        #type: tosca.datatypes.nfv.VnfConfigurableProperties
+        #description: Describes the configurable properties of the VNF
+        #required: false
+        # derived types are expected to introduce configurable_properties
+        # with its type derived from
+        # tosca.datatypes.nfv.VnfConfigurableProperties
+      #modifiable_attributes:
+        #type: tosca.datatypes.nfv.VnfInfoModifiableAttributes
+        #description: Describes the modifiable attributes of the VNF
+        #required: false
+        # derived types are expected to introduce modifiable_attributes
+        # with its type derived from
+        # tosca.datatypes.nfv.VnfInfoModifiableAttributes
+      lcm_operations_configuration:
+        type: tosca.datatypes.nfv.VnfLcmOperationsConfiguration
+        description: Describes the configuration parameters for the VNF LCM operations
+        required: false
+      monitoring_parameters:
+        type: list
+        entry_schema:
+          type: tosca.datatypes.nfv.VnfMonitoringParameter
+        description: Describes monitoring parameters applicable to the VNF.
+        required: false
+      flavour_id:
+        type: string
+        description: Identifier of the Deployment Flavour within the VNFD
+        required: true
+      flavour_description:
+        type: string
+        description: Human readable description of the DF
+        required: true
+      vnf_profile:
+        type: tosca.datatypes.nfv.VnfProfile
+        description: Describes a profile for instantiating VNFs of a particular NS DF according to a specific VNFD and VNF DF
+        required: false
+      mciop_profile:
+        type: list
+        entry_schema:
+          type: tosca.datatypes.nfv.MciopProfile
+        description: Describes additional instantiation data for the MCIOPs used in this deployment
+    attributes:
+      scale_status:
+        type: map # key: aspectId
+        description: Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how "big" the VNF has been scaled w.r.t. that aspect.
+        entry_schema:
+          type: tosca.datatypes.nfv.ScaleInfo
+    requirements:
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [ 0, 1 ]
+  # Additional requirements shall be defined in the VNF specific node type (deriving from tosca.nodes.nfv.VNF) corresponding to NS virtual links that need to connect to VnfExtCps
+    interfaces:
+      Vnflcm:
+        type: tosca.interfaces.nfv.Vnflcm
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainer/osContainer.json b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainer/osContainer.json
new file mode 100644
index 0000000000..1cc0dac5ac
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainer/osContainer.json
@@ -0,0 +1,17 @@
+{
+	"payloadName": "osContainer.yml",
+	"contactId": "jh0003",
+	"name": "osContainer",
+	"description": "osContainer",
+	"resourceIconPath": "compute",
+	"resourceType": "VFC",
+	"categories": [{
+		"name": "Generic",
+		"subcategories": [{
+			"name": "Infrastructure"
+		}]
+	}],
+        "vendorName": "ETSI",
+        "vendorRelease": "4.1.1",
+	"tags": ["osContainer"]
+}
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 ]
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainerGroup/osContainerGroup.json b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainerGroup/osContainerGroup.json
new file mode 100644
index 0000000000..980c03ab83
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainerGroup/osContainerGroup.json
@@ -0,0 +1,17 @@
+{
+	"payloadName": "osContainerGroup.yml",
+	"contactId": "jh0003",
+	"name": "osContainerGroup",
+	"description": "osContainerGroup",
+	"resourceIconPath": "compute",
+	"resourceType": "VFC",
+	"categories": [{
+		"name": "Generic",
+		"subcategories": [{
+			"name": "Infrastructure"
+		}]
+	}],
+        "vendorName": "ETSI",
+        "vendorRelease": "4.1.1",
+	"tags": ["osContainerGroup"]
+}
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 ]
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/virtualCp/virtualCp.json b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/virtualCp/virtualCp.json
new file mode 100644
index 0000000000..4fd97111d9
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/virtualCp/virtualCp.json
@@ -0,0 +1,17 @@
+{
+	"payloadName": "virtualCp.yml",
+	"contactId": "jh0003",
+	"name": "Virtual Cp",
+	"description": "Virtual Cp",
+	"resourceIconPath": "port",
+	"resourceType": "CP",
+	"categories": [{
+		"name": "Generic",
+		"subcategories": [{
+			"name": "Network Elements"
+		}]
+	}],
+        "vendorName": "ETSI",
+        "vendorRelease": "4.1.1",
+	"tags": ["Virtual Cp"]
+}
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/virtualCp/virtualCp.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/virtualCp/virtualCp.yml
new file mode 100644
index 0000000000..3027651b38
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/virtualCp/virtualCp.yml
@@ -0,0 +1,21 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+  tosca.nodes.nfv.VirtualCp:
+    derived_from: tosca.nodes.nfv.Cp
+    description: Describes a virtual connection point allowing the access to a number of VNFC instances (based on their respective VDUs).
+    properties:
+      additionalServiceData:
+        type: list
+        description: References the VDU(s) which implement this service
+        required: true
+        entry_schema:
+        type: tosca.datatypes.nfv.AdditionalServiceData
+    requirements:
+      - target:
+          capability: tosca.capabilities.Node
+          relationship: tosca.relationships.DependsOn
+          occurrences: [ 1, UNBOUNDED ]
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VipVirtualLinksTo
+          occurrences: [1, 1]
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml
index 83bba36fe0..131c282b74 100644
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml
@@ -13,8 +13,8 @@ node_types:
           description: Human readable description of the VDU
           required: true
         boot_order:
-          type: list # explicit index (boot index) not necessary, contrary to IFA011
-          description: References a node template name from which a valid boot device is created
+          type: list # explicit index (boot index) not necessary, contrary to IFA011 
+          description: References a node template name from which a valid boot device is created 
           required: false
           entry_schema:
             type: string
@@ -45,8 +45,8 @@ node_types:
           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: string
-          description: Contains a string or a URL to a file contained in the VNF package 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.
+          type: string 
+          description: Contains a string or a URL to a file contained in the VNF package 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