From e37c54c794006f70b34f933248269083b3f47b41 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Wed, 7 Nov 2018 15:31:09 +0200 Subject: [PATCH] Remove redundant variables from context class This cleans up the context class by removing variables that are already avialable from oslo.context. Change-Id: Ib102eb372d347d3d91c6ceca43889f5edc33e6be --- keystone/common/context.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/keystone/common/context.py b/keystone/common/context.py index 36cbfd1d1e..6c44ce50ea 100644 --- a/keystone/common/context.py +++ b/keystone/common/context.py @@ -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)