projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug 710. Fix session used to delete ns, nsi when terminated
[osm/NBI.git]
/
osm_nbi
/
authconn_keystone.py
diff --git
a/osm_nbi/authconn_keystone.py
b/osm_nbi/authconn_keystone.py
index
54442c8
..
7f59270
100644
(file)
--- a/
osm_nbi/authconn_keystone.py
+++ b/
osm_nbi/authconn_keystone.py
@@
-247,31
+247,43
@@
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:
users = self.keystone.users.list()
users = [{
"username": user.name,
:return: returns a list of users.
"""
try:
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]
} for user in users if user.name != self.admin_username]
+ allowed_fields = ["_id", "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 = [{
"name": project.name,
for user in users:
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,
} 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
} for role in roles]
project["roles"] = roles
@@
-286,8
+298,7
@@
class AuthconnKeystone(Authconn):
"""
Get role list.
"""
Get role list.
- :return: returns the list of roles for the user in that project. If
- the token is unscoped it returns None.
+ :return: returns the list of roles.
"""
try:
roles_list = self.keystone.roles.list()
"""
try:
roles_list = self.keystone.roles.list()
@@
-338,10
+349,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
+363,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")