From: Denes Nemeth <denes.nemeth@nokia.com>
Date: Thu, 11 Jan 2018 08:42:45 +0000 (+0100)
Subject: fix VDU parsing during granting
X-Git-Tag: v1.1.0~34^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e470e10e0d652defa5f68ae4f133b0b798cba870;p=vfc%2Fnfvo%2Flcm.git

fix VDU parsing during granting

Change-Id: I251bfcf1bbedcca4b5c88d0318781d5919a92c18
Issue-ID: VFC-657
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
---

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": {