compute: Add 'Security Groups' for 'server list'
Add a column with security groups name for --long option on server list. Change-Id: I7062f224e18c3c8ac96a06d7ce97f9fab473bdb9
This commit is contained in:
parent
c9b84106c3
commit
e91e0e001c
openstackclient
@ -2455,6 +2455,9 @@ class ListServer(command.Lister):
|
|||||||
if c in ('Created At', 'created_at'):
|
if c in ('Created At', 'created_at'):
|
||||||
columns += ('created',)
|
columns += ('created',)
|
||||||
column_headers += ('Created At',)
|
column_headers += ('Created At',)
|
||||||
|
if c in ('Security Groups', 'security_groups'):
|
||||||
|
columns += ('security_groups_name',)
|
||||||
|
column_headers += ('Security Groups',)
|
||||||
|
|
||||||
# convert back to tuple
|
# convert back to tuple
|
||||||
column_headers = tuple(column_headers)
|
column_headers = tuple(column_headers)
|
||||||
@ -2559,6 +2562,13 @@ class ListServer(command.Lister):
|
|||||||
else:
|
else:
|
||||||
s.flavor_name = s.flavor['original_name']
|
s.flavor_name = s.flavor['original_name']
|
||||||
|
|
||||||
|
# Add a list with security group name as attribute
|
||||||
|
for s in data:
|
||||||
|
if hasattr(s, 'security_groups'):
|
||||||
|
s.security_groups_name = [x["name"] for x in s.security_groups]
|
||||||
|
else:
|
||||||
|
s.security_groups_name = []
|
||||||
|
|
||||||
table = (
|
table = (
|
||||||
column_headers,
|
column_headers,
|
||||||
(
|
(
|
||||||
@ -2574,6 +2584,7 @@ class ListServer(command.Lister):
|
|||||||
'OS-EXT-STS:power_state': PowerStateColumn,
|
'OS-EXT-STS:power_state': PowerStateColumn,
|
||||||
'networks': format_columns.DictListColumn,
|
'networks': format_columns.DictListColumn,
|
||||||
'metadata': format_columns.DictColumn,
|
'metadata': format_columns.DictColumn,
|
||||||
|
'security_groups_name': format_columns.ListColumn,
|
||||||
},
|
},
|
||||||
) for s in data
|
) for s in data
|
||||||
),
|
),
|
||||||
|
@ -4485,6 +4485,7 @@ class TestServerList(_TestServerList):
|
|||||||
'-c', 'Project ID',
|
'-c', 'Project ID',
|
||||||
'-c', 'User ID',
|
'-c', 'User ID',
|
||||||
'-c', 'Created At',
|
'-c', 'Created At',
|
||||||
|
'-c', 'Security Groups',
|
||||||
'--long'
|
'--long'
|
||||||
]
|
]
|
||||||
verifylist = [
|
verifylist = [
|
||||||
@ -4498,6 +4499,7 @@ class TestServerList(_TestServerList):
|
|||||||
self.assertIn('Project ID', columns)
|
self.assertIn('Project ID', columns)
|
||||||
self.assertIn('User ID', columns)
|
self.assertIn('User ID', columns)
|
||||||
self.assertIn('Created At', columns)
|
self.assertIn('Created At', columns)
|
||||||
|
self.assertIn('Security Groups', columns)
|
||||||
|
|
||||||
def test_server_list_no_name_lookup_option(self):
|
def test_server_list_no_name_lookup_option(self):
|
||||||
self.data = tuple(
|
self.data = tuple(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user