projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding filter to ProjectTopicAuth
[osm/NBI.git]
/
osm_nbi
/
authconn_keystone.py
diff --git
a/osm_nbi/authconn_keystone.py
b/osm_nbi/authconn_keystone.py
index
54442c8
..
b0cab0c
100644
(file)
--- a/
osm_nbi/authconn_keystone.py
+++ b/
osm_nbi/authconn_keystone.py
@@
-247,10
+247,11
@@
class AuthconnKeystone(Authconn):
self.logger.exception("Error during user deletion using keystone")
raise AuthconnOperationException("Error during user deletion using Keystone")
self.logger.exception("Error during user deletion using keystone")
raise AuthconnOperationException("Error during user deletion using Keystone")
- def get_user_list(self):
+ def get_user_list(self
, filter_q={}
):
"""
Get user list.
"""
Get user list.
+ :param filter_q: dictionary to filter user list.
:return: returns a list of users.
"""
try:
:return: returns a list of users.
"""
try:
@@
-260,6
+261,14
@@
class AuthconnKeystone(Authconn):
"_id": user.id
} for user in users if user.name != self.admin_username]
"_id": user.id
} for user in users if user.name != self.admin_username]
+ allowed_fields = ["_id", "username"]
+ for key in filter_q.keys():
+ if key not in allowed_fields:
+ continue
+
+ users = [user for user in users
+ if filter_q[key] == user[key]]
+
for user in users:
projects = self.keystone.projects.list(user=user["_id"])
projects = [{
for user in users:
projects = self.keystone.projects.list(user=user["_id"])
projects = [{
@@
-338,10
+347,11
@@
class AuthconnKeystone(Authconn):
self.logger.exception("Error during role deletion using keystone")
raise AuthconnOperationException("Error during role deletion using Keystone")
self.logger.exception("Error during role deletion using keystone")
raise AuthconnOperationException("Error during role deletion using Keystone")
- def get_project_list(self):
+ def get_project_list(self
, filter_q={}
):
"""
Get all the projects.
"""
Get all the projects.
+ :param filter_q: dictionary to filter project list.
:return: list of projects
"""
try:
:return: list of projects
"""
try:
@@
-351,6
+361,14
@@
class AuthconnKeystone(Authconn):
"_id": project.id
} for project in projects if project.name != self.admin_project]
"_id": project.id
} for project in projects if project.name != self.admin_project]
+ allowed_fields = ["_id", "name"]
+ for key in filter_q.keys():
+ if key not in allowed_fields:
+ continue
+
+ projects = [project for project in projects
+ if filter_q[key] == project[key]]
+
return projects
except ClientException:
self.logger.exception("Error during user project listing using keystone")
return projects
except ClientException:
self.logger.exception("Error during user project listing using keystone")