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
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)