commit 1d71df519a27b90cf88c11b1b14227928db2db1f
author Gianpietro Lavado <glavado@whitestack.com> Mon Dec 02 17:41:20 2019 +0000
committer Gianpietro Lavado <glavado@whitestack.com> Mon Dec 02 18:19:30 2019 +0000
tree 99b631a4f6628dcfa7dc0dabc7bd64471a85c41a
parent 1b7145f6d0d3c0090b7a33b4972861ad9ed48631

Minor fixes for MON Evaluator & Dashboarder

Change-Id: I1f2b1f786809aa84e2ee2cddbf401a03e504ff47
Signed-off-by: Gianpietro Lavado <glavado@whitestack.com>

osm_mon/dashboarder/service.py

diff --git a/osm_mon/dashboarder/service.py b/osm_mon/dashboarder/service.py
index 10dc0f7..74812b5 100644
--- a/osm_mon/dashboarder/service.py
+++ b/osm_mon/dashboarder/service.py
@@ -25,6 +25,7 @@
 from osm_mon.core.common_db import CommonDbClient
 from osm_mon.core.config import Config
 import osm_mon.dashboarder.backends.grafana as grafana
+from osm_mon import __path__ as mon_path
 
 log = logging.getLogger(__name__)
 
@@ -46,7 +47,7 @@
             project_id = project['_id']
             # Collect Project IDs for periodical dashboard clean-up
             osm_resource_uids.append(project_id)
-            dashboard_path = '/mon/osm_mon/dashboarder/templates/project_scoped.json'
+            dashboard_path = '{}/dashboarder/templates/project_scoped.json'.format(mon_path)
             if project_id not in dashboard_uids:
                 project_name = project['name']
                 grafana.create_dashboard(project_id, project_name,
@@ -60,7 +61,7 @@
         nsrs = self.common_db.get_nsrs()
         for nsr in nsrs:
             nsr_id = nsr['_id']
-            dashboard_path = '/mon/osm_mon/dashboarder/templates/ns_scoped.json'
+            dashboard_path = '{}/dashboarder/templates/ns_scoped.json'.format(mon_path)
             # Collect NS IDs for periodical dashboard clean-up
             osm_resource_uids.append(nsr_id)
             # Check if the NSR's VNFDs contain metrics