X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=models%2Fyang%2Fnsr.yang;h=49a44e365994f9fd62c0e4eeb6d7317278c37804;hp=3547866544c01c33c5556914f8edb088827a5f15;hb=refs%2Fchanges%2F33%2F9833%2F2;hpb=ea872d4b9645cd4122ad7ac6954c142c22b34aad

diff --git a/models/yang/nsr.yang b/models/yang/nsr.yang
index 3547866..49a44e3 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
@@ -178,18 +178,18 @@ module nsr
     }
   }
 
-  grouping event-service-primitive {
+  grouping event-config-primitive {
     leaf seq {
       description
-          "Sequence number for the service primitive.";
+          "Sequence number for the config primitive.";
       type uint64;
     }
 
     leaf name {
       description
-          "Name of the service primitive.";
+          "Name of the primitive.";
       type string;
-      mandatory "true";
+      mandatory true;
     }
 
     leaf user-defined-script {
@@ -210,7 +210,7 @@ module nsr
     }
   }
 
-  augment "/rw-project:project" {
+  augment "/osm-project:project" {
     container ns-instance-config {
 
       list nsr {
@@ -267,8 +267,6 @@ module nsr
           uses project-nsd:nsr-nsd-vnf-dependency;
 
           uses project-nsd:nsr-nsd-monitoring-param;
-
-          uses project-nsd:nsr-nsd-service-primitive;
         }
         uses ns-instance-config-params;
       }
@@ -507,7 +505,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 +638,7 @@ module nsr
     }
   }
 
-  augment "/rw-project:project" {
+  augment "/osm-project:project" {
     container ns-instance-opdata {
       config false;
 
@@ -873,6 +880,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
@@ -882,100 +893,6 @@ module nsr
           type config-states;
         }
 
-        list service-primitive {
-           description
-                "Network service level service primitives.";
-
-           key "name";
-
-           leaf name {
-              description
-                  "Name of the service primitive.";
-              type string;
-           }
-
-           list parameter {
-              description
-                  "List of parameters for the service primitive.";
-
-              key "name";
-              uses manotypes:primitive-parameter;
-           }
-
-           uses manotypes:ui-primitive-group;
-
-           list vnf-primitive-group {
-              description
-                "Reference to member-vnf within constituent-vnfds";
-
-              key "member-vnf-index-ref";
-              leaf member-vnf-index-ref {
-                description
-                   "Reference to member-vnf within constituent-vnfds";
-                type string;
-              }
-
-              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]
-                        + /nsd:vnfd-id-ref
-                    NOTE: An issue with confd is preventing the
-                    use of xpath. Seems to be an issue with leafref
-                    to leafref, whose target is in a different module.
-                    Once that is resovled this will switched to use
-                    leafref";
-
-                 type string;
-              }
-
-              leaf vnfd-name {
-                 description
-                   "Name of the VNFD";
-                 type string;
-              }
-
-              list primitive {
-                 key "index";
-
-                 leaf index {
-                   description "Index of this primitive";
-                   type uint32;
-                 }
-
-                 leaf name {
-                   description "Name of the primitive in the VNF primitive ";
-                   type string;
-                 }
-              }
-           }
-
-           leaf user-defined-script {
-             description
-               "A user defined script.";
-             type string;
-           }
-        }
-
-        list initial-service-primitive {
-          description
-            "Initial set of service primitives for NSD.";
-          key "seq";
-
-          uses event-service-primitive;
-        }
-
-        list terminate-service-primitive {
-          description
-            "Set of service primitives to
-             execute during termination of NSD.";
-          key "seq";
-
-          uses event-service-primitive;
-        }
-
         list monitoring-param {
           description
             "List of NS level params.";
@@ -1147,19 +1064,19 @@ 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;
     }
   }
 
-  rpc get-ns-service-primitive-values {
-    description "Get the service primitive parameter values";
+  rpc get-ns-config-primitive-values {
+    description "Get the config primitive parameter values";
 
     input {
       leaf name {
-        description "Name of the NS service primitive group";
+        description "Name of the NS config primitive group";
         mandatory true;
         type string;
       }
@@ -1261,8 +1178,8 @@ module nsr
     }
   }
 
-  rpc exec-ns-service-primitive {
-    description "Executes a NS service primitive or script";
+  rpc exec-ns-config-primitive {
+    description "Executes a NS config primitive or script";
 
     input {
       leaf name {
@@ -1447,7 +1364,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 +1375,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 +1403,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 +1439,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 +1471,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 +1487,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 +1514,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";
               }
             }