Added name to nsi and nst as mandatory; removed wrong nst params; netslice instantiat...

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

diff --git a/models/yang/instantiation-parameters.yang b/models/yang/instantiation-parameters.yang
index 810b959..dbf38b7 100644 (file)
--- a/models/yang/instantiation-parameters.yang
+++ b/models/yang/instantiation-parameters.yang
@@ -10,10 +10,6 @@ module instantiation-parameters {
   namespace "urn:ietf:params:xml:ns:yang:nfvo:instantiation-parameters";
   prefix "instantiation-parameters";
   
   namespace "urn:ietf:params:xml:ns:yang:nfvo:instantiation-parameters";
   prefix "instantiation-parameters";
   

-  import rw-project {
-    prefix "rw-project";
-  }
-  

   import nsd {
     prefix "nsd";
   }
   import nsd {
     prefix "nsd";
   }


@@ -22,10 +18,6 @@ module instantiation-parameters {
     prefix "vnfd";
   }
 
     prefix "vnfd";
   }
 

-  import nsr {
-    prefix "nsr";
-  }
-

   import ietf-inet-types {
     prefix "inet";
   }
   import ietf-inet-types {
     prefix "inet";
   }


@@ -39,20 +31,33 @@ module instantiation-parameters {
     description "Initial version";
   }
 
     description "Initial version";
   }
 

-  grouping ns_instantiate {
-    leaf nsName {
+  grouping netslice_params {
+    leaf vimAccountId {

       mandatory true;
       type string;
     }
       mandatory true;
       type string;
     }

-    leaf nsDescription {
+    leaf ssh_keys {

       type string;
     }
       type string;
     }

-    leaf nsdId {
+    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;
       mandatory true;

-      type leafref {
-        path "/nsd:nsd-catalog/nsd:nsd/nsd:id";
-      }
+      type string;

     }
     }

+    uses ns_params;
+  }
+
+  grouping ns_params {

     leaf vimAccountId {
       mandatory true;
       type string;
     leaf vimAccountId {
       mandatory true;
       type string;


@@ -60,23 +65,17 @@ module instantiation-parameters {
     leaf ssh_keys {
       type string;
     }
     leaf ssh_keys {
       type string;
     }

-    leaf nsr_id {
-      config false;
-      type leafref {
-        path "/rw-project:project/nsr:ns-instance-opdata/nsr:nsr/nsr:ns-instance-config-ref";
-      }
-    }

     list vnf {
       key "member-vnf-index";
     list vnf {
       key "member-vnf-index";

-      uses vnf;
+      uses vnf_params;

     }
     list vld {
       key "name";
     }
     list vld {
       key "name";

-      uses vld;
+      uses vld_params;

     }
   }
 
     }
   }
 

-  grouping vnf {
+  grouping vnf_params {

     leaf member-vnf-index{
       mandatory true;
       type string;
     leaf member-vnf-index{
       mandatory true;
       type string;


@@ -86,15 +85,15 @@ module instantiation-parameters {
     }
     list vdu {
       key "id";
     }
     list vdu {
       key "id";

-      uses ns_instantiate_vdu;
+      uses vdu_params;

     }
     list internal-vld {
       key "name";
     }
     list internal-vld {
       key "name";

-      uses ns-instantiate-internal-vld;
+      uses internal_vld_params;

     }
   }
 
     }
   }
 

-  grouping vld {
+  grouping vld_params {

     leaf name {
       type string;
     }
     leaf name {
       type string;
     }


@@ -123,7 +122,7 @@ module instantiation-parameters {
     }
   }
 
     }
   }
 

-  grouping ns_instantiate_vdu {
+  grouping vdu_params {

     leaf id {
       mandatory true;
       type string;
     leaf id {
       mandatory true;
       type string;


@@ -157,7 +156,7 @@ module instantiation-parameters {
     }
   }
 
     }
   }
 

-  grouping ns-instantiate-internal-vld {
+  grouping internal_vld_params {

     leaf name {
       mandatory true;
       type string;
     leaf name {
       mandatory true;
       type string;


@@ -210,4 +209,4 @@ module instantiation-parameters {
     }
   }
 
     }
   }
 

-}
\ No newline at end of file
+}