Merge "Remove redundant variables from context class"

This commit is contained in:
Zuul 2018-11-08 03:48:53 +00:00 committed by Gerrit Code Review
commit 95d3ec6cea
1 changed files with 0 additions and 15 deletions

View File

@ -24,17 +24,7 @@ def _prop(name):
class RequestContext(oslo_context.RequestContext):
def __init__(self, **kwargs):
self.user_id = kwargs.pop('user_id ', None)
self.project_id = kwargs.pop('project_id ', None)
self.domain_id = kwargs.pop('domain_id ', None)
self.user_domain_id = kwargs.pop('user_domain_id ', None)
self.project_domain_id = kwargs.pop('project_domain_id ', None)
self.project_name = kwargs.pop('project_name', None)
self.domain_name = kwargs.pop('domain_name', None)
self.username = kwargs.pop('username', None)
self.user_domain_name = kwargs.pop('user_domain_name', None)
self.project_domain_name = kwargs.pop('project_domain_name', None)
self.project_tag_name = kwargs.pop('project_tag_name', None)
self.is_delegated_auth = kwargs.pop('is_delegated_auth', False)
@ -48,8 +38,3 @@ class RequestContext(oslo_context.RequestContext):
self.authenticated = kwargs.pop('authenticated', False)
super(RequestContext, self).__init__(**kwargs)
@classmethod
def from_environ(cls, environ, **kwargs):
kwargs.setdefault('request_id', environ.get('openstack.request_id'))
return super(RequestContext, cls).from_environ(environ, **kwargs)