openstack
/
keystone
Code Issues Proposed changes

Pass a request to controllers instead of a context 

Some 'context' have not been changed to 'request',
this patch fix that.

Change-Id: I30c97c0be4141767543e04f6a954d158d2fb26e6
This commit is contained in:
Jeremy Liu 2016-10-29 21:19:08 +08:00
parent 093d14fa91
commit e49a95ff6e
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
keystone/assignment/controllers.py
View File

@ -309,11 +309,11 @@ class RoleV3(controller.V3Controller):
return False
return self._is_domain_role(role)
def create_role_wrapper(self, context, role):
def create_role_wrapper(self, request, role):
if self._is_domain_role(role):
return self.create_domain_role(context, role=role)
return self.create_domain_role(request, role=role)
else:
return self.create_role(context, role=role)
return self.create_role(request, role=role)
@controller.protected()
def create_role(self, request, role):
@ -339,11 +339,11 @@ class RoleV3(controller.V3Controller):
def list_domain_roles(self, request, filters):
return self._list_roles(request, filters)
def get_role_wrapper(self, context, role_id):
def get_role_wrapper(self, request, role_id):
if self._is_domain_role_target(role_id):
return self.get_domain_role(context, role_id=role_id)
return self.get_domain_role(request, role_id=role_id)
else:
return self.get_role(context, role_id=role_id)
return self.get_role(request, role_id=role_id)
@controller.protected()
def get_role(self, request, role_id):
@ -353,15 +353,15 @@ class RoleV3(controller.V3Controller):
def get_domain_role(self, request, role_id):
return self._get_role(request, role_id)
def update_role_wrapper(self, context, role_id, role):
def update_role_wrapper(self, request, role_id, role):
# Since we don't allow you change whether a role is global or domain
# specific, we can ignore the new update attributes and just look at
# the existing role.
if self._is_domain_role_target(role_id):
return self.update_domain_role(
context, role_id=role_id, role=role)
request, role_id=role_id, role=role)
else:
return self.update_role(context, role_id=role_id, role=role)
return self.update_role(request, role_id=role_id, role=role)
@controller.protected()
def update_role(self, request, role_id, role):
@ -373,11 +373,11 @@ class RoleV3(controller.V3Controller):
validation.lazy_validate(schema.role_update, role)
return self._update_role(request, role_id, role)
def delete_role_wrapper(self, context, role_id):
def delete_role_wrapper(self, request, role_id):
if self._is_domain_role_target(role_id):
return self.delete_domain_role(context, role_id=role_id)
return self.delete_domain_role(request, role_id=role_id)
else:
return self.delete_role(context, role_id=role_id)
return self.delete_role(request, role_id=role_id)
@controller.protected()
def delete_role(self, request, role_id):

4
keystone/catalog/controllers.py
View File

@ -208,7 +208,7 @@ class RegionV3(controller.V3Controller):
collection_name = 'regions'
member_name = 'region'
def create_region_with_id(self, context, region_id, region):
def create_region_with_id(self, request, region_id, region):
"""Create a region with a user-specified ID.
This method is unprotected because it depends on ``self.create_region``
@ -221,7 +221,7 @@ class RegionV3(controller.V3Controller):
'url_id': region_id,
'ref_id': region['id']})
region['id'] = region_id
return self.create_region(context, region)
return self.create_region(request, region)
@controller.protected()
def create_region(self, request, region):

4
keystone/federation/controllers.py
View File

@ -408,14 +408,14 @@ class Auth(auth_controllers.Auth):
status=(http_client.OK, http_client.responses[http_client.OK]),
headers=headers)
def create_ecp_assertion(self, context, auth):
def create_ecp_assertion(self, request, auth):
"""Exchange a scoped token for an ECP assertion.
:param auth: Dictionary that contains a token and service provider ID
:returns: ECP Assertion based on properties from the token
"""
validation.lazy_validate(schema.saml_create, auth)
t = self._create_base_saml_assertion(context, auth)
t = self._create_base_saml_assertion(request.context_dict, auth)
(saml_assertion, service_provider) = t
relay_state_prefix = service_provider['relay_state_prefix']