openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Ensure JSON headers in Auth Requests"

Browse Source
This commit is contained in:
Jenkins
2014-04-14 00:39:08 +00:00
committed by Gerrit Code Review
parent 0ae8e55add 6f427f6368
commit 8bc8275bf3
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystoneclient/auth/identity/v2.py
View File

@@ -71,7 +71,7 @@ class Auth(base.BaseIdentityPlugin):
self.tenant_name = tenant_name self.tenant_name = tenant_name
def get_auth_ref(self, session, **kwargs): def get_auth_ref(self, session, **kwargs):
headers = {} headers = {'Accept': 'application/json'}
url = self.auth_url + '/tokens' url = self.auth_url + '/tokens'
params = {'auth': self.get_auth_data(headers)} params = {'auth': self.get_auth_data(headers)}

2
keystoneclient/auth/identity/v3.py
View File

@@ -66,7 +66,7 @@ class Auth(base.BaseIdentityPlugin):
return '%s/auth/tokens' % self.auth_url.rstrip('/') return '%s/auth/tokens' % self.auth_url.rstrip('/')
def get_auth_ref(self, session, **kwargs): def get_auth_ref(self, session, **kwargs):
headers = {} headers = {'Accept': 'application/json'}
body = {'auth': {'identity': {}}} body = {'auth': {'identity': {}}}
ident = body['auth']['identity'] ident = body['auth']['identity']

4
keystoneclient/tests/auth/test_identity_v2.py
View File

@@ -109,6 +109,8 @@ class V2IdentityPlugin(utils.TestCase):
req = {'auth': {'passwordCredentials': {'username': self.TEST_USER, req = {'auth': {'passwordCredentials': {'username': self.TEST_USER,
'password': self.TEST_PASS}}} 'password': self.TEST_PASS}}}
self.assertRequestBodyIs(json=req) self.assertRequestBodyIs(json=req)
self.assertRequestHeaderEqual('Content-Type', 'application/json')
self.assertRequestHeaderEqual('Accept', 'application/json')
self.assertEqual(s.auth.auth_ref.auth_token, self.TEST_TOKEN) self.assertEqual(s.auth.auth_ref.auth_token, self.TEST_TOKEN)
@httpretty.activate @httpretty.activate
@@ -135,6 +137,8 @@ class V2IdentityPlugin(utils.TestCase):
req = {'auth': {'token': {'id': 'foo'}}} req = {'auth': {'token': {'id': 'foo'}}}
self.assertRequestBodyIs(json=req) self.assertRequestBodyIs(json=req)
self.assertRequestHeaderEqual('x-Auth-Token', 'foo') self.assertRequestHeaderEqual('x-Auth-Token', 'foo')
self.assertRequestHeaderEqual('Content-Type', 'application/json')
self.assertRequestHeaderEqual('Accept', 'application/json')
self.assertEqual(s.auth.auth_ref.auth_token, self.TEST_TOKEN) self.assertEqual(s.auth.auth_ref.auth_token, self.TEST_TOKEN)
def test_missing_auth_params(self): def test_missing_auth_params(self):

5
keystoneclient/tests/auth/test_identity_v3.py
View File

@@ -165,6 +165,8 @@ class V3IdentityPlugin(utils.TestCase):
'password': self.TEST_PASS}}}}} 'password': self.TEST_PASS}}}}}
self.assertRequestBodyIs(json=req) self.assertRequestBodyIs(json=req)
self.assertRequestHeaderEqual('Content-Type', 'application/json')
self.assertRequestHeaderEqual('Accept', 'application/json')
self.assertEqual(s.auth.auth_ref.auth_token, self.TEST_TOKEN) self.assertEqual(s.auth.auth_ref.auth_token, self.TEST_TOKEN)
@httpretty.activate @httpretty.activate
@@ -213,6 +215,9 @@ class V3IdentityPlugin(utils.TestCase):
'token': {'id': self.TEST_TOKEN}}}} 'token': {'id': self.TEST_TOKEN}}}}
self.assertRequestBodyIs(json=req) self.assertRequestBodyIs(json=req)
self.assertRequestHeaderEqual('Content-Type', 'application/json')
self.assertRequestHeaderEqual('Accept', 'application/json')
self.assertEqual(s.auth.auth_ref.auth_token, self.TEST_TOKEN) self.assertEqual(s.auth.auth_ref.auth_token, self.TEST_TOKEN)
def test_missing_auth_params(self): def test_missing_auth_params(self):