X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fdashboarder%2Fservice.py;h=2abd6bebb7e0c29e4d038adf93a17ee43c328549;hb=85a9185db3248f1e3f20c8edad95ab77b8ee989c;hp=9f184d26cca809b0bea7e08de584df71339bd2b3;hpb=396648b6eab42dcabdec1cef131618971dc64fbe;p=osm%2FMON.git

diff --git a/osm_mon/dashboarder/service.py b/osm_mon/dashboarder/service.py
index 9f184d2..2abd6be 100644
--- a/osm_mon/dashboarder/service.py
+++ b/osm_mon/dashboarder/service.py
@@ -71,11 +71,14 @@ class DashboarderService:
                 try:
                     vnfd = self.common_db.get_vnfd_by_name(constituent_vnfd['vnfd-id-ref'])
                     # If there are metrics, create dashboard (if exists)
-                    if 'monitoring-param' in vnfd:
+                    if vnfd and 'monitoring-param' in vnfd:
                         if nsr_id not in dashboard_uids:
                             nsr_name = nsr['name']
+                            project_id = nsr["_admin"]["projects_read"][0]
+                            project_details = self.common_db.get_project(project_id)
+                            project_name = project_details["name"]
                             self.grafana.create_dashboard(nsr_id, nsr_name,
-                                                          dashboard_path)
+                                                          dashboard_path, project_name)
                             log.debug('Created dashboard for NS: %s', nsr_id)
                         else:
                             log.debug('Dashboard already exists')
@@ -93,3 +96,29 @@ class DashboarderService:
                 log.debug('Deleted obsolete dashboard: %s', dashboard_uid)
             else:
                 log.debug('All dashboards in use')
+
+    def create_grafana_user(self, user):
+        self.grafana.create_grafana_users(user)
+
+    def create_grafana_team_member(self, project_data, userid):
+        user = self.common_db.get_user_by_id(userid)
+        user_name = user["username"]
+        proj_list = []
+        for project in project_data:
+            proj_list.append(project["project"])
+        for proj in project_data:
+            role_obj = self.common_db.get_role_by_name(proj["role"])
+            is_admin = role_obj["permissions"].get("admin")
+            self.grafana.create_grafana_teams_members(proj["project"], user_name, is_admin, proj_list)
+
+    def create_grafana_team(self, team_name):
+        self.grafana.create_grafana_teams(team_name)
+
+    def delete_grafana_user(self, user_name):
+        self.grafana.delete_grafana_users(user_name)
+
+    def delete_grafana_team(self, project_name):
+        self.grafana.delete_grafana_team(project_name)
+
+    def update_grafana_team(self, project_new_name, project_old_name):
+        self.grafana.update_grafana_teams(project_new_name, project_old_name)