X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=models%2Fyang%2Fmano-types.yang;h=f4cce6bb1c48d550c3e15bccf243e8a74446d770;hb=refs%2Fchanges%2F45%2F9245%2F1;hp=a7348229939f64785c385d588cfaeb72a0756077;hpb=c900490e2342643eff668a8e93fcba0cfcdcbfb6;p=osm%2FIM.git

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index a734822..f4cce6b 100644
--- a/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@ -176,7 +176,7 @@ module mano-types
       description
           "Name of the configuration primitive.";
       type string;
-      mandatory "true";
+      mandatory true;
     }
 
     leaf user-defined-script {
@@ -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;
         }
       }
     }
@@ -420,15 +433,17 @@ module mano-types
   typedef virtual-link-type {
     description
         "Type of virtual link
-         ELAN: A multipoint service connecting a set of VNFs
-         ELINE: For a simple point to point connection
-         //        between a VNF and the existing network.
+         ELAN: A multipoint service connecting a set of elements
+         ELINE: A point-to-point service connecting two elements
+         L3: A service providing either Layer-3 visibility (IP) between
+             VDUs/VNFs or explicit interconnection between two ELAN VLDs.";
          // ETREE: A multipoint service connecting one or
          //        more roots and a set of leaves, but
          //        preventing inter-leaf communication.";
     type enumeration {
       enum ELAN;
       enum ELINE;
+      enum L3;
       // enum ETREE;
     }
   }