summaryrefslogtreecommitdiffstats
path: root/lcm
diff options
context:
space:
mode:
authorhongyuzhao <zhao.hongyu@zte.com.cn>2019-07-30 14:17:41 +0800
committerhongyuzhao <zhao.hongyu@zte.com.cn>2019-07-30 14:29:13 +0800
commit1a8fa7974930ba1c82e603a2195515cadf94f1c2 (patch)
tree8fcb54901a637eec83c289dab7a68dc403e16fe5 /lcm
parent0f58e3fbde2064cf1f92430769835aa104ed8488 (diff)
fix bug for vnfm grant request in terminate opratio
Change-Id: Iecf572519efdf355dcd84e60eb339aaa9909f812 Issue-ID: VFC-1462 Signed-off-by: hongyuzhao <zhao.hongyu@zte.com.cn>
Diffstat (limited to 'lcm')
-rw-r--r--lcm/lcm/nf/biz/grant_vnf.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/lcm/lcm/nf/biz/grant_vnf.py b/lcm/lcm/nf/biz/grant_vnf.py
index 80ff035c..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