openstack/python-keystoneclient
Code Issues Proposed changes

Fix role_names call from V3 AccessInfo

Browse Source 
This was probably initially written against an incorrect test token.

Change-Id: I3e1eb0cb207864dbadb01a477b180058902bb0cd
Closes-Bug: #1282410
This commit is contained in:
Jamie Lennox
2014-02-20 16:53:33 +10:00
parent c0165b1a88
commit a1278112ca
2 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystoneclient/access.py
View File

@@ -530,7 +530,7 @@ class AccessInfoV3(AccessInfo):
@property @property
def role_names(self): def role_names(self):
return [r['name'] for r in self['user'].get('roles', [])] return [r['name'] for r in self.get('roles', [])]
@property @property
def username(self): def username(self):

64
keystoneclient/tests/v3/client_fixtures.py
View File

@@ -126,23 +126,23 @@ DOMAIN_SCOPED_TOKEN = {
}, },
'id': 'c4da488862bd435c9e6c0275a0d0e49a', 'id': 'c4da488862bd435c9e6c0275a0d0e49a',
'name': 'exampleuser', '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': { 'domain': {
'id': '8e9283b7ba0b1038840c3842058b86ab', 'id': '8e9283b7ba0b1038840c3842058b86ab',
'name': 'anotherdomain' 'name': 'anotherdomain'
@@ -245,23 +245,23 @@ PROJECT_SCOPED_TOKEN = {
}, },
'id': 'c4da488862bd435c9e6c0275a0d0e49a', 'id': 'c4da488862bd435c9e6c0275a0d0e49a',
'name': 'exampleuser', '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': { 'project': {
'domain': { 'domain': {
'id': '4e6893b7ba0b4006840c3845660b86ed', 'id': '4e6893b7ba0b4006840c3845660b86ed',