projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug 1435 multiple admin and service dashboards
[osm/MON.git]
/
osm_mon
/
collector
/
vnf_collectors
/
vio.py
diff --git
a/osm_mon/collector/vnf_collectors/vio.py
b/osm_mon/collector/vnf_collectors/vio.py
index
b59f02d
..
e84f5e7
100644
(file)
--- a/
osm_mon/collector/vnf_collectors/vio.py
+++ b/
osm_mon/collector/vnf_collectors/vio.py
@@
-55,7
+55,7
@@
class VIOCollector(BaseVimCollector):
if vnfr['_admin']['projects_read']:
tags['project_id'] = vnfr['_admin']['projects_read'][0]
else:
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()
# Fetch the list of all known resources from vROPS.
resource_list = self.vrops.get_vm_resource_list_from_vrops()
@@
-68,7
+68,7
@@
class VIOCollector(BaseVimCollector):
vdu = next(
filter(lambda vdu: vdu['id'] == vdur['vdu-id-ref'], vnfd['vdu'])
)
vdu = next(
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
vim_id = vdur['vim-id']
continue
vim_id = vdur['vim-id']
@@
-84,7
+84,7
@@
class VIOCollector(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
)