Merge branch 'bug#212' into 'master'

Fix for bug#212

See merge request !31

example-data/nfv.xml

@@ -80,14 +80,14 @@
       <instantiation-level>
         <id>double</id>
         <vdu-level>
-          <id>firewall</id>
+          <vdu-id>firewall</vdu-id>
           <number-of-instances>2</number-of-instances>
         </vdu-level>
       </instantiation-level>
       <instantiation-level>
         <id>single</id>
         <vdu-level>
-          <id>firewall</id>
+          <vdu-id>firewall</vdu-id>
           <number-of-instances>1</number-of-instances>
         </vdu-level>
       </instantiation-level>
@@ -175,14 +175,14 @@
       <instantiation-level>
         <id>double</id>
         <vdu-level>
-          <id>router</id>
+          <vdu-id>router</vdu-id>
           <number-of-instances>2</number-of-instances>
         </vdu-level>
       </instantiation-level>
       <instantiation-level>
         <id>single</id>
         <vdu-level>
-          <id>router</id>
+          <vdu-id>router</vdu-id>
           <number-of-instances>1</number-of-instances>
         </vdu-level>
       </instantiation-level>

src/yang/etsi-nfv-vnf.yang

@@ -1589,7 +1589,7 @@ submodule etsi-nfv-vnf {
                information element";
           }
           list vdu-level {
-            key "id";
+            key "vdu-id";
             min-elements 1;
             description
               "Sets the number of instances for the VDU in this
@@ -1597,7 +1597,8 @@ submodule etsi-nfv-vnf {
             reference
               "GS NFV IFA011: Section 7.1.8.7 InstantiationLevel
                information element";
-            leaf id {
+
+            leaf vdu-id {
               type leafref {
                 path "../../../../nfv:vdu/nfv:id";
               }
@@ -1610,10 +1611,10 @@ submodule etsi-nfv-vnf {
             leaf number-of-instances {
               type uint16;
               must ". <= ../../../../nfv:df/" +
-                   "nfv:vdu-profile[id=current()/../nfv:id]/" +
+                   "nfv:vdu-profile[id=current()/../nfv:vdu-id]/" +
                    "nfv:max-number-of-instances";
               must ". >= ../../../../nfv:df/" +
-                   "nfv:vdu-profile[id=current()/../nfv:id]/" +
+                   "nfv:vdu-profile[id=current()/../nfv:vdu-id]/" +
                    "nfv:min-number-of-instances";
               default 1;
               description