python-openstackclient 9.0.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

openstackclient/tests/unit/network/v2/taas/{test_osc_tap_flow.py → test_tap_flow.py}

@@ -77,13 +77,9 @@ class TestCreateTapFlow(network_fakes.TestNetworkV2):
                 'direction': 'BOTH',
             },
         )
-        self.app.client_manager.network.create_tap_flow.return_value = (
-            fake_tap_flow
-        )
-        self.app.client_manager.network.find_port.return_value = fake_port
-        self.app.client_manager.network.find_tap_service.return_value = (
-            fake_tap_service
-        )
+        self.network_client.create_tap_flow.return_value = fake_tap_flow
+        self.network_client.find_port.return_value = fake_port
+        self.network_client.find_tap_service.return_value = fake_tap_service
         arg_list = [
             '--name',
             fake_tap_flow['name'],
@@ -103,8 +99,7 @@ class TestCreateTapFlow(network_fakes.TestNetworkV2):
 
         parsed_args = self.check_parser(self.cmd, arg_list, verify_list)
         columns, data = self.cmd.take_action(parsed_args)
-        mock_create_t_f = self.app.client_manager.network.create_tap_flow
-        mock_create_t_f.assert_called_once_with(
+        self.network_client.create_tap_flow.assert_called_once_with(
             **{
                 'name': fake_tap_flow['name'],
                 'source_port': fake_tap_flow['source_port'],
@@ -129,7 +124,7 @@ class TestListTapFlow(network_fakes.TestNetworkV2):
         fake_tap_flows = list(
             sdk_fakes.generate_fake_resources(_tap_flow.TapFlow, count=2)
         )
-        self.app.client_manager.network.tap_flows.return_value = fake_tap_flows
+        self.network_client.tap_flows.return_value = fake_tap_flows
         arg_list = []
         verify_list = []
 
@@ -137,7 +132,7 @@ class TestListTapFlow(network_fakes.TestNetworkV2):
 
         headers, data = self.cmd.take_action(parsed_args)
 
-        self.app.client_manager.network.tap_flows.assert_called_once()
+        self.network_client.tap_flows.assert_called_once()
         self.assertEqual(headers, list(headers_long))
         self.assertCountEqual(
             list(data),
@@ -151,7 +146,7 @@ class TestListTapFlow(network_fakes.TestNetworkV2):
 class TestDeleteTapFlow(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
-        self.app.client_manager.network.find_tap_flow.side_effect = (
+        self.network_client.find_tap_flow.side_effect = (
             lambda name_or_id, ignore_missing: _tap_flow.TapFlow(id=name_or_id)
         )
         self.cmd = osc_tap_flow.DeleteTapFlow(self.app, None)
@@ -171,8 +166,9 @@ class TestDeleteTapFlow(network_fakes.TestNetworkV2):
 
         result = self.cmd.take_action(parsed_args)
 
-        mock_delete_tap_flow = self.app.client_manager.network.delete_tap_flow
-        mock_delete_tap_flow.assert_called_once_with(fake_tap_flow['id'])
+        self.network_client.delete_tap_flow.assert_called_once_with(
+            fake_tap_flow['id']
+        )
         self.assertIsNone(result)
 
 
@@ -190,7 +186,7 @@ class TestShowTapFlow(network_fakes.TestNetworkV2):
 
     def setUp(self):
         super().setUp()
-        self.app.client_manager.network.find_tap_flow.side_effect = (
+        self.network_client.find_tap_flow.side_effect = (
             lambda name_or_id, ignore_missing: _tap_flow.TapFlow(id=name_or_id)
         )
         self.cmd = osc_tap_flow.ShowTapFlow(self.app, None)
@@ -198,9 +194,7 @@ class TestShowTapFlow(network_fakes.TestNetworkV2):
     def test_show_tap_flow(self):
         """Test Show tap flow."""
         fake_tap_flow = sdk_fakes.generate_fake_resource(_tap_flow.TapFlow)
-        self.app.client_manager.network.get_tap_flow.return_value = (
-            fake_tap_flow
-        )
+        self.network_client.get_tap_flow.return_value = fake_tap_flow
         arg_list = [
             fake_tap_flow['id'],
         ]
@@ -212,7 +206,7 @@ class TestShowTapFlow(network_fakes.TestNetworkV2):
 
         headers, data = self.cmd.take_action(parsed_args)
 
-        self.app.client_manager.network.get_tap_flow.assert_called_once_with(
+        self.network_client.get_tap_flow.assert_called_once_with(
             fake_tap_flow['id']
         )
         self.assertEqual(self.columns, headers)
@@ -245,7 +239,7 @@ class TestUpdateTapFlow(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
         self.cmd = osc_tap_flow.UpdateTapFlow(self.app, None)
-        self.app.client_manager.network.find_tap_flow.side_effect = (
+        self.network_client.find_tap_flow.side_effect = (
             lambda name_or_id, ignore_missing: _tap_flow.TapFlow(id=name_or_id)
         )
 
@@ -255,9 +249,7 @@ class TestUpdateTapFlow(network_fakes.TestNetworkV2):
         new_tap_flow = copy.deepcopy(fake_tap_flow)
         new_tap_flow['name'] = self._new_name
 
-        self.app.client_manager.network.update_tap_flow.return_value = (
-            new_tap_flow
-        )
+        self.network_client.update_tap_flow.return_value = new_tap_flow
 
         arg_list = [
             fake_tap_flow['id'],
@@ -270,7 +262,8 @@ class TestUpdateTapFlow(network_fakes.TestNetworkV2):
         columns, data = self.cmd.take_action(parsed_args)
         attrs = {'name': self._new_name}
 
-        mock_update_t_f = self.app.client_manager.network.update_tap_flow
-        mock_update_t_f.assert_called_once_with(new_tap_flow['id'], **attrs)
+        self.network_client.update_tap_flow.assert_called_once_with(
+            new_tap_flow['id'], **attrs
+        )
         self.assertEqual(self.columns, columns)
         self.assertEqual(_get_data(new_tap_flow, self.columns), data)

openstackclient/tests/unit/network/v2/taas/{test_osc_tap_mirror.py → test_tap_mirror.py}

@@ -64,11 +64,9 @@ class TestCreateTapMirror(network_fakes.TestNetworkV2):
         fake_tap_mirror = sdk_fakes.generate_fake_resource(
             tap_mirror.TapMirror, **{'port_id': port_id, 'directions': 'IN=99'}
         )
-        self.app.client_manager.network.create_tap_mirror.return_value = (
-            fake_tap_mirror
-        )
-        self.app.client_manager.network.find_port.return_value = fake_port
-        self.app.client_manager.network.find_tap_mirror.side_effect = (
+        self.network_client.create_tap_mirror.return_value = fake_tap_mirror
+        self.network_client.find_port.return_value = fake_port
+        self.network_client.find_tap_mirror.side_effect = (
             lambda _, name_or_id: {'id': name_or_id}
         )
         arg_list = [
@@ -96,13 +94,10 @@ class TestCreateTapMirror(network_fakes.TestNetworkV2):
         ]
 
         parsed_args = self.check_parser(self.cmd, arg_list, verify_list)
-        self.app.client_manager.network.find_tap_mirror.return_value = (
-            fake_tap_mirror
-        )
+        self.network_client.find_tap_mirror.return_value = fake_tap_mirror
 
         columns, data = self.cmd.take_action(parsed_args)
-        create_tap_m_mock = self.app.client_manager.network.create_tap_mirror
-        create_tap_m_mock.assert_called_once_with(
+        self.network_client.create_tap_mirror.assert_called_once_with(
             **{
                 'name': fake_tap_mirror['name'],
                 'port_id': fake_tap_mirror['port_id'],
@@ -128,9 +123,7 @@ class TestListTapMirror(network_fakes.TestNetworkV2):
         fake_tap_mirrors = list(
             sdk_fakes.generate_fake_resources(tap_mirror.TapMirror, count=4)
         )
-        self.app.client_manager.network.tap_mirrors.return_value = (
-            fake_tap_mirrors
-        )
+        self.network_client.tap_mirrors.return_value = fake_tap_mirrors
 
         arg_list = []
         verify_list = []
@@ -139,7 +132,7 @@ class TestListTapMirror(network_fakes.TestNetworkV2):
 
         headers, data = self.cmd.take_action(parsed_args)
 
-        self.app.client_manager.network.tap_mirrors.assert_called_once()
+        self.network_client.tap_mirrors.assert_called_once()
         self.assertEqual(headers, list(headers_long))
         self.assertCountEqual(
             list(data),
@@ -153,7 +146,7 @@ class TestListTapMirror(network_fakes.TestNetworkV2):
 class TestDeleteTapMirror(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
-        self.app.client_manager.network.find_tap_mirror.side_effect = (
+        self.network_client.find_tap_mirror.side_effect = (
             lambda name_or_id, ignore_missing: tap_mirror.TapMirror(
                 id=name_or_id
             )
@@ -177,8 +170,9 @@ class TestDeleteTapMirror(network_fakes.TestNetworkV2):
         parsed_args = self.check_parser(self.cmd, arg_list, verify_list)
         result = self.cmd.take_action(parsed_args)
 
-        mock_delete_tap_m = self.app.client_manager.network.delete_tap_mirror
-        mock_delete_tap_m.assert_called_once_with(fake_tap_mirror['id'])
+        self.network_client.delete_tap_mirror.assert_called_once_with(
+            fake_tap_mirror['id']
+        )
         self.assertIsNone(result)
 
 
@@ -196,7 +190,7 @@ class TestShowTapMirror(network_fakes.TestNetworkV2):
 
     def setUp(self):
         super().setUp()
-        self.app.client_manager.network.find_tap_mirror.side_effect = (
+        self.network_client.find_tap_mirror.side_effect = (
             lambda name_or_id, ignore_missing: tap_mirror.TapMirror(
                 id=name_or_id
             )
@@ -209,9 +203,7 @@ class TestShowTapMirror(network_fakes.TestNetworkV2):
         fake_tap_mirror = sdk_fakes.generate_fake_resource(
             tap_mirror.TapMirror
         )
-        self.app.client_manager.network.get_tap_mirror.return_value = (
-            fake_tap_mirror
-        )
+        self.network_client.get_tap_mirror.return_value = fake_tap_mirror
         arg_list = [
             fake_tap_mirror['id'],
         ]
@@ -223,8 +215,9 @@ class TestShowTapMirror(network_fakes.TestNetworkV2):
 
         headers, data = self.cmd.take_action(parsed_args)
 
-        mock_get_tap_m = self.app.client_manager.network.get_tap_mirror
-        mock_get_tap_m.assert_called_once_with(fake_tap_mirror['id'])
+        self.network_client.get_tap_mirror.assert_called_once_with(
+            fake_tap_mirror['id']
+        )
         self.assertEqual(self.columns, headers)
         fake_data = _get_data(
             fake_tap_mirror, osc_tap_mirror._get_columns(fake_tap_mirror)[1]
@@ -248,7 +241,7 @@ class TestUpdateTapMirror(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
         self.cmd = osc_tap_mirror.UpdateTapMirror(self.app, None)
-        self.app.client_manager.network.find_tap_mirror.side_effect = (
+        self.network_client.find_tap_mirror.side_effect = (
             lambda name_or_id, ignore_missing: tap_mirror.TapMirror(
                 id=name_or_id
             )
@@ -262,9 +255,7 @@ class TestUpdateTapMirror(network_fakes.TestNetworkV2):
         new_tap_mirror = copy.deepcopy(fake_tap_mirror)
         new_tap_mirror['name'] = self._new_name
 
-        self.app.client_manager.network.update_tap_mirror.return_value = (
-            new_tap_mirror
-        )
+        self.network_client.update_tap_mirror.return_value = new_tap_mirror
 
         arg_list = [
             fake_tap_mirror['id'],
@@ -277,8 +268,7 @@ class TestUpdateTapMirror(network_fakes.TestNetworkV2):
         columns, data = self.cmd.take_action(parsed_args)
         attrs = {'name': self._new_name}
 
-        mock_update_tap_m = self.app.client_manager.network.update_tap_mirror
-        mock_update_tap_m.assert_called_once_with(
+        self.network_client.update_tap_mirror.assert_called_once_with(
             fake_tap_mirror['id'], **attrs
         )
         self.assertEqual(self.columns, columns)

openstackclient/tests/unit/network/v2/taas/{test_osc_tap_service.py → test_tap_service.py}

@@ -65,11 +65,9 @@ class TestCreateTapService(network_fakes.TestNetworkV2):
         fake_tap_service = sdk_fakes.generate_fake_resource(
             tap_service.TapService, **{'port_id': port_id}
         )
-        self.app.client_manager.network.create_tap_service.return_value = (
-            fake_tap_service
-        )
-        self.app.client_manager.network.find_port.return_value = fake_port
-        self.app.client_manager.network.find_tap_service.side_effect = (
+        self.network_client.create_tap_service.return_value = fake_tap_service
+        self.network_client.find_port.return_value = fake_port
+        self.network_client.find_tap_service.side_effect = (
             lambda _, name_or_id: {'id': name_or_id}
         )
         arg_list = [
@@ -85,13 +83,10 @@ class TestCreateTapService(network_fakes.TestNetworkV2):
         ]
 
         parsed_args = self.check_parser(self.cmd, arg_list, verify_list)
-        self.app.client_manager.network.find_tap_service.return_value = (
-            fake_tap_service
-        )
+        self.network_client.find_tap_service.return_value = fake_tap_service
 
         columns, data = self.cmd.take_action(parsed_args)
-        create_tap_s_mock = self.app.client_manager.network.create_tap_service
-        create_tap_s_mock.assert_called_once_with(
+        self.network_client.create_tap_service.assert_called_once_with(
             **{
                 'name': fake_tap_service['name'],
                 'port_id': fake_tap_service['port_id'],
@@ -114,9 +109,7 @@ class TestListTapService(network_fakes.TestNetworkV2):
         fake_tap_services = list(
             sdk_fakes.generate_fake_resources(tap_service.TapService, count=4)
         )
-        self.app.client_manager.network.tap_services.return_value = (
-            fake_tap_services
-        )
+        self.network_client.tap_services.return_value = fake_tap_services
 
         arg_list = []
         verify_list = []
@@ -125,7 +118,7 @@ class TestListTapService(network_fakes.TestNetworkV2):
 
         headers, data = self.cmd.take_action(parsed_args)
 
-        self.app.client_manager.network.tap_services.assert_called_once()
+        self.network_client.tap_services.assert_called_once()
         self.assertEqual(headers, list(headers_long))
         self.assertCountEqual(
             list(data),
@@ -139,7 +132,7 @@ class TestListTapService(network_fakes.TestNetworkV2):
 class TestDeleteTapService(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
-        self.app.client_manager.network.find_tap_service.side_effect = (
+        self.network_client.find_tap_service.side_effect = (
             lambda name_or_id, ignore_missing: tap_service.TapService(
                 id=name_or_id
             )
@@ -163,8 +156,9 @@ class TestDeleteTapService(network_fakes.TestNetworkV2):
         parsed_args = self.check_parser(self.cmd, arg_list, verify_list)
         result = self.cmd.take_action(parsed_args)
 
-        mock_delete_tap_s = self.app.client_manager.network.delete_tap_service
-        mock_delete_tap_s.assert_called_once_with(fake_tap_service['id'])
+        self.network_client.delete_tap_service.assert_called_once_with(
+            fake_tap_service['id']
+        )
         self.assertIsNone(result)
 
 
@@ -180,7 +174,7 @@ class TestShowTapService(network_fakes.TestNetworkV2):
 
     def setUp(self):
         super().setUp()
-        self.app.client_manager.network.find_tap_service.side_effect = (
+        self.network_client.find_tap_service.side_effect = (
             lambda name_or_id, ignore_missing: tap_service.TapService(
                 id=name_or_id
             )
@@ -193,9 +187,7 @@ class TestShowTapService(network_fakes.TestNetworkV2):
         fake_tap_service = sdk_fakes.generate_fake_resource(
             tap_service.TapService
         )
-        self.app.client_manager.network.get_tap_service.return_value = (
-            fake_tap_service
-        )
+        self.network_client.get_tap_service.return_value = fake_tap_service
         arg_list = [
             fake_tap_service['id'],
         ]
@@ -207,8 +199,9 @@ class TestShowTapService(network_fakes.TestNetworkV2):
 
         headers, data = self.cmd.take_action(parsed_args)
 
-        mock_get_tap_s = self.app.client_manager.network.get_tap_service
-        mock_get_tap_s.assert_called_once_with(fake_tap_service['id'])
+        self.network_client.get_tap_service.assert_called_once_with(
+            fake_tap_service['id']
+        )
         self.assertEqual(self.columns, headers)
         fake_data = _get_data(
             fake_tap_service, osc_tap_service._get_columns(fake_tap_service)[1]
@@ -231,7 +224,7 @@ class TestUpdateTapService(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
         self.cmd = osc_tap_service.UpdateTapService(self.app, None)
-        self.app.client_manager.network.find_tap_service.side_effect = (
+        self.network_client.find_tap_service.side_effect = (
             lambda name_or_id, ignore_missing: tap_service.TapService(
                 id=name_or_id
             )
@@ -245,9 +238,7 @@ class TestUpdateTapService(network_fakes.TestNetworkV2):
         new_tap_service = copy.deepcopy(fake_tap_service)
         new_tap_service['name'] = self._new_name
 
-        self.app.client_manager.network.update_tap_service.return_value = (
-            new_tap_service
-        )
+        self.network_client.update_tap_service.return_value = new_tap_service
 
         arg_list = [
             fake_tap_service['id'],
@@ -260,8 +251,7 @@ class TestUpdateTapService(network_fakes.TestNetworkV2):
         columns, data = self.cmd.take_action(parsed_args)
         attrs = {'name': self._new_name}
 
-        mock_update_tap_s = self.app.client_manager.network.update_tap_service
-        mock_update_tap_s.assert_called_once_with(
+        self.network_client.update_tap_service.assert_called_once_with(
             fake_tap_service['id'], **attrs
         )
         self.assertEqual(self.columns, columns)

openstackclient/tests/unit/network/v2/test_address_group.py

@@ -264,6 +264,30 @@ class TestListAddressGroup(TestAddressGroup):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
+    def test_address_group_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.address_groups[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.address_groups[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.address_groups.assert_called_once_with(
+            **{
+                'marker': self.address_groups[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_address_group_list_name(self):
         arglist = [
             '--name',
@@ -519,7 +543,7 @@ class TestUnsetAddressGroup(TestAddressGroup):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.network_client.remove_addresses_from_address_group.assert_called_once_with(  # noqa: E501
+        self.network_client.remove_addresses_from_address_group.assert_called_once_with(
             self._address_group, ['10.0.0.2/32']
         )
         self.assertIsNone(result)
@@ -539,7 +563,7 @@ class TestUnsetAddressGroup(TestAddressGroup):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.network_client.remove_addresses_from_address_group.assert_called_once_with(  # noqa: E501
+        self.network_client.remove_addresses_from_address_group.assert_called_once_with(
             self._address_group, ['10.0.0.2/32', '2001::/16']
         )
         self.assertIsNone(result)

openstackclient/tests/unit/network/v2/test_address_scope.py

@@ -280,6 +280,30 @@ class TestListAddressScope(TestAddressScope):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_address_scope_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.address_scopes[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.address_scopes[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.address_scopes.assert_called_once_with(
+            **{
+                'marker': self.address_scopes[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_address_scope_list_name(self):
         arglist = [
             '--name',

openstackclient/tests/unit/network/v2/{test_floating_ip_network.py → test_floating_ip.py}

@@ -383,7 +383,7 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            self.assertEqual('1 of 2 floating_ips failed to delete.', str(e))
+            self.assertEqual('1 of 2 floating IPs failed to delete.', str(e))
 
         self.network_client.find_ip.assert_any_call(
             self.floating_ips[0].id,
@@ -425,7 +425,8 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
         'Floating Network',
         'Project',
     )
-    columns_long = columns + (
+    columns_long = (
+        *columns,
         'Router',
         'Status',
         'Description',
@@ -699,6 +700,30 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_floating_ip_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.floating_ips[0].id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self.floating_ips[0].id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.ips.assert_called_once_with(
+            **{
+                'marker': self.floating_ips[0].id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
 
 class TestShowFloatingIPNetwork(TestFloatingIPNetwork):
     def setUp(self):

openstackclient/tests/unit/network/v2/test_floating_ip_port_forwarding.py

@@ -39,14 +39,14 @@ class TestFloatingIPPortForwarding(network_fakes.TestNetworkV2):
 class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
     def setUp(self):
         super().setUp()
-        self.new_port_forwarding = network_fakes.FakeFloatingIPPortForwarding.create_one_port_forwarding(  # noqa: E501
+        self.new_port_forwarding = network_fakes.FakeFloatingIPPortForwarding.create_one_port_forwarding(
             attrs={
                 'internal_port_id': self.port.id,
                 'floatingip_id': self.floating_ip.id,
             }
         )
 
-        self.new_port_forwarding_with_ranges = network_fakes.FakeFloatingIPPortForwarding.create_one_port_forwarding(  # noqa: E501
+        self.new_port_forwarding_with_ranges = network_fakes.FakeFloatingIPPortForwarding.create_one_port_forwarding(
             use_range=True,
             attrs={
                 'internal_port_id': self.port.id,
@@ -144,15 +144,15 @@ class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.network_client.create_floating_ip_port_forwarding.assert_called_once_with(  # noqa: E501
+        self.network_client.create_floating_ip_port_forwarding.assert_called_once_with(
             self.new_port_forwarding.floatingip_id,
             **{
-                'external_port_range': self.new_port_forwarding_with_ranges.external_port_range,  # noqa: E501
-                'internal_ip_address': self.new_port_forwarding_with_ranges.internal_ip_address,  # noqa: E501
-                'internal_port_range': self.new_port_forwarding_with_ranges.internal_port_range,  # noqa: E501
-                'internal_port_id': self.new_port_forwarding_with_ranges.internal_port_id,  # noqa: E501
+                'external_port_range': self.new_port_forwarding_with_ranges.external_port_range,
+                'internal_ip_address': self.new_port_forwarding_with_ranges.internal_ip_address,
+                'internal_port_range': self.new_port_forwarding_with_ranges.internal_port_range,
+                'internal_port_id': self.new_port_forwarding_with_ranges.internal_port_id,
                 'protocol': self.new_port_forwarding_with_ranges.protocol,
-                'description': self.new_port_forwarding_with_ranges.description,  # noqa: E501
+                'description': self.new_port_forwarding_with_ranges.description,
             },
         )
         self.assertEqual(self.columns, columns)
@@ -325,11 +325,11 @@ class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.network_client.create_floating_ip_port_forwarding.assert_called_once_with(  # noqa: E501
+        self.network_client.create_floating_ip_port_forwarding.assert_called_once_with(
             self.new_port_forwarding.floatingip_id,
             **{
                 'external_port': self.new_port_forwarding.external_port,
-                'internal_ip_address': self.new_port_forwarding.internal_ip_address,  # noqa: E501
+                'internal_ip_address': self.new_port_forwarding.internal_ip_address,
                 'internal_port': self.new_port_forwarding.internal_port,
                 'internal_port_id': self.new_port_forwarding.internal_port_id,
                 'protocol': self.new_port_forwarding.protocol,
@@ -375,7 +375,7 @@ class TestDeleteFloatingIPPortForwarding(TestFloatingIPPortForwarding):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.network_client.delete_floating_ip_port_forwarding.assert_called_once_with(  # noqa: E501
+        self.network_client.delete_floating_ip_port_forwarding.assert_called_once_with(
             self.floating_ip.id,
             self._port_forwarding[0].id,
             ignore_missing=False,
@@ -513,6 +513,30 @@ class TestListFloatingIPPortForwarding(TestFloatingIPPortForwarding):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
+    def test_port_forwarding_list_pagination(self):
+        arglist = [
+            '--marker',
+            self.port_forwardings[0].id,
+            '--limit',
+            '1',
+            self.floating_ip.id,
+        ]
+        verifylist = [
+            ('marker', self.port_forwardings[0].id),
+            ('limit', 1),
+            ('floating_ip', self.floating_ip.id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.floating_ip_port_forwardings.assert_called_once_with(
+            self.floating_ip,
+            **{'marker': self.port_forwardings[0].id, 'limit': 1},
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_port_forwarding_list_all_options(self):
         arglist = [
             '--port',
@@ -553,7 +577,7 @@ class TestSetFloatingIPPortForwarding(TestFloatingIPPortForwarding):
     # The Port Forwarding to set.
     def setUp(self):
         super().setUp()
-        self._port_forwarding = network_fakes.FakeFloatingIPPortForwarding.create_one_port_forwarding(  # noqa: E501
+        self._port_forwarding = network_fakes.FakeFloatingIPPortForwarding.create_one_port_forwarding(
             attrs={
                 'floatingip_id': self.floating_ip.id,
             }
@@ -675,7 +699,7 @@ class TestShowFloatingIPPortForwarding(TestFloatingIPPortForwarding):
 
     def setUp(self):
         super().setUp()
-        self._port_forwarding = network_fakes.FakeFloatingIPPortForwarding.create_one_port_forwarding(  # noqa: E501
+        self._port_forwarding = network_fakes.FakeFloatingIPPortForwarding.create_one_port_forwarding(
             attrs={
                 'floatingip_id': self.floating_ip.id,
             }

openstackclient/tests/unit/network/v2/test_ip_availability.py

@@ -73,6 +73,31 @@ class TestListIPAvailability(TestIPAvailability):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
+    def test_list_pagination(self):
+        arglist = [
+            '--marker',
+            self._ip_availability[0].network_id,
+            '--limit',
+            '1',
+        ]
+        verifylist = [
+            ('marker', self._ip_availability[0].network_id),
+            ('limit', 1),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network_client.network_ip_availabilities.assert_called_once_with(
+            **{
+                'ip_version': 4,
+                'marker': self._ip_availability[0].network_id,
+                'limit': 1,
+            }
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
     def test_list_ip_version(self):
         arglist = [
             '--ip-version',