diff --git a/example-data/nfv.xml b/example-data/nfv.xml index bd49ea32a01ca2f1d2d8b74e4dd26acbd531e48e..f159e07562f930303171f37c37015e1d5ec68573 100644 --- a/example-data/nfv.xml +++ b/example-data/nfv.xml @@ -25,7 +25,7 @@ asa-vsd asa-image - + asa-vcd 4.0 @@ -33,7 +33,7 @@ 2 - + asa-vsd root @@ -120,7 +120,7 @@ csr-vsd csr-image - + csr-vcd 4.0 @@ -128,7 +128,7 @@ 2 - + csr-vsd root diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 6d6b77aa4f354f86c6df977fb2c27ff204629179..8ed449e68debe47fd7249dbb0068949bf142cc79 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -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