Merge "Pop off user/tenant kwargs in RequestContext init"
This commit is contained in:
commit
e382d71711
@ -54,12 +54,14 @@ class RequestContext(object):
|
||||
:param kwargs: Extra arguments that might be present, but we ignore
|
||||
because they possibly came in from older rpc messages.
|
||||
"""
|
||||
user = kwargs.pop('user', None)
|
||||
tenant = kwargs.pop('tenant', None)
|
||||
if kwargs:
|
||||
LOG.warn(_LW('Arguments dropped when creating context: %s'),
|
||||
str(kwargs))
|
||||
|
||||
self.user_id = user_id
|
||||
self.project_id = project_id
|
||||
self.user_id = user_id or user
|
||||
self.project_id = project_id or tenant
|
||||
self.roles = roles or []
|
||||
self.is_admin = is_admin
|
||||
if self.is_admin is None:
|
||||
|
@ -74,7 +74,12 @@ class ContextTestCase(test.TestCase):
|
||||
c = context.RequestContext('user',
|
||||
'project',
|
||||
extra_arg1='meow',
|
||||
extra_arg2='wuff')
|
||||
extra_arg2='wuff',
|
||||
user='user',
|
||||
tenant='project')
|
||||
self.assertTrue(c)
|
||||
self.assertIn("'extra_arg1': 'meow'", info['log_msg'])
|
||||
self.assertIn("'extra_arg2': 'wuff'", info['log_msg'])
|
||||
# user and tenant kwargs get popped off before we log anything
|
||||
self.assertNotIn("'user': 'user'", info['log_msg'])
|
||||
self.assertNotIn("'tenant': 'project'", info['log_msg'])
|
||||
|
Loading…
Reference in New Issue
Block a user