X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=models%2Fyang%2Fnsd.yang;h=19aebe9f9c4475c24a91c34f4b2f718590157967;hp=4a88eac47db4cd1ce5872b8a9b73832fe073226a;hb=2b5a566395883b7d1959344bc725186bda441d01;hpb=d6ccaf7e0a66331e9be1046642868f84e7184a31;ds=sidebyside

diff --git a/models/yang/nsd.yang b/models/yang/nsd.yang
index 4a88eac..19aebe9 100644
--- a/models/yang/nsd.yang
+++ b/models/yang/nsd.yang
@@ -35,6 +35,10 @@ module nsd
     prefix "manotypes";
   }
 
+  import ietf-inet-types {
+    prefix "inet";
+  }
+
   revision 2017-02-28 {
     description
       "Update model to support projects.";
@@ -61,7 +65,7 @@ module nsd
           "Identifier/index for the VNFD. This separate id
            is required to ensure that multiple VNFs can be
            part of single NS";
-        type uint64;
+        type string;
       }
 
       leaf vnfd-id-ref {
@@ -100,6 +104,15 @@ module nsd
           }
         }
 
+        leaf vnfd-connection-point-ref {
+          description "A reference to a connection point name";
+          type leafref {
+            path "/vnfd:vnfd-catalog/vnfd:vnfd" +
+                 "[vnfd:id = current()/../vnfd-id-ref]/" +
+                 "vnfd:connection-point/vnfd:name";
+          }
+        }
+
         leaf vnfd-id-ref {
           description
               "A reference to a VNFD";
@@ -110,14 +123,11 @@ module nsd
           }
         }
 
-        leaf vnfd-connection-point-ref {
-          description "A reference to a connection point name";
-          type leafref {
-            path "/vnfd:vnfd-catalog/vnfd:vnfd" +
-                 "[vnfd:id = current()/../vnfd-id-ref]/" +
-                 "vnfd:connection-point/vnfd:name";
-          }
+        leaf ip-address {
+          description "IP address of the connection point";
+          type inet:ip-address;
         }
+
       }
     }
   }
@@ -298,6 +308,12 @@ module nsd
 
   container nsd-catalog {
 
+    leaf schema-version {
+      description "Schema version for the NSD. If unspecified, it assumes v3.0";
+      type string;
+      default "v3.0";
+    }
+
     list nsd {
       key id;