vim_config = vim_account_info['config']
vim_account['admin_username'] = vim_config['admin_username']
- vim_account['admin_password'] = self.common_db.decrypt_vim_password(vim_config['admin_password'],
- vim_account_info['schema_version'],
- vim_account_id)
+ vim_account['admin_password'] = vim_config['admin_password']
vim_account['vrops_site'] = vim_config['vrops_site']
vim_account['vrops_user'] = vim_config['vrops_user']
- vim_account['vrops_password'] = self.common_db.decrypt_vim_password(vim_config['vrops_password'],
- vim_account_info['schema_version'],
- vim_account_id)
+ vim_account['vrops_password'] = vim_config['vrops_password']
return vim_account
if vnfr['_admin']['projects_read']:
tags['project_id'] = vnfr['_admin']['projects_read'][0]
else:
- tags['project_id'] = None
+ tags['project_id'] = ''
# Fetch the list of all known resources from vROPS.
resource_list = self.vrops.get_vm_resource_list_from_vrops()
filter(lambda vdu: vdu['id'] == vdur['vdu-id-ref'], vnfd['vdu'])
)
- if 'monitoring-param' not in vdu:
+ if 'monitoring-parameter' not in vdu:
continue
resource_uuid = vdur['vim-id']
if len(vdu_mappings) != 0:
return self.vrops.get_metrics(vdu_mappings=vdu_mappings,
- monitoring_params=vdu['monitoring-param'],
+ monitoring_params=vdu['monitoring-parameter'],
vnfr=vnfr,
tags=tags
)