From: fujinhua <fu.jinhua@zte.com.cn>
Date: Mon, 12 Nov 2018 07:26:02 +0000 (+0800)
Subject: Fix vnf grant logic
X-Git-Tag: 3.0.0-ONAP~4^2~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=da0475d37a7fc6310b3a5f0ac407be408bb06caf;p=vfc%2Fnfvo%2Flcm.git

Fix vnf grant logic

Change-Id: I6117b389a4d06d542d1dedc5c77dafb546659841
Issue-ID: VFC-1163
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---

diff --git a/lcm/pub/msapi/resmgr.py b/lcm/pub/msapi/resmgr.py
index 8b0d56fb..8483962f 100644
--- a/lcm/pub/msapi/resmgr.py
+++ b/lcm/pub/msapi/resmgr.py
@@ -60,6 +60,8 @@ def grant_vnf(req_param):
             if isinstance(vim, list):
                 vim = vim[0]
                 vim_id = vim["vimId"]
+            if "vimId" in vim:
+                vim_id = vim["vimId"]
             grant_rsp = {
                 "vim": {
                     "vimId": vim_id,