diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-10-28 20:56:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-10-28 20:56:38 +0000 |
| commit | 9655cde434deb633a761d2ece6324d2a3bbb60f9 (patch) | |
| tree | 830c754f9c6e599cb43fd54a27f8f4a626db6045 | |
| parent | 043715e95cd206ddef2d3f23bb4d183359bf1784 (diff) | |
| parent | ac9e400de98e198d37591bfd7a08da2a7b3aa45c (diff) | |
| download | keystone-9655cde434deb633a761d2ece6324d2a3bbb60f9.tar.gz keystone-9655cde434deb633a761d2ece6324d2a3bbb60f9.tar.xz keystone-9655cde434deb633a761d2ece6324d2a3bbb60f9.zip | |
Merge "Fixes LP882760.Changes to return TenantId properly as part of roles.Additional tests to support the same."
| -rwxr-xr-x | keystone/logic/service.py | 4 | ||||
| -rw-r--r-- | keystone/test/functional/test_auth.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/keystone/logic/service.py b/keystone/logic/service.py index ec11cc6f..b4e3bd4c 100755 --- a/keystone/logic/service.py +++ b/keystone/logic/service.py @@ -519,12 +519,12 @@ class IdentityService(object): for drole_ref in drole_refs: drole = api.ROLE.get(drole_ref.role_id) ts.append(Role(drole_ref.role_id, drole.name, - None, drole_ref.tenant_id)) + drole.desc, None, drole_ref.tenant_id)) drole_refs = api.ROLE.ref_get_all_global_roles(duser.id) for drole_ref in drole_refs: drole = api.ROLE.get(drole_ref.role_id) ts.append(Role(drole_ref.role_id, drole.name, - None, drole_ref.tenant_id)) + drole.desc, None, drole_ref.tenant_id)) user = auth.User(duser.id, duser.name, None, None, Roles(ts, [])) diff --git a/keystone/test/functional/test_auth.py b/keystone/test/functional/test_auth.py index 6f1be303..dab20478 100644 --- a/keystone/test/functional/test_auth.py +++ b/keystone/test/functional/test_auth.py @@ -149,6 +149,9 @@ class TestServiceAuthentication(common.FunctionalTestCase): self.assertEqual(scoped['token']['tenant']['id'], tenant['id']) self.assertEqual(scoped['token']['tenant']['name'], tenant['name']) + self.assertEqual(scoped['user']['roles'][0]['id'], role['id']) + self.assertEqual(scoped['user']['roles'][0]['name'], role['name']) + self.assertEqual(scoped['user']['roles'][0]['tenantId'], tenant['id']) # And an admin should be able to validate that our new token is scoped r = self.validate_token(scoped['token']['id'], tenant['id']) |