openstack/python-openstackclient
Code Issues Proposed changes

Merge "Add "fields" parameter to ListSecurityGroup query"

Browse Source
This commit is contained in:
Zuul 2020-03-24 14:07:02 +00:00 committed by Gerrit Code Review
commit a0d7f98f18
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/network/v2/security_group.py
View File

@ -202,6 +202,7 @@ class DeleteSecurityGroup(common.NetworkAndComputeDelete):
# the OSC minimum requirements include SDK 1.0. # the OSC minimum requirements include SDK 1.0.
class ListSecurityGroup(common.NetworkAndComputeLister): class ListSecurityGroup(common.NetworkAndComputeLister):
_description = _("List security groups") _description = _("List security groups")
FIELDS_TO_RETRIEVE = ['id', 'name', 'description', 'project_id', 'tags']
def update_parser_network(self, parser): def update_parser_network(self, parser):
if not self.is_docs_build: if not self.is_docs_build:
@ -251,7 +252,8 @@ class ListSecurityGroup(common.NetworkAndComputeLister):
filters['project_id'] = project_id filters['project_id'] = project_id
_tag.get_tag_filtering_args(parsed_args, filters) _tag.get_tag_filtering_args(parsed_args, filters)
data = client.security_groups(**filters) data = client.security_groups(fields=self.FIELDS_TO_RETRIEVE,
**filters)
columns = ( columns = (
"ID", "ID",

17
openstackclient/tests/unit/network/v2/test_security_group_network.py
View File

@ -285,7 +285,8 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.network.security_groups.assert_called_once_with() self.network.security_groups.assert_called_once_with(
fields=security_group.ListSecurityGroup.FIELDS_TO_RETRIEVE)
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertListItemEqual(self.data, list(data)) self.assertListItemEqual(self.data, list(data))
@ -300,7 +301,8 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.network.security_groups.assert_called_once_with() self.network.security_groups.assert_called_once_with(
fields=security_group.ListSecurityGroup.FIELDS_TO_RETRIEVE)
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertListItemEqual(self.data, list(data)) self.assertListItemEqual(self.data, list(data))
@ -316,7 +318,9 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
filters = {'tenant_id': project.id, 'project_id': project.id} filters = {
'tenant_id': project.id, 'project_id': project.id,
'fields': security_group.ListSecurityGroup.FIELDS_TO_RETRIEVE}
self.network.security_groups.assert_called_once_with(**filters) self.network.security_groups.assert_called_once_with(**filters)
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
@ -336,7 +340,9 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
filters = {'tenant_id': project.id, 'project_id': project.id} filters = {
'tenant_id': project.id, 'project_id': project.id,
'fields': security_group.ListSecurityGroup.FIELDS_TO_RETRIEVE}
self.network.security_groups.assert_called_once_with(**filters) self.network.security_groups.assert_called_once_with(**filters)
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
@ -362,7 +368,8 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
**{'tags': 'red,blue', **{'tags': 'red,blue',
'any_tags': 'red,green', 'any_tags': 'red,green',
'not_tags': 'orange,yellow', 'not_tags': 'orange,yellow',
'not_any_tags': 'black,white'} 'not_any_tags': 'black,white',
'fields': security_group.ListSecurityGroup.FIELDS_TO_RETRIEVE}
) )
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertEqual(self.data, list(data)) self.assertEqual(self.data, list(data))