Merge "fix VDU parsing during granting"

diff --git a/.gitignore b/.gitignore
index 67c551b..8053751 100644 (file)
--- 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 87a800e..7f2d44e 100644 (file)
--- 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": {