Commit cb62bb4c authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

Merge branch 'bug#224' into 'master'

Fix for bug#224

See merge request !36
parents bdaf0543 5c0a9e76
Pipeline #508 passed with stage
in 0 seconds
......@@ -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>
......
......@@ -89,7 +89,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
......@@ -291,10 +291,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" {
......@@ -409,7 +408,7 @@ submodule etsi-nfv-vnf {
}
}
list virtual-compute-descriptor {
list virtual-compute-desc {
key "id";
description
"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