openstack
/
python-openstackclient
Code Issues Proposed changes

Merge "Add support for showing requested az in output"

This commit is contained in:
Zuul 2024-04-15 13:00:47 +00:00 committed by Gerrit Code Review
parent c99c189ac5 a1f7bd28e6
commit 4d30527659
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openstackclient/compute/v2/server.py
View File

@ -180,6 +180,7 @@ def _prep_server_detail(compute_client, image_client, server, refresh=True):
'updated_at': 'updated',
'user_data': 'OS-EXT-SRV-ATTR:user_data',
'vm_state': 'OS-EXT-STS:vm_state',
'pinned_availability_zone': 'pinned_availability_zone',
}
# Some columns returned by openstacksdk should not be shown because they're
# either irrelevant or duplicates
@ -2752,11 +2753,13 @@ class ListServer(command.Lister):
if parsed_args.long:
columns += (
'availability_zone',
'pinned_availability_zone',
'hypervisor_hostname',
'metadata',
)
column_headers += (
'Availability Zone',
'Pinned Availability Zone',
'Host',
'Properties',
)
@ -2791,6 +2794,12 @@ class ListServer(command.Lister):
if c in ('Availability Zone', "availability_zone"):
columns += ('availability_zone',)
column_headers += ('Availability Zone',)
if c in (
'pinned_availability_zone',
"Pinned Availability Zone",
):
columns += ('Pinned Availability Zone',)
column_headers += ('Pinned Availability Zone',)
if c in ('Host', "host"):
columns += ('hypervisor_hostname',)
column_headers += ('Host',)

8
openstackclient/tests/unit/compute/v2/test_server.py
View File

@ -4644,6 +4644,7 @@ class _TestServerList(TestServer):
'Flavor Name',
'Flavor ID',
'Availability Zone',
'Pinned Availability Zone',
'Host',
'Properties',
)
@ -4785,6 +4786,7 @@ class TestServerList(_TestServerList):
self.flavor.name,
s.flavor['id'],
getattr(s, 'availability_zone'),
getattr(s, 'pinned_availability_zone', ''),
server.HostColumn(getattr(s, 'hypervisor_hostname')),
format_columns.DictColumn(s.metadata),
)
@ -4830,6 +4832,8 @@ class TestServerList(_TestServerList):
'-c',
'Availability Zone',
'-c',
'Pinned Availability Zone',
'-c',
'Host',
'-c',
'Properties',
@ -4852,6 +4856,7 @@ class TestServerList(_TestServerList):
self.assertIn('Image ID', columns)
self.assertIn('Flavor ID', columns)
self.assertIn('Availability Zone', columns)
self.assertIn('Pinned Availability Zone', columns)
self.assertIn('Host', columns)
self.assertIn('Properties', columns)
self.assertCountEqual(columns, set(columns))
@ -5264,6 +5269,7 @@ class TestServerList(_TestServerList):
self.flavor.name,
s.flavor['id'],
getattr(s, 'availability_zone'),
getattr(s, 'pinned_availability_zone', ''),
server.HostColumn(getattr(s, 'hypervisor_hostname')),
format_columns.DictColumn(s.metadata),
)
@ -5318,6 +5324,7 @@ class TestServerList(_TestServerList):
self.flavor.name,
s.flavor['id'],
getattr(s, 'availability_zone'),
getattr(s, 'pinned_availability_zone', ''),
server.HostColumn(getattr(s, 'hypervisor_hostname')),
format_columns.DictColumn(s.metadata),
s.host_status,
@ -5354,6 +5361,7 @@ class TestServerListV273(_TestServerList):
'Image ID',
'Flavor',
'Availability Zone',
'Pinned Availability Zone',
'Host',
'Properties',
)