From 12fda453522dc7686d1842c0ec1380e319143604 Mon Sep 17 00:00:00 2001 From: bravof Date: Thu, 17 Dec 2020 10:21:22 -0300 Subject: [PATCH] fix(dashboarder): dashboarder bug with sol006. Bug 1303 Change-Id: I393385d55c9a19b171aad85bbf43b3474260c548 Signed-off-by: bravof --- docker/scripts/start.sh | 3 ++- osm_mon/dashboarder/service.py | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh index 0e50f25..14ec658 100644 --- a/docker/scripts/start.sh +++ b/docker/scripts/start.sh @@ -23,4 +23,5 @@ osm-mon-server & osm-mon-evaluator & -osm-mon-collector \ No newline at end of file +osm-mon-collector & +osm-mon-dashboarder \ No newline at end of file diff --git a/osm_mon/dashboarder/service.py b/osm_mon/dashboarder/service.py index 2abd6be..902f25f 100644 --- 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 - 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: - 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 vnfd and 'monitoring-param' in vnfd: + if vnfd and 'monitoring-parameter' in vnfd: if nsr_id not in dashboard_uids: nsr_name = nsr['name'] project_id = nsr["_admin"]["projects_read"][0] -- 2.25.1