diff options
| author |   maopeng zhang <zhang.maopeng1@zte.com.cn> | 2018-03-29 09:04:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-29 09:04:48 +0000 |
| commit | 8d3f334eecc54aa9a36839f81ea86cfd5a2f027c (patch) | |
| tree | f3c9d8f2162f1a2312361c6f5dfbfb7f90cc13c6 | |
| parent | 6bd69afa62b9435d628037fb360745843a1c7396 (diff) | |
| parent | e470e10e0d652defa5f68ae4f133b0b798cba870 (diff) | |
Merge "fix VDU parsing during granting"
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | lcm/ns/vnfs/grant_vnfs.py | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -1,3 +1,4 @@ logs/*.log *.pyc -.idea
\ No newline at end of file +.idea +.tox diff --git a/lcm/ns/vnfs/grant_vnfs.py b/lcm/ns/vnfs/grant_vnfs.py index 87a800ec..7f2d44e5 100644 --- a/lcm/ns/vnfs/grant_vnfs.py +++ b/lcm/ns/vnfs/grant_vnfs.py @@ -96,10 +96,10 @@ class GrantVnfs(object): resourceTemplate = { "virtualComputeDescriptor": { "virtualCpu": { - "numVirtualCpu": int(vdu["nfv_compute"]["num_cpus"]) + "numVirtualCpu": int(vdu["virtual_compute"]["virtual_cpu"]["num_virtual_cpu"]) }, "virtualMemory": { - "virtualMemSize": int(vdu["nfv_compute"]["mem_size"]) + "virtualMemSize": int(vdu["virtual_compute"]["virtual_memory"]["virtual_mem_size"]) } }, "virtualStorageDescriptor": { |