From 96b90202fe570177c0c4a6c61766de1a059e88b3 Mon Sep 17 00:00:00 2001
From: Serg Melikyan <smelikyan@mirantis.com>
Date: Wed, 27 Mar 2013 18:45:30 +0400
Subject: [PATCH] Fix name of the variable
---
portas/portas/api/middleware/context.py | 3 ++-
portas/portas/context.py | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/portas/portas/api/middleware/context.py b/portas/portas/api/middleware/context.py
index fc81c5c..b7ff31d 100644
--- a/portas/portas/api/middleware/context.py
+++ b/portas/portas/api/middleware/context.py
@@ -72,7 +72,8 @@ class ContextMiddleware(BaseContextMiddleware):
'user': req.headers.get('X-User-Id'),
'tenant': req.headers.get('X-Tenant-Id'),
'roles': roles,
- 'auth_tok': req.headers.get('X-Auth-Token', deprecated_token),
+ 'auth_token': req.headers.get('X-Auth-Token',
+ deprecated_token),
'service_catalog': service_catalog,
'session': req.headers.get('X-Configuration-Session')
}
diff --git a/portas/portas/context.py b/portas/portas/context.py
index c541829..9db108d 100644
--- a/portas/portas/context.py
+++ b/portas/portas/context.py
@@ -24,10 +24,10 @@ class RequestContext(object):
accesses the system, as well as additional request information.
"""
- def __init__(self, auth_tok=None, user=None, tenant=None,
+ def __init__(self, auth_token=None, user=None, tenant=None,
roles=None, service_catalog=None, session=None):
- self.auth_tok = auth_tok
+ self.auth_token = auth_token
self.user = user
self.tenant = tenant
self.roles = roles or []
@@ -51,7 +51,7 @@ class RequestContext(object):
'project_id': self.tenant,
'roles': self.roles,
- 'auth_token': self.auth_tok,
+ 'auth_token': self.auth_token,
'session': self.session
}