fix(dashboarder): dashboarder bug with sol006. Bug 1303

Change-Id: I393385d55c9a19b171aad85bbf43b3474260c548
Signed-off-by: bravof <fbravo@whitestack.com>

diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh
index 0e50f25..14ec658 100644 (file)
--- 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 (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
-            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]