openstack/glance
Code Issues Proposed changes

Fix logging context to include user_identity

Browse Source 
The user_identity generated created from user, tenant, domain
user_domain and project_domain.
The new domain related values are default to None

Closes-Bug: #1283080

Change-Id: I5e43142afba3492ecf05b65ba24ee70f158f88de
This commit is contained in:
Balazs Gibizer 2014-02-21 16:18:16 +01:00
parent 8762a7b072
commit 765b6c98e0
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
glance/context.py
View File

@ -25,10 +25,13 @@ class RequestContext(object):
accesses the system, as well as additional request information. accesses the system, as well as additional request information.
""" """
user_idt_format = '{user} {tenant} {domain} {user_domain} {p_domain}'
def __init__(self, auth_tok=None, user=None, tenant=None, roles=None, def __init__(self, auth_tok=None, user=None, tenant=None, roles=None,
is_admin=False, read_only=False, show_deleted=False, is_admin=False, read_only=False, show_deleted=False,
owner_is_tenant=True, service_catalog=None, owner_is_tenant=True, service_catalog=None,
policy_enforcer=None): policy_enforcer=None, domain=None, user_domain=None,
project_domain=None):
self.auth_tok = auth_tok self.auth_tok = auth_tok
self.user = user self.user = user
self.tenant = tenant self.tenant = tenant
@ -40,6 +43,9 @@ class RequestContext(object):
self.service_catalog = service_catalog self.service_catalog = service_catalog
self.policy_enforcer = policy_enforcer or policy.Enforcer() self.policy_enforcer = policy_enforcer or policy.Enforcer()
self.is_admin = is_admin self.is_admin = is_admin
self.domain = domain
self.user_domain = user_domain
self.project_domain = project_domain
if not self.is_admin: if not self.is_admin:
self.is_admin = \ self.is_admin = \
self.policy_enforcer.check_is_admin(self) self.policy_enforcer.check_is_admin(self)
@ -50,6 +56,14 @@ class RequestContext(object):
def to_dict(self): def to_dict(self):
# NOTE(ameade): These keys are named to correspond with the default # NOTE(ameade): These keys are named to correspond with the default
# format string for logging the context in openstack common # format string for logging the context in openstack common
user_idt = (
self.user_idt_format.format(user=self.user or '-',
tenant=self.tenant or '-',
domain=self.domain or '-',
user_domain=self.user_domain or '-',
p_domain=self.project_domain or '-'))
return { return {
'request_id': self.request_id, 'request_id': self.request_id,
@ -67,6 +81,7 @@ class RequestContext(object):
'roles': self.roles, 'roles': self.roles,
'auth_token': self.auth_tok, 'auth_token': self.auth_tok,
'service_catalog': self.service_catalog, 'service_catalog': self.service_catalog,
'user_identity': user_idt
} }
@classmethod @classmethod

9
glance/tests/unit/test_context.py
View File

@ -167,3 +167,12 @@ class TestContext(utils.BaseTestCase):
ctx = context.RequestContext() ctx = context.RequestContext()
self.assertTrue(hasattr(local.store, 'context')) self.assertTrue(hasattr(local.store, 'context'))
self.assertEqual(ctx, local.store.context) self.assertEqual(ctx, local.store.context)
def test_user_identity(self):
ctx = context.RequestContext(user="user",
tenant="tenant",
domain="domain",
user_domain="user-domain",
project_domain="project-domain")
self.assertEqual('user tenant domain user-domain project-domain',
ctx.to_dict()["user_identity"])