diff --git a/keystoneclient/auth/identity/v2.py b/keystoneclient/auth/identity/v2.py index db9562de0..1a6564f14 100644 --- a/keystoneclient/auth/identity/v2.py +++ b/keystoneclient/auth/identity/v2.py @@ -71,7 +71,7 @@ class Auth(base.BaseIdentityPlugin): self.tenant_name = tenant_name def get_auth_ref(self, session, **kwargs): - headers = {} + headers = {'Accept': 'application/json'} url = self.auth_url + '/tokens' params = {'auth': self.get_auth_data(headers)} diff --git a/keystoneclient/auth/identity/v3.py b/keystoneclient/auth/identity/v3.py index e49564e08..93299251c 100644 --- a/keystoneclient/auth/identity/v3.py +++ b/keystoneclient/auth/identity/v3.py @@ -66,7 +66,7 @@ class Auth(base.BaseIdentityPlugin): return '%s/auth/tokens' % self.auth_url.rstrip('/') def get_auth_ref(self, session, **kwargs): - headers = {} + headers = {'Accept': 'application/json'} body = {'auth': {'identity': {}}} ident = body['auth']['identity'] diff --git a/keystoneclient/tests/auth/test_identity_v2.py b/keystoneclient/tests/auth/test_identity_v2.py index 16278e2c9..237291199 100644 --- a/keystoneclient/tests/auth/test_identity_v2.py +++ b/keystoneclient/tests/auth/test_identity_v2.py @@ -109,6 +109,8 @@ class V2IdentityPlugin(utils.TestCase): req = {'auth': {'passwordCredentials': {'username': self.TEST_USER, 'password': self.TEST_PASS}}} 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) @httpretty.activate @@ -135,6 +137,8 @@ class V2IdentityPlugin(utils.TestCase): req = {'auth': {'token': {'id': 'foo'}}} self.assertRequestBodyIs(json=req) 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) def test_missing_auth_params(self): diff --git a/keystoneclient/tests/auth/test_identity_v3.py b/keystoneclient/tests/auth/test_identity_v3.py index efb2d39d0..ca51ef7c2 100644 --- a/keystoneclient/tests/auth/test_identity_v3.py +++ b/keystoneclient/tests/auth/test_identity_v3.py @@ -165,6 +165,8 @@ class V3IdentityPlugin(utils.TestCase): 'password': self.TEST_PASS}}}}} 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) @httpretty.activate @@ -213,6 +215,9 @@ class V3IdentityPlugin(utils.TestCase): 'token': {'id': self.TEST_TOKEN}}}} 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) def test_missing_auth_params(self):