From: Eduardo Sousa <eduardo.sousa@canonical.com>
Date: Thu, 23 May 2019 00:41:18 +0000 (+0100)
Subject: Fixing user ids when listing
X-Git-Tag: v6.0.0~42
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=commitdiff_plain;h=203bad808476ab11c80dbda1bc64a8c1e79d7ec5

Fixing user ids when listing

Change-Id: I5ff3da79503ac53100b9e3da3c2f33975e2da9fe
Signed-off-by: Eduardo Sousa <eduardo.sousa@canonical.com>
---

diff --git a/osm_nbi/authconn_keystone.py b/osm_nbi/authconn_keystone.py
index b0cab0c..9f67450 100644
--- a/osm_nbi/authconn_keystone.py
+++ b/osm_nbi/authconn_keystone.py
@@ -258,10 +258,11 @@ class AuthconnKeystone(Authconn):
             users = self.keystone.users.list()
             users = [{
                 "username": user.name,
-                "_id": user.id
+                "_id": user.id,
+                "id": user.id
             } for user in users if user.name != self.admin_username]
 
-            allowed_fields = ["_id", "username"]
+            allowed_fields = ["_id", "id", "username"]
             for key in filter_q.keys():
                 if key not in allowed_fields:
                     continue
@@ -273,14 +274,16 @@ class AuthconnKeystone(Authconn):
                 projects = self.keystone.projects.list(user=user["_id"])
                 projects = [{
                     "name": project.name,
-                    "_id": project.id
+                    "_id": project.id,
+                    "id": project.id
                 } for project in projects]
 
                 for project in projects:
                     roles = self.keystone.roles.list(user=user["_id"], project=project["_id"])
                     roles = [{
                         "name": role.name,
-                        "_id": role.id
+                        "_id": role.id,
+                        "id": role.id
                     } for role in roles]
                     project["roles"] = roles