X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=models%2Fyang%2Fnsr.yang;h=e2a4d6f25536360016082aed0981e76d5f81f8c4;hp=3547866544c01c33c5556914f8edb088827a5f15;hb=c038a8d7a32f350cf88d952b4978bbaf9585d222;hpb=ea872d4b9645cd4122ad7ac6954c142c22b34aad

diff --git a/models/yang/nsr.yang b/models/yang/nsr.yang
index 3547866..e2a4d6f 100644
--- a/models/yang/nsr.yang
+++ b/models/yang/nsr.yang
@@ -20,7 +20,7 @@
 
 module nsr
 {
-  namespace "urn:ietf:params:xml:ns:yang:nfvo:nsr";
+  namespace "urn:etsi:osm:yang:nsr";
   prefix "nsr";
 
   import vlr {
@@ -55,8 +55,8 @@ module nsr
     prefix "manotypes";
   }
 
-  import rw-project {
-    prefix "rw-project";
+  import osm-project {
+    prefix "osm-project";
   }
 
   revision 2017-02-08 {
@@ -161,7 +161,7 @@ module nsr
     }
   }
 
-  augment "/rw-project:project" {
+  augment "/osm-project:project" {
     list key-pair {
       key "name";
       description "Used to configure the list of public keys to be injected as part
@@ -210,7 +210,7 @@ module nsr
     }
   }
 
-  augment "/rw-project:project" {
+  augment "/osm-project:project" {
     container ns-instance-config {
 
       list nsr {
@@ -507,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 {
@@ -631,7 +640,7 @@ module nsr
     }
   }
 
-  augment "/rw-project:project" {
+  augment "/osm-project:project" {
     container ns-instance-opdata {
       config false;
 
@@ -873,6 +882,10 @@ module nsr
           type ns-operational-status;
         }
 
+        container ns-configuration {
+          uses manotypes:vca-configuration;
+        }
+
         leaf config-status {
           description
             "The configuration status of the NS instance
@@ -1147,7 +1160,7 @@ module nsr
     leaf nsr_id_ref {
       description "Reference to NSR ID ref";
       type leafref {
-        path "/rw-project:project[rw-project:name=current()/.." +
+        path "/osm-project:project[osm-project:name=current()/.." +
           "/nsr:project-name]/nsr:ns-instance-config/nsr:nsr/nsr:id";
       }
       mandatory true;
@@ -1447,7 +1460,7 @@ module nsr
       leaf scaling-group-name-ref {
         description "name of the scaling group";
         type leafref {
-          path "/rw-project:project[rw-project:name=current()/.." +
+          path "/osm-project:project[osm-project:name=current()/.." +
             "/nsr:project-name]/nsr:ns-instance-config/nsr:nsr" +
             "[nsr:id=current()/../nsr:nsr_id_ref]/nsr:nsd" +
             "/nsr:scaling-group-descriptor/nsr:name";
@@ -1458,7 +1471,7 @@ module nsr
       leaf instance-id {
         description "id of the scaling group";
         type leafref {
-          path "/rw-project:project[rw-project:name=current()/.." +
+          path "/osm-project:project[osm-project:name=current()/.." +
             "/nsr:project-name]/nsr:ns-instance-config/nsr:nsr" +
             "[nsr:id=current()/../nsr:nsr_id_ref]" +
             "/nsr:scaling-group[nsr:scaling-group-name-ref=current()/.." +
@@ -1486,7 +1499,7 @@ module nsr
       leaf scaling-group-name-ref {
         description "name of the scaling group";
         type leafref {
-          path "/rw-project:project[rw-project:name=current()/.." +
+          path "/osm-project:project[osm-project:name=current()/.." +
             "/nsr:project-name]/nsr:ns-instance-config/nsr:nsr" +
             "[nsr:id=current()/../nsr:nsr_id_ref]/nsr:nsd" +
             "/nsr:scaling-group-descriptor/nsr:name";
@@ -1522,7 +1535,7 @@ module nsr
       leaf nsd_id_ref {
         description "Reference to NSD ID ref";
         type leafref {
-          path "/rw-project:project[rw-project:name=current()/.." +
+          path "/osm-project:project[osm-project:name=current()/.." +
             "/project-name]/project-nsd:nsd-catalog/project-nsd:nsd/project-nsd:id";
         }
       }
@@ -1554,7 +1567,7 @@ module nsr
           description
             "A reference to VNFD placement group";
           type leafref {
-            path "/rw-project:project[rw-project:name=current()/" +
+            path "/osm-project:project[osm-project:name=current()/" +
               "../../project-name]/project-vnfd:vnfd-catalog/project-vnfd:vnfd[project-vnfd:id = " +
               "current()/../vnfd-id-ref]/project-vnfd:placement-groups/project-vnfd:name";
           }
@@ -1570,7 +1583,7 @@ module nsr
           leaf key-pair-ref {
             description "A reference to the key pair entry in the global key pair table";
             type leafref {
-              path "/rw-project:project[rw-project:name=current()/../../../" +
+              path "/osm-project:project[osm-project:name=current()/../../../" +
                 "project-name]/key-pair/name";
             }
           }
@@ -1597,7 +1610,7 @@ module nsr
             leaf key-pair-ref {
               description "A reference to the key pair entry in the global key pair table";
               type leafref {
-                path "/rw-project:project[rw-project:name=current()/" +
+                path "/osm-project:project[osm-project:name=current()/" +
                   "../../../../project-name]/key-pair/name";
               }
             }