Revision 3950a864 kamaki/clients/astakos/__init__.py
b/kamaki/clients/astakos/__init__.py | ||
---|---|---|
69 | 69 |
r = self.authenticate(token) |
70 | 70 |
finally: |
71 | 71 |
self.token = token_bu |
72 |
return r['serviceCatalog'] |
|
72 |
return r['access']['serviceCatalog']
|
|
73 | 73 |
|
74 | 74 |
def get_service_details(self, service_type, token=None): |
75 | 75 |
""" |
... | ... | |
120 | 120 |
"""list cached users information""" |
121 | 121 |
r = [] |
122 | 122 |
for k, v in self._cache.items(): |
123 |
r.append(dict(v['user'])) |
|
123 |
r.append(dict(v['access']['user']))
|
|
124 | 124 |
r[-1].update(dict(auth_token=k)) |
125 | 125 |
return r |
126 | 126 |
|
... | ... | |
134 | 134 |
r = self.authenticate(token) |
135 | 135 |
finally: |
136 | 136 |
self.token = token_bu |
137 |
return r['user'] |
|
137 |
return r['access']['user']
|
|
138 | 138 |
|
139 | 139 |
def term(self, key, token=None): |
140 | 140 |
"""Get (cached) term, from user credentials""" |
Also available in: Unified diff