openstack/trove
Code Issues Proposed changes

Updates oslo.context

Browse Source 
This change is needed for uuidutils removal in Trove

13eb01c Adding domain to context and log
12bcdb7 Remove vim header
bdabd51 Remove uuidutils imports in oslo modules

Change-Id: I3b4eead93fc2d12ccb6a0837f9100b784b25d8dd
This commit is contained in:
Zhongyue Luo 2013-12-30 13:04:18 +08:00
parent 2413373aef
commit 0aaaeb24d4
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
trove/openstack/common/context.py
View File

@ -1,5 +1,3 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2011 OpenStack Foundation. # Copyright 2011 OpenStack Foundation.
# All Rights Reserved. # All Rights Reserved.
# #
@ -23,44 +21,64 @@ context or provide additional information in their specific WSGI pipeline.
""" """
import itertools import itertools
import uuid
from trove.openstack.common import uuidutils
def generate_request_id(): def generate_request_id():
return 'req-%s' % uuidutils.generate_uuid() return 'req-%s' % str(uuid.uuid4())
class RequestContext(object): class RequestContext(object):
""" """Helper class to represent useful information about a request context.
Stores information about the security context under which the user Stores information about the security context under which the user
accesses the system, as well as additional request information. accesses the system, as well as additional request information.
""" """
def __init__(self, auth_token=None, user=None, tenant=None, is_admin=False, user_idt_format = '{user} {tenant} {domain} {user_domain} {p_domain}'
read_only=False, show_deleted=False, request_id=None):
def __init__(self, auth_token=None, user=None, tenant=None, domain=None,
user_domain=None, project_domain=None, is_admin=False,
read_only=False, show_deleted=False, request_id=None,
instance_uuid=None):
self.auth_token = auth_token self.auth_token = auth_token
self.user = user self.user = user
self.tenant = tenant self.tenant = tenant
self.domain = domain
self.user_domain = user_domain
self.project_domain = project_domain
self.is_admin = is_admin self.is_admin = is_admin
self.read_only = read_only self.read_only = read_only
self.show_deleted = show_deleted self.show_deleted = show_deleted
self.instance_uuid = instance_uuid
if not request_id: if not request_id:
request_id = generate_request_id() request_id = generate_request_id()
self.request_id = request_id self.request_id = request_id
def to_dict(self): def to_dict(self):
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 {'user': self.user, return {'user': self.user,
'tenant': self.tenant, 'tenant': self.tenant,
'domain': self.domain,
'user_domain': self.user_domain,
'project_domain': self.project_domain,
'is_admin': self.is_admin, 'is_admin': self.is_admin,
'read_only': self.read_only, 'read_only': self.read_only,
'show_deleted': self.show_deleted, 'show_deleted': self.show_deleted,
'auth_token': self.auth_token, 'auth_token': self.auth_token,
'request_id': self.request_id} 'request_id': self.request_id,
'instance_uuid': self.instance_uuid,
'user_identity': user_idt}
def get_admin_context(show_deleted="no"): def get_admin_context(show_deleted=False):
context = RequestContext(None, context = RequestContext(None,
tenant=None, tenant=None,
is_admin=True, is_admin=True,