Merge "fix grant vnf para error"

diff --combined lcm/pub/msapi/resmgr.py
index 8483962,e6bc3bb..db2c5e2
--- 1/lcm/pub/msapi/resmgr.py
--- 2/lcm/pub/msapi/resmgr.py
+++ b/lcm/pub/msapi/resmgr.py
@@@ -54,14 -54,14 +54,16 @@@ 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)
              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,