From c18f2c5caf899f4da2bbce29d383cc0adfeed662 Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Tue, 20 Sep 2011 12:53:47 -0500 Subject: Renaming GET /tokens/{token_id} response container to 'access' Change-Id: I51ab8475ae2911dd45817dac526b339edae0c8c5 --- keystone/logic/types/auth.py | 4 ++-- keystone/test/functional/test_auth.py | 11 ++++++----- keystone/test/functional/test_issue_85.py | 3 ++- keystone/test/functional/test_token.py | 10 +++++----- keystone/test/unit/test_server.py | 10 +++++----- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/keystone/logic/types/auth.py b/keystone/logic/types/auth.py index fa1f4b63..9cb81638 100755 --- a/keystone/logic/types/auth.py +++ b/keystone/logic/types/auth.py @@ -289,7 +289,7 @@ class ValidateData(object): self.user = user def to_xml(self): - dom = etree.Element("auth", + dom = etree.Element("access", xmlns="http://docs.openstack.org/identity/api/v2.0") token = etree.Element("token", @@ -328,6 +328,6 @@ class ValidateData(object): user["roleRefs"] = self.user.role_refs.to_json_values() return json.dumps({ - "auth": { + "access": { "token": token, "user": user}}) diff --git a/keystone/test/functional/test_auth.py b/keystone/test/functional/test_auth.py index d9778883..94e57fb9 100644 --- a/keystone/test/functional/test_auth.py +++ b/keystone/test/functional/test_auth.py @@ -64,11 +64,12 @@ class TestServiceAuthentication(common.FunctionalTestCase): # Admin independently validates the user token r = self.get_token(self.service_token) - self.assertTrue(r.json['auth']['token']['expires']) - self.assertEqual(r.json['auth']['token']['id'], self.service_token) - self.assertEqual(r.json['auth']['user']['id'], self.user['id']) - self.assertEqual(r.json['auth']['user']['username'], self.user['name']) - self.assertEqual(r.json['auth']['user']['roleRefs'], []) + self.assertTrue(r.json['access']['token']['expires']) + self.assertEqual(r.json['access']['token']['id'], self.service_token) + self.assertEqual(r.json['access']['user']['id'], self.user['id']) + self.assertEqual(r.json['access']['user']['username'], + self.user['name']) + self.assertEqual(r.json['access']['user']['roleRefs'], []) def test_get_request_fails(self): """GET /tokens should return a 404 (Github issue #5)""" diff --git a/keystone/test/functional/test_issue_85.py b/keystone/test/functional/test_issue_85.py index 6ffc50b8..d52aa892 100644 --- a/keystone/test/functional/test_issue_85.py +++ b/keystone/test/functional/test_issue_85.py @@ -19,7 +19,8 @@ class TestIssue85(common.FunctionalTestCase): tenant['id']).json['auth']['token']['id'] # Validate and check that token belongs to tenant - tenantid = self.get_token(user_token).json['auth']['token']['tenantId'] + tenantid = self.get_token(user_token).\ + json['access']['token']['tenantId'] self.assertEqual(tenantid, tenant['id']) # Disable tenant diff --git a/keystone/test/functional/test_token.py b/keystone/test/functional/test_token.py index dec45432..867ebef2 100755 --- a/keystone/test/functional/test_token.py +++ b/keystone/test/functional/test_token.py @@ -36,8 +36,8 @@ class ValidateToken(common.FunctionalTestCase): r = self.get_token_belongsto(self.token['id'], self.tenant['id'], assert_status=200) - self.assertIsNotNone(r.json['auth']['user']["roleRefs"]) - self.assertEqual(r.json['auth']['user']["roleRefs"][0]['id'], + self.assertIsNotNone(r.json['access']['user']["roleRefs"]) + self.assertEqual(r.json['access']['user']["roleRefs"][0]['id'], self.role_ref['id']) def test_validate_token_true_using_service_token(self): @@ -45,15 +45,15 @@ class ValidateToken(common.FunctionalTestCase): r = self.get_token_belongsto(self.token['id'], self.tenant['id'], assert_status=200) - self.assertIsNotNone(r.json['auth']['user']["roleRefs"]) - self.assertEqual(r.json['auth']['user']["roleRefs"][0]['id'], + self.assertIsNotNone(r.json['access']['user']["roleRefs"]) + self.assertEqual(r.json['access']['user']["roleRefs"][0]['id'], self.role_ref['id']) def test_validate_token_true_xml(self): r = self.get_token_belongsto(self.token['id'], self.tenant['id'], assert_status=200, headers={'Accept': 'application/xml'}) - self.assertEqual(r.xml.tag, '{%s}auth' % self.xmlns) + self.assertEqual(r.xml.tag, '{%s}access' % self.xmlns) user = r.xml.find('{%s}user' % self.xmlns) self.assertIsNotNone(user) diff --git a/keystone/test/unit/test_server.py b/keystone/test/unit/test_server.py index 904c703e..9ec0dc03 100755 --- a/keystone/test/unit/test_server.py +++ b/keystone/test/unit/test_server.py @@ -53,11 +53,11 @@ class TestServer(unittest.TestCase): self.assertTrue(response.headers['content-type'] == "application/json; charset=UTF-8") dict = json.loads(response.unicode_body) - self.assertTrue(dict['auth']['user']['id'], 'id') - self.assertTrue(dict['auth']['user']['username'], 'username') - self.assertTrue(dict['auth']['user']['tenantId'], '12345') - self.assertTrue(dict['auth']['token']['id'], '2231312') - self.assertTrue(dict['auth']['token']['expires'], + self.assertTrue(dict['access']['user']['id'], 'id') + self.assertTrue(dict['access']['user']['username'], 'username') + self.assertTrue(dict['access']['user']['tenantId'], '12345') + self.assertTrue(dict['access']['token']['id'], '2231312') + self.assertTrue(dict['access']['token']['expires'], datetime.date.today()) def test_get_auth_token(self): -- cgit