Merge "[RIFT 16414, 16415, 16416] Unittest fixes to conform to the new package struct...

[osm/SO.git] / models / plugins / yang / nsr.yang

diff --git a/models/plugins/yang/nsr.yang b/models/plugins/yang/nsr.yang
index e8b65ae..a3f9f57 100644 (file)
--- a/models/plugins/yang/nsr.yang
+++ b/models/plugins/yang/nsr.yang
@@ -271,11 +271,7 @@ module nsr
           ../../../../nsd:constituent-vnfd
           + [nsr:id = current()/../nsd:id-ref]
           + /nsd:vnfd-id-ref
-          NOTE: An issue with confd is preventing the
-          use of xpath. Seems to be an issue with leafref
-          to leafref, whose target is in a different module.
-          Once that is resovled this will switched to use
-          leafref";
+          NOTE: confd limitations prevent the use of xpath";
       type yang:uuid;
     }
 
@@ -413,7 +409,7 @@ module nsr
             description
                 "Type of Service Function.
                 NOTE: This needs to map with Service Function Type in ODL to
-                support VNFFG. Service Function Type is manadatory param in ODL
+                support VNFFG. Service Function Type is mandatory param in ODL
                 SFC. This is temporarily set to string for ease of use";
             type string;
           }
@@ -829,7 +825,78 @@ module nsr
         type config-states;
       }
 
-      uses manotypes:ns-service-primitive;
+      list service-primitive {
+         description
+              "Network service level service primitives.";
+
+         key "name";
+
+         leaf name {
+            description
+                "Name of the service primitive.";
+            type string;
+         }
+
+         list parameter {
+            description
+                "List of parameters for the service primitive.";
+
+            key "name";
+            uses manotypes:primitive-parameter;
+         }
+
+         uses manotypes:ui-primitive-group;
+
+         list vnf-primitive-group {
+            description
+                "List of service primitives grouped by VNF.";
+
+            key "member-vnf-index-ref";
+            leaf member-vnf-index-ref {
+              description
+                 "Reference to member-vnf within constituent-vnfds";
+              type uint64;
+            }
+
+            leaf vnfd-id-ref {
+               description
+                 "A reference to a vnfd. This is a 
+                  leafref to path:
+                      ../../../../nsd:constituent-vnfd
+                      + [nsd:id = current()/../nsd:id-ref]
+                      + /nsd:vnfd-id-ref
+                  NOTE: confd limitations prevent the use of xpath";
+
+               type string;
+            }
+
+            leaf vnfd-name {
+               description
+                 "Name of the VNFD";
+               type string;
+            }
+
+            list primitive {
+               key "index";
+
+               leaf index {
+                 description "Index of this primitive";
+                 type uint32;
+               }
+
+               leaf name {
+                 description "Name of the primitive in the VNF primitive ";
+                 type string;
+               }
+            }
+         }
+
+         leaf user-defined-script {
+           description
+               "A user defined script.";
+           type string;
+         }
+      }
 
       list initial-config-primitive {
         rwpb:msg-new NsrInitialConfigPrimitive;
@@ -856,12 +923,17 @@ module nsr
         }
 
         list parameter {
+          description
+              "List of parameters for the initial config primitive";
           key "name";
           leaf name {
+            description "Name of the intitial config parameter";
             type string;
           }
 
           leaf value {
+            description "Value associated with the initial config 
+                        parameter";
             type string;
           }
         }
@@ -1103,11 +1175,7 @@ module nsr
                    ../../../../nsd:constituent-vnfd
                    + [nsd:id = current()/../nsd:id-ref]
                    + /nsd:vnfd-id-ref
-               NOTE: An issue with confd is preventing the
-               use of xpath. Seems to be an issue with leafref
-               to leafref, whose target is in a different module.
-               Once that is resovled this will switched to use
-               leafref";
+               NOTE: confd limitations prevent the use of xpath";
 
           type string;
         }