Simple strategy to allow address pairs for virtual IP

[osm/IM.git] / models / yang / instantiation-parameters.yang

diff --git a/models/yang/instantiation-parameters.yang b/models/yang/instantiation-parameters.yang
index dbf38b7..c5258ff 100644 (file)
--- a/models/yang/instantiation-parameters.yang
+++ b/models/yang/instantiation-parameters.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 instantiation-parameters {
   //header information
   yang-version 1;
-  namespace "urn:ietf:params:xml:ns:yang:nfvo:instantiation-parameters";
+  namespace "urn:etsi:osm:yang:instantiation-parameters";
   prefix "instantiation-parameters";
   
   import nsd {
@@ -25,38 +39,12 @@ module instantiation-parameters {
   import ietf-yang-types {
     prefix "ietf-yang";
   }
-
+  
   //revision history
   revision 2018-09-14 {
     description "Initial version";
   }
 
-  grouping netslice_params {
-    leaf vimAccountId {
-      mandatory true;
-      type string;
-    }
-    leaf ssh_keys {
-      type string;
-    }
-    list netslice-subnet {
-      key "id";
-      uses netslice_subnet_params;
-    }
-    list netslice-vld {
-      key "name";
-      uses vld_params;
-    }
-  }
-
-  grouping netslice_subnet_params {
-    leaf id {
-      mandatory true;
-      type string;
-    }
-    uses ns_params;
-  }
-
   grouping ns_params {
     leaf vimAccountId {
       mandatory true;
@@ -93,7 +81,7 @@ module instantiation-parameters {
     }
   }
 
-  grouping vld_params {
+  grouping vld_common_params {
     leaf name {
       type string;
     }
@@ -103,6 +91,10 @@ module instantiation-parameters {
     container ip-profile {
       uses ip-profile-update-schema;
     }
+  }
+
+  grouping vld_params {
+    uses vld_common_params;
     list vnfd-connection-point-ref {
       key "member-vnf-index-ref vnfd-connection-point-ref";
       leaf member-vnf-index-ref {
@@ -187,7 +179,7 @@ module instantiation-parameters {
       type inet:ip-prefix;
     }
     leaf gateway-address {
-      type inet:ip-prefix;
+      type inet:ip-address;
     }
     list dns-server {
       key "address";