Merge "Use 'generate_request_id' func from common code"

This commit is contained in:
Jenkins 2014-10-12 15:59:15 +00:00 committed by Gerrit Code Review
commit fcdcb719b3

View File

@ -18,10 +18,10 @@
"""RequestContext: context for requests that persist through all of manila."""
import copy
import uuid
import six
from manila.openstack.common import context as common_context
from manila.openstack.common import local
from manila.openstack.common import log as logging
from manila.openstack.common import timeutils
@ -31,10 +31,6 @@ from manila import policy
LOG = logging.getLogger(__name__)
def generate_request_id():
return 'req-' + str(uuid.uuid4())
class RequestContext(object):
"""Security context and request information.
@ -84,7 +80,7 @@ class RequestContext(object):
self.service_catalog = []
if not request_id:
request_id = generate_request_id()
request_id = common_context.generate_request_id()
self.request_id = request_id
self.auth_token = auth_token
self.quota_class = quota_class