Fix for bug#224

example-data/nfv.xml

@@ -25,7 +25,7 @@
       <virtual-storage-desc>asa-vsd</virtual-storage-desc>
       <sw-image-desc>asa-image</sw-image-desc>
     </vdu>
-    <virtual-compute-descriptor>
+    <virtual-compute-desc>
       <id>asa-vcd</id>
       <virtual-memory>
         <size>4.0</size>
@@ -33,7 +33,7 @@
       <virtual-cpu>
         <num-virtual-cpu>2</num-virtual-cpu>
       </virtual-cpu>
-    </virtual-compute-descriptor>
+    </virtual-compute-desc>
     <virtual-storage-descriptor>
       <id>asa-vsd</id>
       <type-of-storage>root</type-of-storage>
@@ -120,7 +120,7 @@
       <virtual-storage-desc>csr-vsd</virtual-storage-desc>
       <sw-image-desc>csr-image</sw-image-desc>
     </vdu>
-    <virtual-compute-descriptor>
+    <virtual-compute-desc>
       <id>csr-vcd</id>
       <virtual-memory>
         <size>4.0</size>
@@ -128,7 +128,7 @@
       <virtual-cpu>
         <num-virtual-cpu>2</num-virtual-cpu>
       </virtual-cpu>
-    </virtual-compute-descriptor>
+    </virtual-compute-desc>
     <virtual-storage-descriptor>
       <id>csr-vsd</id>
       <type-of-storage>root</type-of-storage>

src/yang/etsi-nfv-vnf.yang

@@ -88,7 +88,7 @@ submodule etsi-nfv-vnf {
 
       leaf nicio-requirements {
         type leafref {
-          path "/nfv/vnfd/virtual-compute-descriptor/id";
+          path "/nfv/vnfd/virtual-compute-desc/id";
         }
         description
           "This references (couples) the CPD with any logical node I/O
@@ -290,10 +290,9 @@ submodule etsi-nfv-vnf {
         }
         leaf virtual-compute-desc {
           type leafref {
-            path "../../nfv:virtual-compute-descriptor/" +
-                 "nfv:id";
+            path "../../nfv:virtual-compute-desc/nfv:id";
           }
-          must "../../nfv:virtual-compute-descriptor[id=current()]/" +
+          must "../../nfv:virtual-compute-desc[id=current()]/" +
                "nfv:virtual-memory/size >=" +
                "../../nfv:sw-image-desc[id=current()/" +
                "../sw-image-desc]/min-ram" {
@@ -414,7 +413,7 @@ submodule etsi-nfv-vnf {
         }
       }
 
-      list virtual-compute-descriptor {
+      list virtual-compute-desc {
         key "id";
         description
           "Defines descriptors of virtual compute resources to be