diff options
| author | Zuul <zuul@review.opendev.org> | 2022-07-05 14:07:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-07-05 14:07:34 +0000 |
| commit | 1c97e1495573ea44de9b48ea83d7c8fe6096cc9b (patch) | |
| tree | 9c5b79c91ec7cfc26e5e31e95f1a881bd4e398b6 /openstackclient/compute | |
| parent | f76a40771a84b21d3a3ee5aa0ae49fcf46198016 (diff) | |
| parent | 0873e7580eceab07c3be0824d2ea4163491f8d6e (diff) | |
| download | python-openstackclient-1c97e1495573ea44de9b48ea83d7c8fe6096cc9b.tar.gz | |
Merge "compute: Show flavor in 'server list' with API >= 2.47" into stable/xena
Diffstat (limited to 'openstackclient/compute')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 438d43f9..60e2572d 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -2303,21 +2303,28 @@ class ListServer(command.Lister): columns += ('image_name',) column_headers += ('Image',) - if parsed_args.long: - columns += ( - 'flavor_name', - 'flavor_id', - ) - column_headers += ( - 'Flavor Name', - 'Flavor ID', - ) + # microversion 2.47 puts the embedded flavor into the server response + # body but omits the id, so if not present we just expose the original + # flavor name in the output + if compute_client.api_version >= api_versions.APIVersion('2.47'): + columns += ('flavor_name',) + column_headers += ('Flavor',) else: - if parsed_args.no_name_lookup: - columns += ('flavor_id',) + if parsed_args.long: + columns += ( + 'flavor_name', + 'flavor_id', + ) + column_headers += ( + 'Flavor Name', + 'Flavor ID', + ) else: - columns += ('flavor_name',) - column_headers += ('Flavor',) + if parsed_args.no_name_lookup: + columns += ('flavor_id',) + else: + columns += ('flavor_name',) + column_headers += ('Flavor',) if parsed_args.long: columns += ( @@ -2441,18 +2448,13 @@ class ListServer(command.Lister): s.image_name = IMAGE_STRING_FOR_BFV s.image_id = IMAGE_STRING_FOR_BFV - if 'id' in s.flavor: + if compute_client.api_version < api_versions.APIVersion('2.47'): flavor = flavors.get(s.flavor['id']) if flavor: s.flavor_name = flavor.name s.flavor_id = s.flavor['id'] else: - # TODO(mriedem): Fix this for microversion >= 2.47 where the - # flavor is embedded in the server response without the id. - # We likely need to drop the Flavor ID column in that case if - # --long is specified. - s.flavor_name = '' - s.flavor_id = '' + s.flavor_name = s.flavor['original_name'] table = ( column_headers, |