Revision 2b5a42f2
| b/kamaki/cli/commands/cyclades.py | ||
|---|---|---|
| 204 | 204 |
|
| 205 | 205 |
def _add_user_name(self, servers): |
| 206 | 206 |
uuids = self._uuids2usernames(list(set( |
| 207 |
[srv['user_id'] for srv in servers] + |
|
| 208 |
[srv['tenant_id'] for srv in servers]))) |
|
| 207 |
[srv['user_id'] for srv in servers]))) |
|
| 209 | 208 |
for srv in servers: |
| 210 | 209 |
srv['user_id'] += ' (%s)' % uuids[srv['user_id']] |
| 211 |
srv['tenant_id'] += ' (%s)' % uuids[srv['tenant_id']] |
|
| 212 | 210 |
return servers |
| 213 | 211 |
|
| 214 | 212 |
def _apply_common_filters(self, servers): |
| ... | ... | |
| 955 | 953 |
user_id, tenant_id, uuids = net['user_id'], net['tenant_id'], [] |
| 956 | 954 |
if user_id: |
| 957 | 955 |
uuids.append(user_id) |
| 958 |
if tenant_id: |
|
| 959 |
uuids.append(tenant_id) |
|
| 960 |
if uuids: |
|
| 956 |
if uuids or tenant_id: |
|
| 961 | 957 |
usernames = self._uuids2usernames(uuids) |
| 962 | 958 |
if user_id: |
| 963 | 959 |
net['user_id'] += ' (%s)' % usernames[user_id] |
| 964 |
if tenant_id: |
|
| 965 |
net['tenant_id'] += ' (%s)' % usernames[tenant_id] |
|
| b/kamaki/cli/commands/image.py | ||
|---|---|---|
| 737 | 737 |
@errors.plankton.id |
| 738 | 738 |
def _run(self, image_id): |
| 739 | 739 |
image = self.client.get_image_details(image_id) |
| 740 |
uuids = [image['user_id'], image['tenant_id']]
|
|
| 740 |
uuids = [image['user_id']] |
|
| 741 | 741 |
usernames = self._uuids2usernames(uuids) |
| 742 | 742 |
image['user_id'] += ' (%s)' % usernames[image['user_id']] |
| 743 |
image['tenant_id'] += ' (%s)' % usernames[image['tenant_id']] |
|
| 744 | 743 |
self._print(image, self.print_dict) |
| 745 | 744 |
|
| 746 | 745 |
def main(self, image_id): |
Also available in: Unified diff