Code Review
/
vfc
/
gvnfm
/
vnflcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix bug for vnfm grant request in terminate opratio
[vfc/gvnfm/vnflcm.git]
/
lcm
/
lcm
/
nf
/
biz
/
grant_vnf.py
diff --git
a/lcm/lcm/nf/biz/grant_vnf.py
b/lcm/lcm/nf/biz/grant_vnf.py
index
83d94e5
..
f7cdeaa
100644
(file)
--- 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['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
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 = ""
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)
vimid = key
addition_paras['vimid'] = vimid
logger.info('Grant request data=%s' % content_args)