X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fbiz%2Fgrant_vnf.py;h=f7cdeaa5d9a2d1b7fc7bd4493c6f5f2b64500ae2;hb=1a8fa7974930ba1c82e603a2195515cadf94f1c2;hp=83d94e50c4356faaa5d818f1cf775e64ff13577e;hpb=5efbf8748ca225b26e909cef06e2314746fb3e1b;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/biz/grant_vnf.py b/lcm/lcm/nf/biz/grant_vnf.py
index 83d94e50..f7cdeaa5 100644
--- a/lcm/lcm/nf/biz/grant_vnf.py
+++ b/lcm/lcm/nf/biz/grant_vnf.py
@@ -62,7 +62,12 @@ def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
             content_args['removeResources'].append(res_def)
             res_index += 1
         if vdus and vdus[0].vimid:
-            content_args['additionalParams']['vimid'] = vdus[0].vimid
+            split_vim = vdus[0].vimid.split('_')
+            cloud_owner = split_vim[0]
+            cloud_region = "".join(split_vim[1:])
+            content_args['additionalParams']['vimid'] = json.dumps({
+                "cloud_owner": cloud_owner,
+                'cloud_regionid': cloud_region})
     elif grant_type == GRANT_TYPE.INSTANTIATE:
         vim_id = ignore_case_get(ignore_case_get(data, "additionalParams"), "vimId")
         res_index = 1
@@ -108,7 +113,7 @@ def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
         if vnf.vimInfo and 'vimid' not in addition_paras:
             vim_info = json.loads(vnf.vimInfo)
             vimid = ""
-            for key in vim_info.iterkeys():
+            for key in list(vim_info.keys()):
                 vimid = key
             addition_paras['vimid'] = vimid
     logger.info('Grant request data=%s' % content_args)