forwarder GT

add forwarder global types, without changing network port

Issue-Id : SDC-653

Change-Id: I05bf44436f685bb802e44824d400eb6256fa23a2
Signed-off-by: talio <tali.orenbach@amdocs.com>

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
index 285d6b2..9f09778 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
@@ -128,6 +128,9 @@ capability_types:
   tosca.capabilities.nfv.Forwarder:
     derived_from: tosca.capabilities.Root
 
+  org.openecomp.capabilities.Forwarder:
+      derived_from: tosca.capabilities.Root
+
   tosca.capabilities.nfv.ext.Compute.Container.Architecture:
     derived_from: tosca.capabilities.Root
     properties:

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
index 810bf30..8142c26 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
@@ -1342,4 +1342,21 @@ node_types:
         required: false
         type: list
       connectivity_type:
-        type: tosca.datatypes.nfv.ConnectivityType
\ No newline at end of file
+        type: tosca.datatypes.nfv.ConnectivityType
+
+  org.openecomp.nodes.ForwardingPath:
+    derived_from: tosca.nodes.Root
+    properties:
+      target_range:
+        type: list
+        entry_schema:
+          description: Identifier of the reciever port of the VNF or the service
+          type: integer
+      protocol:
+        type: string
+        description: protocol type that runs on the link
+    requirements:
+    - forwarder:
+        capability: org.openecomp.capabilities.Forwarder
+        relationship: org.openecomp.relationships.ForwardsTo
+        occurrences: [ 0, UNBOUNDED ]
\ No newline at end of file

diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
index 220658a..5a43b79 100644 (file)
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
@@ -65,4 +65,8 @@ relationship_types:
     derived_from: tosca.relationships.Root
 
   tosca.relationships.nfv.VirtualLinksTo:
-    derived_from: tosca.relationships.Root
\ No newline at end of file
+    derived_from: tosca.relationships.Root
+
+  org.openecomp.relationships.ForwardsTo:
+    derived_from: tosca.relationships.Root
+    valid_target_types: [org.openecomp.capabilities.Forwarder]
\ No newline at end of file