X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=models%2Fplugins%2Fyang%2Fnsd.yang;h=84b632518cc51aa69f8b7e502d639530401e8ec6;hb=refs%2Fchanges%2F67%2F767%2F1;hp=5fffa457145650de831929b7030477ab2ec15173;hpb=6f07e6f33f751ab4ffe624f6037f887b243bece2;p=osm%2FSO.git

diff --git a/models/plugins/yang/nsd.yang b/models/plugins/yang/nsd.yang
index 5fffa457..84b63251 100644
--- a/models/plugins/yang/nsd.yang
+++ b/models/plugins/yang/nsd.yang
@@ -292,9 +292,9 @@ module nsd
           }
         }
 
-         leaf vnfd-id-ref {
-           description
-               "A reference to a vnfd. This is a
+        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]
@@ -304,12 +304,12 @@ module nsd
                 to leafref, whose target is in a different module.
                 Once that is resovled this will switched to use
                 leafref";
-           type string;
-         }
+          type string;
+        }
 
-         leaf vnfd-connection-point-ref {
-           description
-               "A reference to a connection point name
+        leaf vnfd-connection-point-ref {
+          description
+            "A reference to a connection point name
                 in a vnfd. This is a leafref to path:
                     /vnfd:vnfd-catalog/vnfd:vnfd
                     + [vnfd:id = current()/../nsd:vnfd-id-ref]
@@ -319,13 +319,19 @@ module nsd
                 to leafref, whose target is in a different module.
                 Once that is resovled this will switched to use
                 leafref";
-            type string;
+          type string;
         }
       }
 
       // replicate for pnfd container here
       uses manotypes:provider-network;
 
+      leaf mgmt-network {
+         description "Flag indicating whether this network is a VIM management network"; 
+         type boolean;
+         default false;
+      }
+
       choice init-params {
         description "Extra parameters for VLD instantiation";
 
@@ -337,12 +343,14 @@ module nsd
             type string;
           }
         }
+
         case vim-network-profile {
           leaf ip-profile-ref {
             description "Named reference to IP-profile object";
             type string;
           } 
-        }   
+        }
+
       }
     }
 
@@ -902,15 +910,62 @@ module nsd
 
       uses ns-initial-config-primitive;
     }
+
+    list key-pair {
+      key "name";
+      description "Used to configure the list of public keys to be injected as part
+          of ns instantiation";
+
+      leaf name {
+        description "Name of this key pair";
+        type string;
+      }
+
+      leaf key {
+        description "Key associated with this key pair";
+        type string;
+      }
+    }
+
+    list user {
+      key "name";
+      description "List of users to be added through cloud-config";
+
+      leaf name {
+        description "Name of the user ";
+        type string;
+      }
+
+      leaf user-info {
+        description "The user name's real name";
+        type string;
+      }
+
+      list key-pair {
+        key "name";
+        description "Used to configure the list of public keys to be injected as part
+            of ns instantiation";
+
+        leaf name {
+          description "Name of this key pair";
+          type string;
+        }
+
+        leaf key {
+          description "Key associated with this key pair";
+          type string;
+        }
+      }
+    }
   }
 
+
   container nsd-catalog {
 
     list nsd {
       key "id";
 
       uses nsd-descriptor;
-
     }
   }