openstack/python-openstackclient
Code Issues Proposed changes

Merge "L3 conntrack helper: Use singular name consistently"

Browse Source
This commit is contained in:
Zuul 2021-08-26 08:14:22 +00:00 committed by Gerrit Code Review
commit d9c556e69a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstackclient/network/v2/l3_conntrack_helper.py
View File

@ -99,8 +99,8 @@ class DeleteConntrackHelper(command.Command):
help=_('Router that the conntrack helper belong to') help=_('Router that the conntrack helper belong to')
) )
parser.add_argument( parser.add_argument(
'conntrack_helper_ids', 'conntrack_helper_id',
metavar='<conntrack-helper-ids>', metavar='<conntrack-helper-id>',
nargs='+', nargs='+',
help=_('The ID of the conntrack helper(s) to delete') help=_('The ID of the conntrack helper(s) to delete')
) )
@ -112,7 +112,7 @@ class DeleteConntrackHelper(command.Command):
result = 0 result = 0
router = client.find_router(parsed_args.router, ignore_missing=False) router = client.find_router(parsed_args.router, ignore_missing=False)
for ct_helper in parsed_args.conntrack_helper_ids: for ct_helper in parsed_args.conntrack_helper_id:
try: try:
client.delete_conntrack_helper( client.delete_conntrack_helper(
ct_helper, router.id, ignore_missing=False) ct_helper, router.id, ignore_missing=False)
@ -123,7 +123,7 @@ class DeleteConntrackHelper(command.Command):
{'ct_helper': ct_helper, 'e': e}) {'ct_helper': ct_helper, 'e': e})
if result > 0: if result > 0:
total = len(parsed_args.conntrack_helper_ids) total = len(parsed_args.conntrack_helper_id)
msg = (_("%(result)s of %(total)s L3 conntrack helpers failed " msg = (_("%(result)s of %(total)s L3 conntrack helpers failed "
"to delete.") % {'result': result, 'total': total}) "to delete.") % {'result': result, 'total': total})
raise exceptions.CommandError(msg) raise exceptions.CommandError(msg)

4
openstackclient/tests/unit/network/v2/test_l3_conntrack_helper.py
View File

@ -127,7 +127,7 @@ class TestDeleteL3ConntrackHelper(TestConntrackHelper):
self.ct_helper.id self.ct_helper.id
] ]
verifylist = [ verifylist = [
('conntrack_helper_ids', [self.ct_helper.id]), ('conntrack_helper_id', [self.ct_helper.id]),
('router', self.ct_helper.router_id), ('router', self.ct_helper.router_id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -143,7 +143,7 @@ class TestDeleteL3ConntrackHelper(TestConntrackHelper):
self.ct_helper.id self.ct_helper.id
] ]
verifylist = [ verifylist = [
('conntrack_helper_ids', [self.ct_helper.id]), ('conntrack_helper_id', [self.ct_helper.id]),
('router', self.router.id), ('router', self.router.id),
] ]
self.network.delete_conntrack_helper.side_effect = Exception( self.network.delete_conntrack_helper.side_effect = Exception(