Fix for bug 1414, bug 1435 & bug 1438 - Multi-tenancy with keystone as backend
Change-Id: Ifd154f5ddb75897209c2281c96087840432fb110
Signed-off-by: palsus <subhankar.pal@aricent.com>
diff --git a/osm_mon/dashboarder/service.py b/osm_mon/dashboarder/service.py
index 32128c2..0dd3d90 100644
--- a/osm_mon/dashboarder/service.py
+++ b/osm_mon/dashboarder/service.py
@@ -68,7 +68,10 @@
dashboard_path = '{}/dashboarder/templates/project_scoped.json'.format(mon_path[0])
if project_id not in dashboard_uids:
project_name = project['name']
- self.grafana.create_grafana_folders(project_name)
+ if project_name != "admin":
+ # Create project folder in Grafana only if user is not admin.
+ # Admin user's dashboard will be created in default folder
+ self.grafana.create_grafana_folders(project_name)
self.grafana.create_dashboard(project_id, project_name,
dashboard_path)
log.debug('Created dashboard for Project: %s', project_id)
@@ -95,8 +98,20 @@
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"]
+ try:
+ # Get project details from commondb
+ project_details = self.common_db.get_project(project_id)
+ project_name = project_details["name"]
+ except Exception as e:
+ # Project not found in commondb
+ if self.keystone:
+ # Serach project in keystone
+ for project in projects:
+ if project_id == project['_id']:
+ project_name = project["name"]
+ else:
+ log.info('Project %s not found', project_id)
+ log.debug('Exception %s' % e)
self.grafana.create_dashboard(nsr_id, nsr_name,
dashboard_path, project_name)
log.debug('Created dashboard for NS: %s', nsr_id)
@@ -121,8 +136,19 @@
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"]
+ try:
+ # Get user details from commondb
+ user = self.common_db.get_user_by_id(userid)
+ user_name = user["username"]
+ except Exception as e:
+ # User not found in commondb
+ if self.keystone:
+ # Serach user in keystone
+ user = self.keystone.getUserById(userid)
+ user_name = user.name
+ else:
+ log.info('User %s not found', userid)
+ log.debug('Exception %s' % e)
proj_list = []
for project in project_data:
proj_list.append(project["project"])