X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=models%2Fyang%2Fnsr.yang;h=48ac592ccadbf81b8a5795cf485e01460206a985;hp=12cf8504fe27e7263eee84e892bd36f8a67ab45e;hb=refs%2Ftags%2Fv5.0.1;hpb=989442ed148edbd11f94e48a8ebb40ddd7d5d65b

diff --git a/models/yang/nsr.yang b/models/yang/nsr.yang
index 12cf850..48ac592 100644
--- a/models/yang/nsr.yang
+++ b/models/yang/nsr.yang
@@ -217,6 +217,12 @@ module nsr
         key "id";
         unique "name";
 
+        leaf schema-version {
+          description "Schema version for the NSR. If unspecified, it assumes v3.0";
+          type string;
+          default "v3.0";
+        }
+
         leaf id {
           description "Identifier for the NSR.";
           type yang:uuid;
@@ -480,7 +486,7 @@ module nsr
           }
 
           leaf member-vnf-index-ref {
-            type uint64;
+            type string;
           }
           leaf vnfd-id-ref {
             description
@@ -501,7 +507,16 @@ module nsr
                   path "../../../../../../vnfr:vnfr-catalog/vnfr:vnfr/vnfr:name";
                 }
           }
-          leaf vnfr-connection-point-ref {
+          leaf vnfr-ingress-connection-point-ref {
+            description
+                "A reference to a vnfr connection point.";
+            type leafref {
+              path "../../../../../../vnfr:vnfr-catalog/vnfr:vnfr"
+                 + "[vnfr:id = current()/../vnfr-id-ref]"
+                 + "/vnfr:connection-point/vnfr:name";
+            }
+          }
+          leaf vnfr-egress-connection-point-ref {
             description
                 "A reference to a vnfr connection point.";
             type leafref {
@@ -906,7 +921,7 @@ module nsr
               leaf member-vnf-index-ref {
                 description
                    "Reference to member-vnf within constituent-vnfds";
-                type uint64;
+                type string;
               }
 
               leaf vnfd-id-ref {
@@ -1206,7 +1221,7 @@ module nsr
         leaf member-vnf-index-ref {
           description
               "Reference to member-vnf within constituent-vnfds";
-          type uint64;
+          type string;
         }
 
         leaf vnfd-id-ref {