projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing role id serialization
[osm/NBI.git]
/
osm_nbi
/
authconn.py
diff --git
a/osm_nbi/authconn.py
b/osm_nbi/authconn.py
index
90f0096
..
df5c700
100644
(file)
--- a/
osm_nbi/authconn.py
+++ b/
osm_nbi/authconn.py
@@
-34,8
+34,8
@@
class AuthException(Exception):
Authentication error.
"""
def __init__(self, message, http_code=HTTPStatus.UNAUTHORIZED):
Authentication error.
"""
def __init__(self, message, http_code=HTTPStatus.UNAUTHORIZED):
+ super(AuthException, self).__init__(message)
self.http_code = http_code
self.http_code = http_code
- Exception.__init__(self, message)
class AuthconnException(Exception):
class AuthconnException(Exception):
@@
-43,7
+43,7
@@
class AuthconnException(Exception):
Common and base class Exception for all authconn exceptions.
"""
def __init__(self, message, http_code=HTTPStatus.UNAUTHORIZED):
Common and base class Exception for all authconn exceptions.
"""
def __init__(self, message, http_code=HTTPStatus.UNAUTHORIZED):
-
Exception
.__init__(message)
+
super(AuthconnException, self)
.__init__(message)
self.http_code = http_code
self.http_code = http_code
@@
-52,7
+52,7
@@
class AuthconnConnectionException(AuthconnException):
Connectivity error with Auth backend.
"""
def __init__(self, message, http_code=HTTPStatus.BAD_GATEWAY):
Connectivity error with Auth backend.
"""
def __init__(self, message, http_code=HTTPStatus.BAD_GATEWAY):
-
AuthconnException.__init__(self,
message, http_code)
+
super(AuthconnConnectionException, self).__init__(
message, http_code)
class AuthconnNotSupportedException(AuthconnException):
class AuthconnNotSupportedException(AuthconnException):
@@
-60,7
+60,7
@@
class AuthconnNotSupportedException(AuthconnException):
The request is not supported by the Auth backend.
"""
def __init__(self, message, http_code=HTTPStatus.NOT_IMPLEMENTED):
The request is not supported by the Auth backend.
"""
def __init__(self, message, http_code=HTTPStatus.NOT_IMPLEMENTED):
-
AuthconnException.__init__(self,
message, http_code)
+
super(AuthconnNotSupportedException, self).__init__(
message, http_code)
class AuthconnNotImplementedException(AuthconnException):
class AuthconnNotImplementedException(AuthconnException):
@@
-68,7
+68,7
@@
class AuthconnNotImplementedException(AuthconnException):
The method is not implemented by the Auth backend.
"""
def __init__(self, message, http_code=HTTPStatus.NOT_IMPLEMENTED):
The method is not implemented by the Auth backend.
"""
def __init__(self, message, http_code=HTTPStatus.NOT_IMPLEMENTED):
-
AuthconnException.__init__(self,
message, http_code)
+
super(AuthconnNotImplementedException, self).__init__(
message, http_code)
class AuthconnOperationException(AuthconnException):
class AuthconnOperationException(AuthconnException):
@@
-76,7
+76,7
@@
class AuthconnOperationException(AuthconnException):
The operation executed failed.
"""
def __init__(self, message, http_code=HTTPStatus.INTERNAL_SERVER_ERROR):
The operation executed failed.
"""
def __init__(self, message, http_code=HTTPStatus.INTERNAL_SERVER_ERROR):
-
AuthconnException.__init__(self,
message, http_code)
+
super(AuthconnOperationException, self).__init__(
message, http_code)
class Authconn:
class Authconn:
@@
-136,7
+136,7
@@
class Authconn:
"""
raise AuthconnNotImplementedException("Should have implemented this")
"""
raise AuthconnNotImplementedException("Should have implemented this")
- def get_project_list(self, token):
+ def get_
user_
project_list(self, token):
"""
Get all the projects associated with a user.
"""
Get all the projects associated with a user.
@@
-145,7
+145,7
@@
class Authconn:
"""
raise AuthconnNotImplementedException("Should have implemented this")
"""
raise AuthconnNotImplementedException("Should have implemented this")
- def get_role_list(self, token):
+ def get_
user_
role_list(self, token):
"""
Get role list for a scoped project.
"""
Get role list for a scoped project.
@@
-175,15
+175,23
@@
class Authconn:
"""
raise AuthconnNotImplementedException("Should have implemented this")
"""
raise AuthconnNotImplementedException("Should have implemented this")
- def delete_user(self, user):
+ def delete_user(self, user
_id
):
"""
Delete user.
"""
Delete user.
- :param user
: username
.
+ :param user
_id: user identifier
.
:raises AuthconnOperationException: if user deletion failed.
"""
raise AuthconnNotImplementedException("Should have implemented this")
:raises AuthconnOperationException: if user deletion failed.
"""
raise AuthconnNotImplementedException("Should have implemented this")
+ def get_user_list(self, filter_q={}):
+ """
+ Get user list.
+
+ :param filter_q: dictionary to filter user list.
+ :return: returns a list of users.
+ """
+
def create_role(self, role):
"""
Create a role.
def create_role(self, role):
"""
Create a role.
@@
-193,15
+201,23
@@
class Authconn:
"""
raise AuthconnNotImplementedException("Should have implemented this")
"""
raise AuthconnNotImplementedException("Should have implemented this")
- def delete_role(self, role):
+ def delete_role(self, role
_id
):
"""
Delete a role.
"""
Delete a role.
- :param role
: role name
.
+ :param role
_id: role identifier
.
:raises AuthconnOperationException: if user deletion failed.
"""
raise AuthconnNotImplementedException("Should have implemented this")
:raises AuthconnOperationException: if user deletion failed.
"""
raise AuthconnNotImplementedException("Should have implemented this")
+ def get_role_list(self):
+ """
+ Get all the roles.
+
+ :return: list of roles
+ """
+ raise AuthconnNotImplementedException("Should have implemented this")
+
def create_project(self, project):
"""
Create a project.
def create_project(self, project):
"""
Create a project.
@@
-211,15
+227,24
@@
class Authconn:
"""
raise AuthconnNotImplementedException("Should have implemented this")
"""
raise AuthconnNotImplementedException("Should have implemented this")
- def delete_project(self, project):
+ def delete_project(self, project
_id
):
"""
Delete a project.
"""
Delete a project.
- :param project
: project name
.
+ :param project
_id: project identifier
.
:raises AuthconnOperationException: if project deletion failed.
"""
raise AuthconnNotImplementedException("Should have implemented this")
:raises AuthconnOperationException: if project deletion failed.
"""
raise AuthconnNotImplementedException("Should have implemented this")
+ def get_project_list(self, filter_q={}):
+ """
+ Get all the projects.
+
+ :param filter_q: dictionary to filter project list.
+ :return: list of projects
+ """
+ raise AuthconnNotImplementedException("Should have implemented this")
+
def assign_role_to_user(self, user, project, role):
"""
Assigning a role to a user in a project.
def assign_role_to_user(self, user, project, role):
"""
Assigning a role to a user in a project.