diff options
| author | Jamie Lennox <jamielennox@redhat.com> | 2014-02-20 16:53:33 +1000 |
|---|---|---|
| committer | Jamie Lennox <jamielennox@redhat.com> | 2014-02-20 16:53:33 +1000 |
| commit | a1278112cad2e2d4f83cbb950fa1054aeb2690e0 (patch) | |
| tree | 386549d109ae9695a6dc1ed98d347a6109302a42 | |
| parent | c0165b1a88317aced61e8c98d34f078c30bd15b4 (diff) | |
| download | python-keystoneclient-a1278112cad2e2d4f83cbb950fa1054aeb2690e0.tar.gz | |
Fix role_names call from V3 AccessInfo
This was probably initially written against an incorrect test token.
Change-Id: I3e1eb0cb207864dbadb01a477b180058902bb0cd
Closes-Bug: #1282410
| -rw-r--r-- | keystoneclient/access.py | 2 | ||||
| -rw-r--r-- | keystoneclient/tests/v3/client_fixtures.py | 64 |
2 files changed, 33 insertions, 33 deletions
diff --git a/keystoneclient/access.py b/keystoneclient/access.py index 50b7a2a..250d8ed 100644 --- a/keystoneclient/access.py +++ b/keystoneclient/access.py @@ -530,7 +530,7 @@ class AccessInfoV3(AccessInfo): @property def role_names(self): - return [r['name'] for r in self['user'].get('roles', [])] + return [r['name'] for r in self.get('roles', [])] @property def username(self): diff --git a/keystoneclient/tests/v3/client_fixtures.py b/keystoneclient/tests/v3/client_fixtures.py index 08dd267..32958b4 100644 --- a/keystoneclient/tests/v3/client_fixtures.py +++ b/keystoneclient/tests/v3/client_fixtures.py @@ -126,23 +126,23 @@ DOMAIN_SCOPED_TOKEN = { }, 'id': 'c4da488862bd435c9e6c0275a0d0e49a', 'name': 'exampleuser', - 'roles': [ - { - "id": "76e72a", - "links": { - "self": "http://identity:35357/v3/roles/76e72a" - }, - "name": "admin" - }, - { - "id": "f4f392", - "links": { - "self": "http://identity:35357/v3/roles/f4f392" - }, - "name": "member" - } - ], }, + 'roles': [ + { + "id": "76e72a", + "links": { + "self": "http://identity:35357/v3/roles/76e72a" + }, + "name": "admin" + }, + { + "id": "f4f392", + "links": { + "self": "http://identity:35357/v3/roles/f4f392" + }, + "name": "member" + } + ], 'domain': { 'id': '8e9283b7ba0b1038840c3842058b86ab', 'name': 'anotherdomain' @@ -245,23 +245,23 @@ PROJECT_SCOPED_TOKEN = { }, 'id': 'c4da488862bd435c9e6c0275a0d0e49a', 'name': 'exampleuser', - 'roles': [ - { - "id": "76e72a", - "links": { - "self": "http://identity:35357/v3/roles/76e72a" - }, - "name": "admin" - }, - { - "id": "f4f392", - "links": { - "self": "http://identity:35357/v3/roles/f4f392" - }, - "name": "member" - } - ], }, + 'roles': [ + { + "id": "76e72a", + "links": { + "self": "http://identity:35357/v3/roles/76e72a" + }, + "name": "admin" + }, + { + "id": "f4f392", + "links": { + "self": "http://identity:35357/v3/roles/f4f392" + }, + "name": "member" + } + ], 'project': { 'domain': { 'id': '4e6893b7ba0b4006840c3845660b86ed', |