python-openstackclient 6.6.1__py3-none-any.whl → 7.1.0__py3-none-any.whl

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

@@ -30,7 +30,7 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestDefaultSecurityGroupRule(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestDefaultSecurityGroupRule, self).setUp()
+        super().setUp()
 
         self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.network = mock.Mock(
@@ -72,7 +72,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
             'remote_ip_prefix': '0.0.0.0/0',
             'location': 'MUNCHMUNCHMUNCH',
             'used_in_default_sg': False,
-            'used_in_non_default_sg': True,
+            'used_in_non_default_sg': False,
         }
         attrs = attrs or {}
         # Overwrite default attributes.
@@ -101,11 +101,11 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
         )
 
     def setUp(self):
-        super(TestCreateDefaultSecurityGroupRule, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = default_security_group_rule.CreateDefaultSecurityGroupRule(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_create_all_remote_options(self):
@@ -217,13 +217,15 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix,
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
         self.assertEqual(self.expected_data, data)
 
-    def test_create_protocol_any(self):
+    def _test_create_protocol_any_helper(
+        self, for_default_sg=False, for_custom_sg=False
+    ):
         self._setup_default_security_group_rule(
             {
                 'protocol': None,
@@ -236,9 +238,15 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
             '--remote-ip',
             self._default_sg_rule.remote_ip_prefix,
         ]
+        if for_default_sg:
+            arglist.append('--for-default-sg')
+        if for_custom_sg:
+            arglist.append('--for-custom-sg')
         verifylist = [
             ('protocol', 'any'),
             ('remote_ip', self._default_sg_rule.remote_ip_prefix),
+            ('for_default_sg', for_default_sg),
+            ('for_custom_sg', for_custom_sg),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -250,13 +258,27 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'ethertype': self._default_sg_rule.ether_type,
                 'protocol': self._default_sg_rule.protocol,
                 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix,
-                'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_default_sg': for_default_sg,
+                'used_in_non_default_sg': for_custom_sg,
             }
         )
         self.assertEqual(self.expected_columns, columns)
         self.assertEqual(self.expected_data, data)
 
+    def test_create_protocol_any_not_for_default_sg(self):
+        self._test_create_protocol_any_helper()
+
+    def test_create_protocol_any_for_default_sg(self):
+        self._test_create_protocol_any_helper(for_default_sg=True)
+
+    def test_create_protocol_any_for_custom_sg(self):
+        self._test_create_protocol_any_helper(for_custom_sg=True)
+
+    def test_create_protocol_any_for_default_and_custom_sg(self):
+        self._test_create_protocol_any_helper(
+            for_default_sg=True, for_custom_sg=True
+        )
+
     def test_create_remote_address_group(self):
         self._setup_default_security_group_rule(
             {
@@ -287,7 +309,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_address_group_id': self._default_sg_rule.remote_address_group_id,
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -334,7 +356,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_group_id': 'remote-group-id',
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -366,7 +388,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_group_id': 'remote-group-id',
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -400,7 +422,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix,
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -434,7 +456,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix,
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -585,7 +607,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix,
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -623,7 +645,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix,
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -661,7 +683,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix,
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -698,7 +720,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix,
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -741,7 +763,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix,
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -780,7 +802,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix,
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -811,7 +833,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
                 'protocol': self._default_sg_rule.protocol,
                 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix,
                 'used_in_default_sg': False,
-                'used_in_non_default_sg': True,
+                'used_in_non_default_sg': False,
             }
         )
         self.assertEqual(self.expected_columns, columns)
@@ -831,7 +853,7 @@ class TestDeleteDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
         'remote_ip_prefix': '0.0.0.0/0',
         'location': 'MUNCHMUNCHMUNCH',
         'used_in_default_sg': False,
-        'used_in_non_default_sg': True,
+        'used_in_non_default_sg': False,
     }
     _default_sg_rules = list(
         sdk_fakes.generate_fake_resources(
@@ -842,13 +864,13 @@ class TestDeleteDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
     )
 
     def setUp(self):
-        super(TestDeleteDefaultSecurityGroupRule, self).setUp()
+        super().setUp()
 
         self.sdk_client.delete_default_security_group_rule.return_value = None
 
         # Get the command object to test
         self.cmd = default_security_group_rule.DeleteDefaultSecurityGroupRule(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_default_security_group_rule_delete(self):
@@ -977,7 +999,7 @@ class TestListDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
         )
 
     def setUp(self):
-        super(TestListDefaultSecurityGroupRule, self).setUp()
+        super().setUp()
 
         self.sdk_client.default_security_group_rules.return_value = (
             self._default_sg_rules
@@ -985,7 +1007,7 @@ class TestListDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         # Get the command object to test
         self.cmd = default_security_group_rule.ListDefaultSecurityGroupRule(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_list_default(self):
@@ -1099,7 +1121,7 @@ class TestShowDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
     )
 
     def setUp(self):
-        super(TestShowDefaultSecurityGroupRule, self).setUp()
+        super().setUp()
 
         self.sdk_client.find_default_security_group_rule.return_value = (
             self._default_sg_rule
@@ -1107,7 +1129,7 @@ class TestShowDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         # Get the command object to test
         self.cmd = default_security_group_rule.ShowDefaultSecurityGroupRule(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_show_no_options(self):

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

@@ -12,21 +12,17 @@
 #
 
 from unittest import mock
-from unittest.mock import call
 
 from osc_lib import exceptions
 
+from openstackclient.api import compute_v2
 from openstackclient.network.v2 import floating_ip as fip
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-# Tests for Nova network
-
-
-@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_create')
+@mock.patch.object(compute_v2, 'create_floating_ip')
 class TestCreateFloatingIPCompute(compute_fakes.TestComputev2):
-    # The floating ip to be deleted.
     _floating_ip = compute_fakes.create_one_floating_ip()
 
     columns = (
@@ -46,13 +42,10 @@ class TestCreateFloatingIPCompute(compute_fakes.TestComputev2):
     )
 
     def setUp(self):
-        super(TestCreateFloatingIPCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        # self.compute_client.floating_ips.create.return_value = self.floating_ip
-
-        # Get the command object to test
         self.cmd = fip.CreateFloatingIP(self.app, None)
 
     def test_floating_ip_create_no_arg(self, fip_mock):
@@ -79,22 +72,22 @@ class TestCreateFloatingIPCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        fip_mock.assert_called_once_with(self._floating_ip['pool'])
+        fip_mock.assert_called_once_with(
+            self.compute_sdk_client, self._floating_ip['pool']
+        )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_delete')
+@mock.patch.object(compute_v2, 'delete_floating_ip')
 class TestDeleteFloatingIPCompute(compute_fakes.TestComputev2):
-    # The floating ips to be deleted.
     _floating_ips = compute_fakes.create_floating_ips(count=2)
 
     def setUp(self):
-        super(TestDeleteFloatingIPCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        # Get the command object to test
         self.cmd = fip.DeleteFloatingIP(self.app, None)
 
     def test_floating_ip_delete(self, fip_mock):
@@ -109,27 +102,34 @@ class TestDeleteFloatingIPCompute(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        fip_mock.assert_called_once_with(self._floating_ips[0]['id'])
+        fip_mock.assert_called_once_with(
+            self.compute_sdk_client, self._floating_ips[0]['id']
+        )
         self.assertIsNone(result)
 
     def test_floating_ip_delete_multi(self, fip_mock):
         fip_mock.return_value = mock.Mock(return_value=None)
-        arglist = []
-        verifylist = []
-
-        for f in self._floating_ips:
-            arglist.append(f['id'])
+        arglist = [
+            self._floating_ips[0]['id'],
+            self._floating_ips[1]['id'],
+        ]
         verifylist = [
             ('floating_ip', arglist),
         ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        calls = []
-        for f in self._floating_ips:
-            calls.append(call(f['id']))
-        fip_mock.assert_has_calls(calls)
+        fip_mock.assert_has_calls(
+            [
+                mock.call(
+                    self.compute_sdk_client, self._floating_ips[0]['id']
+                ),
+                mock.call(
+                    self.compute_sdk_client, self._floating_ips[1]['id']
+                ),
+            ]
+        )
         self.assertIsNone(result)
 
     def test_floating_ip_delete_multi_exception(self, fip_mock):
@@ -156,13 +156,16 @@ class TestDeleteFloatingIPCompute(compute_fakes.TestComputev2):
         except exceptions.CommandError as e:
             self.assertEqual('1 of 2 floating_ips failed to delete.', str(e))
 
-        fip_mock.assert_any_call(self._floating_ips[0]['id'])
-        fip_mock.assert_any_call('unexist_floating_ip')
+        fip_mock.assert_any_call(
+            self.compute_sdk_client, self._floating_ips[0]['id']
+        )
+        fip_mock.assert_any_call(
+            self.compute_sdk_client, 'unexist_floating_ip'
+        )
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_list')
+@mock.patch.object(compute_v2, 'list_floating_ips')
 class TestListFloatingIPCompute(compute_fakes.TestComputev2):
-    # The floating ips to be list up
     _floating_ips = compute_fakes.create_floating_ips(count=3)
 
     columns = (
@@ -186,11 +189,10 @@ class TestListFloatingIPCompute(compute_fakes.TestComputev2):
         )
 
     def setUp(self):
-        super(TestListFloatingIPCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        # Get the command object to test
         self.cmd = fip.ListFloatingIP(self.app, None)
 
     def test_floating_ip_list(self, fip_mock):
@@ -201,14 +203,13 @@ class TestListFloatingIPCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        fip_mock.assert_called_once_with()
+        fip_mock.assert_called_once_with(self.compute_sdk_client)
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_find')
+@mock.patch.object(compute_v2, 'get_floating_ip')
 class TestShowFloatingIPCompute(compute_fakes.TestComputev2):
-    # The floating ip to display.
     _floating_ip = compute_fakes.create_one_floating_ip()
 
     columns = (
@@ -228,11 +229,10 @@ class TestShowFloatingIPCompute(compute_fakes.TestComputev2):
     )
 
     def setUp(self):
-        super(TestShowFloatingIPCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        # Get the command object to test
         self.cmd = fip.ShowFloatingIP(self.app, None)
 
     def test_floating_ip_show(self, fip_mock):
@@ -247,6 +247,8 @@ class TestShowFloatingIPCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        fip_mock.assert_called_once_with(self._floating_ip['id'])
+        fip_mock.assert_called_once_with(
+            self.compute_sdk_client, self._floating_ip['id']
+        )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)

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

@@ -24,12 +24,12 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestFloatingIPNetwork(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestFloatingIPNetwork, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         # Get a shortcut to the DomainManager Mock
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.domains_mock = self.identity_client.domains
 
 
 class TestCreateFloatingIPNetwork(TestFloatingIPNetwork):
@@ -81,7 +81,7 @@ class TestCreateFloatingIPNetwork(TestFloatingIPNetwork):
     )
 
     def setUp(self):
-        super(TestCreateFloatingIPNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.create_ip = mock.Mock(
             return_value=self.floating_ip
@@ -95,7 +95,7 @@ class TestCreateFloatingIPNetwork(TestFloatingIPNetwork):
         self.network_client.find_port = mock.Mock(return_value=self.port)
 
         # Get the command object to test
-        self.cmd = fip.CreateFloatingIP(self.app, self.namespace)
+        self.cmd = fip.CreateFloatingIP(self.app, None)
 
     def test_create_no_options(self):
         arglist = []
@@ -301,12 +301,12 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
     floating_ips = network_fakes.FakeFloatingIP.create_floating_ips(count=2)
 
     def setUp(self):
-        super(TestDeleteFloatingIPNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.delete_ip = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = fip.DeleteFloatingIP(self.app, self.namespace)
+        self.cmd = fip.DeleteFloatingIP(self.app, None)
 
     def test_floating_ip_delete(self):
         self.network_client.find_ip.side_effect = [
@@ -467,7 +467,7 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
         )
 
     def setUp(self):
-        super(TestListFloatingIPNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.ips = mock.Mock(return_value=self.floating_ips)
         self.network_client.find_network = mock.Mock(
@@ -479,7 +479,7 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
         )
 
         # Get the command object to test
-        self.cmd = fip.ListFloatingIP(self.app, self.namespace)
+        self.cmd = fip.ListFloatingIP(self.app, None)
 
     def test_floating_ip_list(self):
         arglist = []
@@ -742,12 +742,12 @@ class TestShowFloatingIPNetwork(TestFloatingIPNetwork):
     )
 
     def setUp(self):
-        super(TestShowFloatingIPNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
 
         # Get the command object to test
-        self.cmd = fip.ShowFloatingIP(self.app, self.namespace)
+        self.cmd = fip.ShowFloatingIP(self.app, None)
 
     def test_floating_ip_show(self):
         arglist = [
@@ -784,14 +784,14 @@ class TestSetFloatingIP(TestFloatingIPNetwork):
     )
 
     def setUp(self):
-        super(TestSetFloatingIP, self).setUp()
+        super().setUp()
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
         self.network_client.find_port = mock.Mock(return_value=self.port)
         self.network_client.update_ip = mock.Mock(return_value=None)
         self.network_client.set_tags = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = fip.SetFloatingIP(self.app, self.namespace)
+        self.cmd = fip.SetFloatingIP(self.app, None)
 
     def test_port_option(self):
         arglist = [
@@ -1035,13 +1035,13 @@ class TestUnsetFloatingIP(TestFloatingIPNetwork):
     )
 
     def setUp(self):
-        super(TestUnsetFloatingIP, self).setUp()
+        super().setUp()
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
         self.network_client.update_ip = mock.Mock(return_value=None)
         self.network_client.set_tags = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = fip.UnsetFloatingIP(self.app, self.namespace)
+        self.cmd = fip.UnsetFloatingIP(self.app, None)
 
     def test_floating_ip_unset_port(self):
         arglist = [

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

@@ -13,14 +13,12 @@
 
 from unittest import mock
 
+from openstackclient.api import compute_v2
 from openstackclient.network.v2 import floating_ip_pool
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-# Tests for Compute network
-
-
-@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_pool_list')
+@mock.patch.object(compute_v2, 'list_floating_ip_pools')
 class TestListFloatingIPPoolCompute(compute_fakes.TestComputev2):
     # The floating ip pools to list up
     _floating_ip_pools = compute_fakes.create_floating_ip_pools(count=3)
@@ -32,11 +30,10 @@ class TestListFloatingIPPoolCompute(compute_fakes.TestComputev2):
         data.append((pool['name'],))
 
     def setUp(self):
-        super(TestListFloatingIPPoolCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        # Get the command object to test
         self.cmd = floating_ip_pool.ListFloatingIPPool(self.app, None)
 
     def test_floating_ip_list(self, fipp_mock):
@@ -47,6 +44,6 @@ class TestListFloatingIPPoolCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        fipp_mock.assert_called_once_with()
+        fipp_mock.assert_called_once_with(self.compute_sdk_client)
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))

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

@@ -19,17 +19,15 @@ from openstackclient.tests.unit.network.v2 import fakes as network_fakes
 
 class TestFloatingIPPoolNetwork(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestFloatingIPPoolNetwork, self).setUp()
+        super().setUp()
 
 
 class TestListFloatingIPPoolNetwork(TestFloatingIPPoolNetwork):
     def setUp(self):
-        super(TestListFloatingIPPoolNetwork, self).setUp()
+        super().setUp()
 
         # Get the command object to test
-        self.cmd = floating_ip_pool.ListFloatingIPPool(
-            self.app, self.namespace
-        )
+        self.cmd = floating_ip_pool.ListFloatingIPPool(self.app, None)
 
     def test_floating_ip_list(self):
         arglist = []