summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-09-20 19:22:31 +0000
committerGerrit Code Review <review@openstack.org>2013-09-20 19:22:31 +0000
commit334159b2ddd678c92c0a71920ead76ac6775dcb6 (patch)
tree845a9725d4b46b93c2a05e94ed38e51bdf95f88d
parent74667a7c8e3dca50beb5647874fbe6168f064ec6 (diff)
parenta49c876acc8843f58be83b200c11047dc69f549a (diff)
downloadoslo-context-334159b2ddd678c92c0a71920ead76ac6775dcb6.tar.gz
Merge "Adding instance_uuid to context and log"
-rw-r--r--openstack/common/context.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/openstack/common/context.py b/openstack/common/context.py
index 81772bc..02433ea 100644
--- a/openstack/common/context.py
+++ b/openstack/common/context.py
@@ -40,13 +40,15 @@ class RequestContext(object):
"""
def __init__(self, auth_token=None, user=None, tenant=None, is_admin=False,
- read_only=False, show_deleted=False, request_id=None):
+ read_only=False, show_deleted=False, request_id=None,
+ instance_uuid=None):
self.auth_token = auth_token
self.user = user
self.tenant = tenant
self.is_admin = is_admin
self.read_only = read_only
self.show_deleted = show_deleted
+ self.instance_uuid = instance_uuid
if not request_id:
request_id = generate_request_id()
self.request_id = request_id
@@ -58,7 +60,8 @@ class RequestContext(object):
'read_only': self.read_only,
'show_deleted': self.show_deleted,
'auth_token': self.auth_token,
- 'request_id': self.request_id}
+ 'request_id': self.request_id,
+ 'instance_uuid': self.instance_uuid}
def get_admin_context(show_deleted=False):