From: maopengzhang <zhang.maopeng1@zte.com.cn>
Date: Tue, 13 Nov 2018 10:34:58 +0000 (+0800)
Subject: fix grant vnf para error
X-Git-Tag: 3.0.0-ONAP~1^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ceccf4e880cc6f423a41a696935300bdea6c1b23;p=vfc%2Fnfvo%2Flcm.git

fix grant vnf para error

fix grant vnf para error, etc

Change-Id: I0accaa82a4633aa4e1887c0aa9c157afc3019a03
Issue-ID: VFC-1158
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
---

diff --git a/lcm/pub/msapi/resmgr.py b/lcm/pub/msapi/resmgr.py
index 8b0d56fb..e6bc3bb3 100644
--- a/lcm/pub/msapi/resmgr.py
+++ b/lcm/pub/msapi/resmgr.py
@@ -54,6 +54,8 @@ def grant_vnf(req_param):
             vim_id = req_param["vimId"]
         elif "additionalparam" in req_param and "vimid" in req_param["additionalparam"]:
             vim_id = req_param["additionalparam"]["vimid"]
+        elif "additionalParams" in req_param and "vimid" in req_param["additionalParams"]:
+            vim_id = req_param["additionalParams"]["vimid"]
         try:
             from lcm.pub.msapi import extsys
             vim = extsys.get_vim_by_id(vim_id)