openstack/deb-python-keystoneclient
Code Issues Proposed changes

Merge "Use v2.0 api by default in auth_token middleware"

Browse Source
This commit is contained in:
Jenkins
2013-03-14 20:20:00 +00:00
committed by Gerrit Code Review
parent 9a653566c4 692d97b85a
commit 0e9e340102
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystoneclient/middleware/auth_token.py
View File

@@ -211,7 +211,7 @@ opts = [
] ]
CONF.register_opts(opts, group='keystone_authtoken') CONF.register_opts(opts, group='keystone_authtoken')
LIST_OF_VERSIONS_TO_ATTEMPT = ['v3.0', 'v2.0'] LIST_OF_VERSIONS_TO_ATTEMPT = ['v2.0', 'v3.0']
def will_expire_soon(expiry): def will_expire_soon(expiry):

3
tests/test_auth_token_middleware.py
View File

@@ -1338,6 +1338,7 @@ class v3AuthTokenMiddlewareTest(AuthTokenMiddlewareTest):
'revoked_token_hash': REVOKED_v3_TOKEN_HASH 'revoked_token_hash': REVOKED_v3_TOKEN_HASH
} }
super(v3AuthTokenMiddlewareTest, self).setUp( super(v3AuthTokenMiddlewareTest, self).setUp(
auth_version='v3.0',
fake_app=v3FakeApp, fake_app=v3FakeApp,
fake_http=v3FakeHTTPConnection, fake_http=v3FakeHTTPConnection,
token_dict=token_dict, token_dict=token_dict,
@@ -1370,7 +1371,7 @@ class v3AuthTokenMiddlewareTest(AuthTokenMiddlewareTest):
v3FakeHTTPConnection.last_requested_url) v3FakeHTTPConnection.last_requested_url)
def test_domain_scoped_uuid_request(self): def test_domain_scoped_uuid_request(self):
# Modify items comapred to default token for a domain scope # Modify items compared to default token for a domain scope
delta_expected_env = { delta_expected_env = {
'HTTP_X_DOMAIN_ID': 'domain_id1', 'HTTP_X_DOMAIN_ID': 'domain_id1',
'HTTP_X_DOMAIN_NAME': 'domain_name1', 'HTTP_X_DOMAIN_NAME': 'domain_name1',