Simple strategy to allow address pairs for virtual IP

[osm/IM.git] / models / yang / nst.yang

diff --git a/models/yang/nst.yang b/models/yang/nst.yang
index b501dae..059d5dd 100644 (file)
--- a/models/yang/nst.yang
+++ b/models/yang/nst.yang
@@ -1,13 +1,27 @@
-//INFORMATION
-//organization "CTTC";
-//contact "Pol Alemany, Ricard Vilalta, Juan Luis de la Cruz";
-//description "Network Slice components definition";
+/*
+ *
+ *   Copyright 2018 CTTC
+ *   Copyright 2018 Telefonica Investigacion y Desarrollo S.A.U.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ *
+ */
 
-// MODULE STRUCTURE
 module nst {
   //header information
   yang-version 1;
-  namespace "urn:ietf:params:xml:ns:yang:nfvo:nst";
+  namespace "urn:etsi:osm:yang:nst";
   prefix "nst";
 
   import nsd-base{
@@ -70,15 +84,15 @@ module nst {
 
     uses nsd-base:vld-common;
 
-    list nsd-connection-point-ref {
+    list nss-connection-point-ref {
       description
           "A list of references to connection points.";
-      key "nsd-ref nsd-connection-point-ref";
+      key "nss-ref nsd-connection-point-ref";
 
-      leaf nsd-ref {
+      leaf nss-ref {
         description "Reference to nsd";
         type leafref {
-          path "/nsd:nsd-catalog/nsd:nsd/nsd:id";
+          path "/nst:nst/nst:netslice-subnet/nst:id";
         }
       }
 
@@ -140,41 +154,20 @@ module nst {
 
   grouping netslice-subnet {
     leaf id {
-      description "Identifier for the netslice-subnet.";
+      description "Identifier or name for the netslice-subnet in NST scope.";
       mandatory true;
       type string {
         length 1..63;
       }
     }
-    leaf name {
-      description "netslice-subnet name.";
-      mandatory true;
-      type string;
-    }
-    leaf short-name {
-      description "Short name to appear as label in the UI";
-      mandatory true;
-      type string;
-    }
-    leaf vendor {
-      description "Vendor of the NSD.";
-      mandatory true;
+    leaf description {
+      description "Description of the NSD.";
       type string;
     }
     leaf is-shared-nss {
       description "NSS is shared between NS";
-      mandatory true;
       type boolean;
-    }
-    leaf description {
-      description "Description of the NSD.";
-      mandatory true;
-      type string;
-    }
-    leaf version {
-      description "Version of the NSD";
-      mandatory true;
-      type string;
+      default false;
     }
     leaf nsd-ref {
       description "Reference to catalog NSD";
@@ -184,7 +177,7 @@ module nst {
       }
     }
     container instantiation-parameters {
-      uses instantiation-parameters:ns_instantiate;
+      uses instantiation-parameters:ns_params;
     }
 
   }
@@ -297,6 +290,7 @@ module nst {
 
     leaf name {
       type string;
+      mandatory true;
     }
 
     container SNSSAI-identifier {
@@ -317,7 +311,7 @@ module nst {
       key "id";
       uses nsvld;
     }
-    list netslicefgd{
+    list netslicefgd {
       key "id";
       uses netslicefgd;
     }