From 510f99e32b7c66b267f69e7f4830674bd9b14974 Mon Sep 17 00:00:00 2001
From: MichaelMorris <michael.morris@est.tech>
Date: Mon, 15 Mar 2021 14:27:57 +0000
Subject: Adding ETSI SOL001 v4.4.1 vduCp

Previous version does not have 'container_binding' needed for CNF onboarding

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-3509
Change-Id: I0894b3ec818f1448997a99c2754153998bf77151
---
 .../import/tosca/nfv-types/4.1.1/vduCp/vduCp.json  | 17 ++++++++
 .../import/tosca/nfv-types/4.1.1/vduCp/vduCp.yml   | 45 ++++++++++++++++++++++
 .../tosca/relationship-types/relationshipTypes.yml |  4 ++
 3 files changed, 66 insertions(+)
 create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/vduCp/vduCp.json
 create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/vduCp/vduCp.yml

diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/vduCp/vduCp.json b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/vduCp/vduCp.json
new file mode 100644
index 0000000000..8a618d3ffc
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.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": "4.1.1",
+	"tags": ["VDU Cp"]
+}
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/vduCp/vduCp.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/vduCp/vduCp.yml
new file mode 100644
index 0000000000..5d1db0211d
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/vduCp/vduCp.yml
@@ -0,0 +1,45 @@
+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, bridge, ipvlan, loopback, macvlan, ptp, vlan, host-device ] 
+      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: [0, 1]
+        - container_binding:
+            capability: tosca.capabilities.nfv.VirtualBindable
+            relationship: tosca.relationships.nfv.ContainerBindsTo
+            node: tosca.nodes.nfv.Vdu.OsContainerGroup
+            occurrences: [0, 1]
diff --git a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
index 6f7676583c..8ebc65c7bb 100644
--- a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
@@ -142,3 +142,7 @@ tosca.relationships.nfv.ForwardTo:
   derived_from: tosca.relationships.Root
   valid_target_types: [ tosca.capabilities.nfv.Forwarding ]
 
+tosca.relationships.nfv.ContainerBindsTo:
+  derived_from: tosca.relationships.DependsOn
+  description: Represents an association relationship between Vdu.OsContainerGroup and VduCp node types 
+  valid_target_types: [ tosca.capabilities.nfv.VirtualBindable ]
-- 
cgit 1.2.3-korg