projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating refs to own branch
[osm/MON.git]
/
osm_mon
/
collector
/
vnf_collectors
/
vmware.py
diff --git
a/osm_mon/collector/vnf_collectors/vmware.py
b/osm_mon/collector/vnf_collectors/vmware.py
index
0e76bfd
..
1bc33eb
100644
(file)
--- a/
osm_mon/collector/vnf_collectors/vmware.py
+++ b/
osm_mon/collector/vnf_collectors/vmware.py
@@
-90,14
+90,10
@@
class VMwareCollector(BaseVimCollector):
vim_config = vim_account_info['config']
vim_account['admin_username'] = vim_config['admin_username']
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_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
return vim_account
@@
-188,7
+184,10
@@
class VMwareCollector(BaseVimCollector):
nsr_id = vnfr['nsr-id-ref']
tags = {}
tags['ns_name'] = self.common_db.get_nsr(nsr_id)['name']
nsr_id = vnfr['nsr-id-ref']
tags = {}
tags['ns_name'] = self.common_db.get_nsr(nsr_id)['name']
- tags['project_id'] = vnfr['_admin']['projects_read'][0]
+ if vnfr['_admin']['projects_read']:
+ tags['project_id'] = vnfr['_admin']['projects_read'][0]
+ else:
+ tags['project_id'] = ''
# Fetch the list of all known resources from vROPS.
resource_list = self.vrops.get_vm_resource_list_from_vrops()
# Fetch the list of all known resources from vROPS.
resource_list = self.vrops.get_vm_resource_list_from_vrops()
@@
-201,7
+200,7
@@
class VMwareCollector(BaseVimCollector):
filter(lambda vdu: vdu['id'] == vdur['vdu-id-ref'], vnfd['vdu'])
)
filter(lambda vdu: vdu['id'] == vdur['vdu-id-ref'], vnfd['vdu'])
)
- if 'monitoring-param' not in vdu:
+ if 'monitoring-param
eter
' not in vdu:
continue
resource_uuid = vdur['vim-id']
continue
resource_uuid = vdur['vim-id']
@@
-223,7
+222,7
@@
class VMwareCollector(BaseVimCollector):
if len(vdu_mappings) != 0:
return self.vrops.get_metrics(vdu_mappings=vdu_mappings,
if len(vdu_mappings) != 0:
return self.vrops.get_metrics(vdu_mappings=vdu_mappings,
- monitoring_params=vdu['monitoring-param'],
+ monitoring_params=vdu['monitoring-param
eter
'],
vnfr=vnfr,
tags=tags
)
vnfr=vnfr,
tags=tags
)