diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-20 05:17:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-20 05:17:53 +0000 |
| commit | b9daff23b933ba7b5acd637362ab114df3ce3908 (patch) | |
| tree | df0cbcd0b6d47414362028fa256125e82e4d05a3 /openstackclient/compute/v2 | |
| parent | 6f2d6063ff36ffeb0741efce412fec77e83d7979 (diff) | |
| parent | 2689984ba71fa0be25d2368277f33f2fb5c41266 (diff) | |
| download | python-openstackclient-b9daff23b933ba7b5acd637362ab114df3ce3908.tar.gz | |
Merge "Fix column names for server list --no-name-lookup"
Diffstat (limited to 'openstackclient/compute/v2')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index cb520d62..a991ed45 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -1060,26 +1060,33 @@ class ListServer(command.Lister): 'OS-EXT-AZ:availability_zone', 'OS-EXT-SRV-ATTR:host', ] - elif parsed_args.no_name_lookup: - columns = ( - 'ID', - 'Name', - 'Status', - 'Image ID', - 'Flavor ID', - ) - column_headers = tuple(columns) - mixed_case_fields = [] - else: - columns = ( + if parsed_args.no_name_lookup: + columns = ( + 'ID', + 'Name', + 'Status', + 'Networks', + 'Image ID', + 'Flavor ID', + ) + else: + columns = ( + 'ID', + 'Name', + 'Status', + 'Networks', + 'Image Name', + 'Flavor Name', + ) + column_headers = ( 'ID', 'Name', 'Status', 'Networks', - 'Image Name', + 'Image', + 'Flavor', ) - column_headers = tuple(columns) mixed_case_fields = [] marker_id = None |