Merge "Add floating IP filter to floating IP list command"

This commit is contained in:
Zuul 2019-01-15 07:48:25 +00:00 committed by Gerrit Code Review
commit dd1118e966
3 changed files with 31 additions and 0 deletions

View File

@ -144,6 +144,12 @@ List floating IP(s)
*Network version 2 only*
.. option:: --floating-ip-address <ip-address>
List floating IP(s) according to given floating IP address
*Network version 2 only*
.. option:: --long
List additional fields in output

View File

@ -236,6 +236,12 @@ class ListFloatingIP(common.NetworkAndComputeLister):
help=_("List floating IP(s) according to "
"given fixed IP address")
)
parser.add_argument(
'--floating-ip-address',
metavar='<ip-address>',
help=_("List floating IP(s) according to "
"given floating IP address")
)
parser.add_argument(
'--long',
action='store_true',
@ -316,6 +322,8 @@ class ListFloatingIP(common.NetworkAndComputeLister):
query['port_id'] = port.id
if parsed_args.fixed_ip_address is not None:
query['fixed_ip_address'] = parsed_args.fixed_ip_address
if parsed_args.floating_ip_address is not None:
query['floating_ip_address'] = parsed_args.floating_ip_address
if parsed_args.status:
query['status'] = parsed_args.status
if parsed_args.project is not None:

View File

@ -504,6 +504,23 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
self.assertEqual(self.columns, columns)
self.assertEqual(self.data, list(data))
def test_floating_ip_list_floating_ip_address(self):
arglist = [
'--floating-ip-address', self.floating_ips[0].floating_ip_address,
]
verifylist = [
('floating_ip_address', self.floating_ips[0].floating_ip_address),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
self.network.ips.assert_called_once_with(**{
'floating_ip_address': self.floating_ips[0].floating_ip_address,
})
self.assertEqual(self.columns, columns)
self.assertEqual(self.data, list(data))
def test_floating_ip_list_long(self):
arglist = ['--long', ]
verifylist = [('long', True), ]