Merge changes I9a6c5927,I055eabb8,I81efc98d,Icc5b7830

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

diff --git a/models/plugins/yang/nsr.yang b/models/plugins/yang/nsr.yang
index 78c86ad..f7c16fe 100644 (file)
--- a/models/plugins/yang/nsr.yang
+++ b/models/plugins/yang/nsr.yang
@@ -111,13 +111,22 @@ module nsr
         description "Name of the user ";
         type string;
       }
-      leaf gecos {
+      leaf user-info {
         description "The user name's real name";
         type string;
       }
-      leaf passwd {
-        description "The user password";
-        type string;
+      list ssh-authorized-key {
+        key "key-pair-ref";
+
+        description "Used to configure the list of public keys to be injected as part 
+                        of ns instantiation";
+
+        leaf key-pair-ref {
+          description "A reference to the key pair entry in the global key pair table";
+          type leafref {
+            path "/nsr:key-pair/nsr:name";
+          }
+        }
       }
     }
   }
@@ -148,7 +157,9 @@ module nsr
       leaf nsd-ref {
         description "Reference to NSR ID ref";
         mandatory true;
-        type string; 
+        type leafref {
+          path "/nsd:nsd-catalog/nsd:nsd/nsd:id";
+        }
       }
       uses ns-instance-config-params;
     }
@@ -161,6 +172,8 @@ module nsr
     }
   }
 
+
+
   container ns-instance-config {
 
     list nsr {
@@ -600,6 +613,14 @@ module nsr
         type uint32;
       }
 
+      leaf uptime {
+        description
+          "Active period of this Network Service.
+          Uptime is expressed in seconds";
+
+        type uint32;
+      }
+
       list connection-point {
         description
             "List for external connection points.