Support of VNF and NS relations as described in pad 6297

This adds the required changes in the IM to replace
the previous structure of relations by a new one following the
design for feature6297 in:
https://osm.etsi.org/pad/p/feature6297

Change-Id: I57f491a74d5e6e87158554421735512d0c5ec4e6
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index a734822..ada867d 100644 (file)
--- a/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@ -221,22 +221,36 @@ module mano-types
   }
 
 
-  grouping vca-relationships {
-    container vca-relationships {
-      list relation {
-        description "List of relations between VCA componets.";
+  grouping vca-relations {
+    list relation {
+      description "List of relations between elements in this descriptor.";
+      key "name";
+
+      leaf name {
+        description
+          "Name of the relation.";
 
-        key "requires provides";
+        type string;
+      }
+
+      list entities {
+        description
+          "List of two elements to be related.
+           Elements to be related are identified by a pair (id, endpoint).
+           The relation will relate (id1, endpoint1) to (id2, endpoint2).";
+        key "id";
 
-        leaf requires {
+        leaf id {
           description
-            "Name of the required relation.";
+            "A string, reference to the element id in the descriptor.
+             It could be a vnfd-id or a vdu-id in a VNFD,
+             or a nsd-id or member-vnf-index in a NSD.";
           type string;
         }
 
-        leaf provides {
+        leaf endpoint {
           description
-            "Name of the provided relation.";
+            "Endpoint name defining the relation.";
           type string;
         }
       }
@@ -291,7 +305,6 @@ module mano-types
             type boolean;
             default true;
           }
-          uses manotypes:vca-relationships;
         }
       }
     }

diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang
index 2eeabc5..70dd3eb 100644 (file)
--- a/models/yang/nsd-base.yang
+++ b/models/yang/nsd-base.yang
@@ -559,6 +559,7 @@ module nsd-base
         "Information about NS configuration.";
 
       uses manotypes:vca-configuration;
+      uses manotypes:vca-relations;
     }
 
     uses manotypes:input-parameter-xpath;

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index eb81021..6b627b2 100644 (file)
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -176,6 +176,7 @@ module vnfd-base
 
       container vnf-configuration {
         uses manotypes:vca-configuration;
+        uses manotypes:vca-relations;
         uses manotypes:vca-config-access;
       }