Commit 5c0a9e76 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

Fix for bug#224

parent ff2f13fa
Pipeline #496 passed with stage
in 0 seconds
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<virtual-storage-desc>asa-vsd</virtual-storage-desc> <virtual-storage-desc>asa-vsd</virtual-storage-desc>
<sw-image-desc>asa-image</sw-image-desc> <sw-image-desc>asa-image</sw-image-desc>
</vdu> </vdu>
<virtual-compute-descriptor> <virtual-compute-desc>
<id>asa-vcd</id> <id>asa-vcd</id>
<virtual-memory> <virtual-memory>
<size>4.0</size> <size>4.0</size>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<virtual-cpu> <virtual-cpu>
<num-virtual-cpu>2</num-virtual-cpu> <num-virtual-cpu>2</num-virtual-cpu>
</virtual-cpu> </virtual-cpu>
</virtual-compute-descriptor> </virtual-compute-desc>
<virtual-storage-descriptor> <virtual-storage-descriptor>
<id>asa-vsd</id> <id>asa-vsd</id>
<type-of-storage>root</type-of-storage> <type-of-storage>root</type-of-storage>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<virtual-storage-desc>csr-vsd</virtual-storage-desc> <virtual-storage-desc>csr-vsd</virtual-storage-desc>
<sw-image-desc>csr-image</sw-image-desc> <sw-image-desc>csr-image</sw-image-desc>
</vdu> </vdu>
<virtual-compute-descriptor> <virtual-compute-desc>
<id>csr-vcd</id> <id>csr-vcd</id>
<virtual-memory> <virtual-memory>
<size>4.0</size> <size>4.0</size>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<virtual-cpu> <virtual-cpu>
<num-virtual-cpu>2</num-virtual-cpu> <num-virtual-cpu>2</num-virtual-cpu>
</virtual-cpu> </virtual-cpu>
</virtual-compute-descriptor> </virtual-compute-desc>
<virtual-storage-descriptor> <virtual-storage-descriptor>
<id>csr-vsd</id> <id>csr-vsd</id>
<type-of-storage>root</type-of-storage> <type-of-storage>root</type-of-storage>
......
...@@ -88,7 +88,7 @@ submodule etsi-nfv-vnf { ...@@ -88,7 +88,7 @@ submodule etsi-nfv-vnf {
leaf nicio-requirements { leaf nicio-requirements {
type leafref { type leafref {
path "/nfv/vnfd/virtual-compute-descriptor/id"; path "/nfv/vnfd/virtual-compute-desc/id";
} }
description description
"This references (couples) the CPD with any logical node I/O "This references (couples) the CPD with any logical node I/O
...@@ -290,10 +290,9 @@ submodule etsi-nfv-vnf { ...@@ -290,10 +290,9 @@ submodule etsi-nfv-vnf {
} }
leaf virtual-compute-desc { leaf virtual-compute-desc {
type leafref { type leafref {
path "../../nfv:virtual-compute-descriptor/" + path "../../nfv:virtual-compute-desc/nfv:id";
"nfv:id";
} }
must "../../nfv:virtual-compute-descriptor[id=current()]/" + must "../../nfv:virtual-compute-desc[id=current()]/" +
"nfv:virtual-memory/size >=" + "nfv:virtual-memory/size >=" +
"../../nfv:sw-image-desc[id=current()/" + "../../nfv:sw-image-desc[id=current()/" +
"../sw-image-desc]/min-ram" { "../sw-image-desc]/min-ram" {
...@@ -414,7 +413,7 @@ submodule etsi-nfv-vnf { ...@@ -414,7 +413,7 @@ submodule etsi-nfv-vnf {
} }
} }
list virtual-compute-descriptor { list virtual-compute-desc {
key "id"; key "id";
description description
"Defines descriptors of virtual compute resources to be "Defines descriptors of virtual compute resources to be
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment