projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolved dashboard issue
[osm/MON.git]
/
osm_mon
/
dashboarder
/
service.py
diff --git
a/osm_mon/dashboarder/service.py
b/osm_mon/dashboarder/service.py
index
2abd6be
..
1e81c8a
100644
(file)
--- a/
osm_mon/dashboarder/service.py
+++ b/
osm_mon/dashboarder/service.py
@@
-66,12
+66,13
@@
class DashboarderService:
# Collect NS IDs for periodical dashboard clean-up
osm_resource_uids.append(nsr_id)
# Check if the NSR's VNFDs contain metrics
# Collect NS IDs for periodical dashboard clean-up
osm_resource_uids.append(nsr_id)
# Check if the NSR's VNFDs contain metrics
- constituent_vnfds = nsr['nsd']['constituent-vnfd']
- for constituent_vnfd in constituent_vnfds:
+ # Only one DF at the moment, support for this feature is comming in the future
+ vnfds_profiles = nsr['nsd']["df"][0]['vnf-profile']
+ for vnf_profile in vnfds_profiles:
try:
try:
- vnfd = self.common_db.get_vnfd_by_
name(constituent_vnfd['vnfd-id-ref
'])
+ vnfd = self.common_db.get_vnfd_by_
id(vnf_profile['vnfd-id
'])
# If there are metrics, create dashboard (if exists)
# If there are metrics, create dashboard (if exists)
- if vnfd and 'monitoring-param
' in vnfd
:
+ if vnfd and 'monitoring-param
eter' in vnfd["vdu"][0]
:
if nsr_id not in dashboard_uids:
nsr_name = nsr['name']
project_id = nsr["_admin"]["projects_read"][0]
if nsr_id not in dashboard_uids:
nsr_name = nsr['name']
project_id = nsr["_admin"]["projects_read"][0]