aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenes Nemeth <denes.nemeth@nokia.com>2018-01-11 09:42:45 +0100
committerDenes Nemeth <denes.nemeth@nokia.com>2018-01-11 10:07:54 +0100
commite470e10e0d652defa5f68ae4f133b0b798cba870 (patch)
treef03d011b835c5aead312d02bdfdde68ca2f60656
parent7cf487253870436fec8b5aca86c81ffec6ec240a (diff)
fix VDU parsing during granting
Change-Id: I251bfcf1bbedcca4b5c88d0318781d5919a92c18 Issue-ID: VFC-657 Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
-rw-r--r--.gitignore3
-rw-r--r--lcm/ns/vnfs/grant_vnfs.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 67c551bb..80537515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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": {