Support of VNF and NS relations as described in pad 6297

[osm/IM.git] / models / yang / mano-types.yang

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
           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;
         }
 
           type string;
         }
 

-        leaf provides {
+        leaf endpoint {

           description
           description

-            "Name of the provided relation.";
+            "Endpoint name defining the relation.";

           type string;
         }
       }
           type string;
         }
       }


@@ -291,7 +305,6 @@ module mano-types
             type boolean;
             default true;
           }
             type boolean;
             default true;
           }

-          uses manotypes:vca-relationships;

         }
       }
     }
         }
       }
     }