python-openstackclient 6.6.0__py3-none-any.whl → 7.0.0__py3-none-any.whl

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

@@ -12,17 +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 security_group
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_create')
+@mock.patch.object(compute_v2, 'create_security_group')
 class TestCreateSecurityGroupCompute(compute_fakes.TestComputev2):
     project = identity_fakes.FakeProject.create_one_project()
     domain = identity_fakes.FakeDomain.create_one_domain()
@@ -47,7 +47,7 @@ class TestCreateSecurityGroupCompute(compute_fakes.TestComputev2):
     )
 
     def setUp(self):
-        super(TestCreateSecurityGroupCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
@@ -72,6 +72,7 @@ class TestCreateSecurityGroupCompute(compute_fakes.TestComputev2):
         columns, data = self.cmd.take_action(parsed_args)
 
         sg_mock.assert_called_once_with(
+            self.compute_sdk_client,
             self._security_group['name'],
             self._security_group['name'],
         )
@@ -94,6 +95,7 @@ class TestCreateSecurityGroupCompute(compute_fakes.TestComputev2):
         columns, data = self.cmd.take_action(parsed_args)
 
         sg_mock.assert_called_once_with(
+            self.compute_sdk_client,
             self._security_group['name'],
             self._security_group['description'],
         )
@@ -101,18 +103,18 @@ class TestCreateSecurityGroupCompute(compute_fakes.TestComputev2):
         self.assertCountEqual(self.data, data)
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_delete')
+@mock.patch.object(compute_v2, 'delete_security_group')
 class TestDeleteSecurityGroupCompute(compute_fakes.TestComputev2):
     # The security groups to be deleted.
     _security_groups = compute_fakes.create_security_groups()
 
     def setUp(self):
-        super(TestDeleteSecurityGroupCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        self.compute_client.api.security_group_find = (
-            compute_fakes.get_security_groups(self._security_groups)
+        compute_v2.find_security_group = mock.Mock(
+            side_effect=self._security_groups
         )
 
         # Get the command object to test
@@ -131,59 +133,68 @@ class TestDeleteSecurityGroupCompute(compute_fakes.TestComputev2):
         result = self.cmd.take_action(parsed_args)
 
         sg_mock.assert_called_once_with(
+            self.compute_sdk_client,
             self._security_groups[0]['id'],
         )
         self.assertIsNone(result)
 
     def test_security_group_multi_delete(self, sg_mock):
         sg_mock.return_value = mock.Mock(return_value=None)
-        arglist = []
-        verifylist = []
-
-        for s in self._security_groups:
-            arglist.append(s['id'])
+        arglist = [
+            self._security_groups[0]['id'],
+            self._security_groups[1]['id'],
+        ]
         verifylist = [
             ('group', 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 s in self._security_groups:
-            calls.append(call(s['id']))
-        sg_mock.assert_has_calls(calls)
+        sg_mock.assert_has_calls(
+            [
+                mock.call(
+                    self.compute_sdk_client, self._security_groups[0]['id']
+                ),
+                mock.call(
+                    self.compute_sdk_client, self._security_groups[1]['id']
+                ),
+            ]
+        )
         self.assertIsNone(result)
 
     def test_security_group_multi_delete_with_exception(self, sg_mock):
         sg_mock.return_value = mock.Mock(return_value=None)
-        sg_mock.side_effect = [
-            mock.Mock(return_value=None),
-            exceptions.CommandError,
+        compute_v2.find_security_group.side_effect = [
+            self._security_groups[0],
+            exceptions.NotFound('foo'),
         ]
         arglist = [
             self._security_groups[0]['id'],
             'unexist_security_group',
         ]
         verifylist = [
-            (
-                'group',
-                [self._security_groups[0]['id'], 'unexist_security_group'],
-            ),
+            ('group', arglist),
         ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        try:
-            self.cmd.take_action(parsed_args)
-            self.fail('CommandError should be raised.')
-        except exceptions.CommandError as e:
-            self.assertEqual('1 of 2 groups failed to delete.', str(e))
 
-        sg_mock.assert_any_call(self._security_groups[0]['id'])
-        sg_mock.assert_any_call('unexist_security_group')
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        exc = self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+        self.assertEqual('1 of 2 groups failed to delete.', str(exc))
+
+        sg_mock.assert_has_calls(
+            [
+                mock.call(
+                    self.compute_sdk_client, self._security_groups[0]['id']
+                ),
+            ]
+        )
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_list')
+@mock.patch.object(compute_v2, 'list_security_groups')
 class TestListSecurityGroupCompute(compute_fakes.TestComputev2):
     # The security group to be listed.
     _security_groups = compute_fakes.create_security_groups(count=3)
@@ -221,7 +232,7 @@ class TestListSecurityGroupCompute(compute_fakes.TestComputev2):
         )
 
     def setUp(self):
-        super(TestListSecurityGroupCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
@@ -238,8 +249,9 @@ class TestListSecurityGroupCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        kwargs = {'search_opts': {'all_tenants': False}}
-        sg_mock.assert_called_once_with(**kwargs)
+        sg_mock.assert_called_once_with(
+            self.compute_sdk_client, all_projects=False
+        )
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
@@ -255,23 +267,24 @@ class TestListSecurityGroupCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        kwargs = {'search_opts': {'all_tenants': True}}
-        sg_mock.assert_called_once_with(**kwargs)
+        sg_mock.assert_called_once_with(
+            self.compute_sdk_client, all_projects=True
+        )
         self.assertEqual(self.columns_all_projects, columns)
         self.assertCountEqual(self.data_all_projects, list(data))
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_set')
+@mock.patch.object(compute_v2, 'update_security_group')
 class TestSetSecurityGroupCompute(compute_fakes.TestComputev2):
     # The security group to be set.
     _security_group = compute_fakes.create_one_security_group()
 
     def setUp(self):
-        super(TestSetSecurityGroupCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        self.compute_client.api.security_group_find = mock.Mock(
+        compute_v2.find_security_group = mock.Mock(
             return_value=self._security_group
         )
 
@@ -296,9 +309,7 @@ class TestSetSecurityGroupCompute(compute_fakes.TestComputev2):
         result = self.cmd.take_action(parsed_args)
 
         sg_mock.assert_called_once_with(
-            self._security_group,
-            self._security_group['name'],
-            self._security_group['description'],
+            self.compute_sdk_client, self._security_group['id']
         )
         self.assertIsNone(result)
 
@@ -323,12 +334,15 @@ class TestSetSecurityGroupCompute(compute_fakes.TestComputev2):
         result = self.cmd.take_action(parsed_args)
 
         sg_mock.assert_called_once_with(
-            self._security_group, new_name, new_description
+            self.compute_sdk_client,
+            self._security_group['id'],
+            name=new_name,
+            description=new_description,
         )
         self.assertIsNone(result)
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_find')
+@mock.patch.object(compute_v2, 'find_security_group')
 class TestShowSecurityGroupCompute(compute_fakes.TestComputev2):
     # The security group rule to be shown with the group.
     _security_group_rule = compute_fakes.create_one_security_group_rule()
@@ -355,7 +369,7 @@ class TestShowSecurityGroupCompute(compute_fakes.TestComputev2):
     )
 
     def setUp(self):
-        super(TestShowSecurityGroupCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
@@ -379,6 +393,8 @@ class TestShowSecurityGroupCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        sg_mock.assert_called_once_with(self._security_group['id'])
+        sg_mock.assert_called_once_with(
+            self.compute_sdk_client, self._security_group['id']
+        )
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)

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

@@ -24,12 +24,12 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestSecurityGroupNetwork(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestSecurityGroupNetwork, 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 TestCreateSecurityGroupNetwork(TestSecurityGroupNetwork):
@@ -61,7 +61,7 @@ class TestCreateSecurityGroupNetwork(TestSecurityGroupNetwork):
     )
 
     def setUp(self):
-        super(TestCreateSecurityGroupNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.create_security_group = mock.Mock(
             return_value=self._security_group
@@ -72,7 +72,7 @@ class TestCreateSecurityGroupNetwork(TestSecurityGroupNetwork):
         self.network_client.set_tags = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = security_group.CreateSecurityGroup(self.app, self.namespace)
+        self.cmd = security_group.CreateSecurityGroup(self.app, None)
 
     def test_create_no_options(self):
         self.assertRaises(
@@ -177,7 +177,7 @@ class TestDeleteSecurityGroupNetwork(TestSecurityGroupNetwork):
     _security_groups = network_fakes.FakeSecurityGroup.create_security_groups()
 
     def setUp(self):
-        super(TestDeleteSecurityGroupNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.delete_security_group = mock.Mock(
             return_value=None
@@ -190,7 +190,7 @@ class TestDeleteSecurityGroupNetwork(TestSecurityGroupNetwork):
         )
 
         # Get the command object to test
-        self.cmd = security_group.DeleteSecurityGroup(self.app, self.namespace)
+        self.cmd = security_group.DeleteSecurityGroup(self.app, None)
 
     def test_security_group_delete(self):
         arglist = [
@@ -289,14 +289,14 @@ class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
         )
 
     def setUp(self):
-        super(TestListSecurityGroupNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.security_groups = mock.Mock(
             return_value=self._security_groups
         )
 
         # Get the command object to test
-        self.cmd = security_group.ListSecurityGroup(self.app, self.namespace)
+        self.cmd = security_group.ListSecurityGroup(self.app, None)
 
     def test_security_group_list_no_options(self):
         arglist = []
@@ -419,7 +419,7 @@ class TestSetSecurityGroupNetwork(TestSecurityGroupNetwork):
     )
 
     def setUp(self):
-        super(TestSetSecurityGroupNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.update_security_group = mock.Mock(
             return_value=None
@@ -431,7 +431,7 @@ class TestSetSecurityGroupNetwork(TestSecurityGroupNetwork):
         self.network_client.set_tags = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = security_group.SetSecurityGroup(self.app, self.namespace)
+        self.cmd = security_group.SetSecurityGroup(self.app, None)
 
     def test_set_no_options(self):
         self.assertRaises(
@@ -549,14 +549,14 @@ class TestShowSecurityGroupNetwork(TestSecurityGroupNetwork):
     )
 
     def setUp(self):
-        super(TestShowSecurityGroupNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.find_security_group = mock.Mock(
             return_value=self._security_group
         )
 
         # Get the command object to test
-        self.cmd = security_group.ShowSecurityGroup(self.app, self.namespace)
+        self.cmd = security_group.ShowSecurityGroup(self.app, None)
 
     def test_show_no_options(self):
         self.assertRaises(
@@ -590,7 +590,7 @@ class TestUnsetSecurityGroupNetwork(TestSecurityGroupNetwork):
     )
 
     def setUp(self):
-        super(TestUnsetSecurityGroupNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.update_security_group = mock.Mock(
             return_value=None
@@ -602,7 +602,7 @@ class TestUnsetSecurityGroupNetwork(TestSecurityGroupNetwork):
         self.network_client.set_tags = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = security_group.UnsetSecurityGroup(self.app, self.namespace)
+        self.cmd = security_group.UnsetSecurityGroup(self.app, None)
 
     def test_set_no_options(self):
         self.assertRaises(

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

@@ -9,13 +9,12 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 from unittest import mock
-from unittest.mock import call
 
 from osc_lib import exceptions
 
+from openstackclient.api import compute_v2
 from openstackclient.network import utils as network_utils
 from openstackclient.network.v2 import security_group_rule
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
@@ -23,7 +22,7 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_rule_create')
+@mock.patch.object(compute_v2, 'create_security_group_rule')
 class TestCreateSecurityGroupRuleCompute(compute_fakes.TestComputev2):
     project = identity_fakes.FakeProject.create_one_project()
     domain = identity_fakes.FakeDomain.create_one_domain()
@@ -47,11 +46,11 @@ class TestCreateSecurityGroupRuleCompute(compute_fakes.TestComputev2):
         return expected_columns, expected_data
 
     def setUp(self):
-        super(TestCreateSecurityGroupRuleCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        self.compute_client.api.security_group_find = mock.Mock(
+        compute_v2.find_security_group = mock.Mock(
             return_value=self._security_group,
         )
 
@@ -159,9 +158,8 @@ class TestCreateSecurityGroupRuleCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        # TODO(dtroyer): save this for the security group rule changes
-        # self.compute_client.api.security_group_rule_create.assert_called_once_with(
         sgr_mock.assert_called_once_with(
+            self.compute_sdk_client,
             security_group_id=self._security_group['id'],
             ip_protocol=self._security_group_rule['ip_protocol'],
             from_port=self._security_group_rule['from_port'],
@@ -203,9 +201,8 @@ class TestCreateSecurityGroupRuleCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        # TODO(dtroyer): save this for the security group rule changes
-        # self.compute_client.api.security_group_rule_create.assert_called_once_with(
         sgr_mock.assert_called_once_with(
+            self.compute_sdk_client,
             security_group_id=self._security_group['id'],
             ip_protocol=self._security_group_rule['ip_protocol'],
             from_port=self._security_group_rule['from_port'],
@@ -242,9 +239,8 @@ class TestCreateSecurityGroupRuleCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        # TODO(dtroyer): save this for the security group rule changes
-        # self.compute_client.api.security_group_rule_create.assert_called_once_with(
         sgr_mock.assert_called_once_with(
+            self.compute_sdk_client,
             security_group_id=self._security_group['id'],
             ip_protocol=self._security_group_rule['ip_protocol'],
             from_port=self._security_group_rule['from_port'],
@@ -282,9 +278,8 @@ class TestCreateSecurityGroupRuleCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        # TODO(dtroyer): save this for the security group rule changes
-        # self.compute_client.api.security_group_rule_create.assert_called_once_with(
         sgr_mock.assert_called_once_with(
+            self.compute_sdk_client,
             security_group_id=self._security_group['id'],
             ip_protocol=self._security_group_rule['ip_protocol'],
             from_port=self._security_group_rule['from_port'],
@@ -296,13 +291,13 @@ class TestCreateSecurityGroupRuleCompute(compute_fakes.TestComputev2):
         self.assertEqual(expected_data, data)
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_rule_delete')
+@mock.patch.object(compute_v2, 'delete_security_group_rule')
 class TestDeleteSecurityGroupRuleCompute(compute_fakes.TestComputev2):
     # The security group rule to be deleted.
     _security_group_rules = compute_fakes.create_security_group_rules(count=2)
 
     def setUp(self):
-        super(TestDeleteSecurityGroupRuleCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
@@ -320,26 +315,35 @@ class TestDeleteSecurityGroupRuleCompute(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        sgr_mock.assert_called_once_with(self._security_group_rules[0]['id'])
+        sgr_mock.assert_called_once_with(
+            self.compute_sdk_client, self._security_group_rules[0]['id']
+        )
         self.assertIsNone(result)
 
     def test_security_group_rule_delete_multi(self, sgr_mock):
-        arglist = []
-        verifylist = []
-
-        for s in self._security_group_rules:
-            arglist.append(s['id'])
+        arglist = [
+            self._security_group_rules[0]['id'],
+            self._security_group_rules[1]['id'],
+        ]
         verifylist = [
             ('rule', 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 s in self._security_group_rules:
-            calls.append(call(s['id']))
-        sgr_mock.assert_has_calls(calls)
+        sgr_mock.assert_has_calls(
+            [
+                mock.call(
+                    self.compute_sdk_client,
+                    self._security_group_rules[0]['id'],
+                ),
+                mock.call(
+                    self.compute_sdk_client,
+                    self._security_group_rules[1]['id'],
+                ),
+            ]
+        )
         self.assertIsNone(result)
 
     def test_security_group_rule_delete_multi_with_exception(self, sgr_mock):
@@ -348,12 +352,11 @@ class TestDeleteSecurityGroupRuleCompute(compute_fakes.TestComputev2):
             'unexist_rule',
         ]
         verifylist = [
-            ('rule', [self._security_group_rules[0]['id'], 'unexist_rule']),
+            ('rule', arglist),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        find_mock_result = [None, exceptions.CommandError]
-        sgr_mock.side_effect = find_mock_result
+        sgr_mock.side_effect = [None, exceptions.NotFound('foo')]
 
         try:
             self.cmd.take_action(parsed_args)
@@ -361,8 +364,15 @@ class TestDeleteSecurityGroupRuleCompute(compute_fakes.TestComputev2):
         except exceptions.CommandError as e:
             self.assertEqual('1 of 2 rules failed to delete.', str(e))
 
-        sgr_mock.assert_any_call(self._security_group_rules[0]['id'])
-        sgr_mock.assert_any_call('unexist_rule')
+        sgr_mock.assert_has_calls(
+            [
+                mock.call(
+                    self.compute_sdk_client,
+                    self._security_group_rules[0]['id'],
+                ),
+                mock.call(self.compute_sdk_client, 'unexist_rule'),
+            ]
+        )
 
 
 class TestListSecurityGroupRuleCompute(compute_fakes.TestComputev2):
@@ -428,14 +438,14 @@ class TestListSecurityGroupRuleCompute(compute_fakes.TestComputev2):
         expected_data_no_group.append(expected_rule_no_group)
 
     def setUp(self):
-        super(TestListSecurityGroupRuleCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        self.compute_client.api.security_group_find = mock.Mock(
+        compute_v2.find_security_group = mock.Mock(
             return_value=self._security_group,
         )
-        self.compute_client.api.security_group_list = mock.Mock(
+        compute_v2.list_security_groups = mock.Mock(
             return_value=[self._security_group],
         )
 
@@ -446,8 +456,8 @@ class TestListSecurityGroupRuleCompute(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, [], [])
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_client.api.security_group_list.assert_called_once_with(
-            search_opts={'all_tenants': False}
+        compute_v2.list_security_groups.assert_called_once_with(
+            self.compute_sdk_client, all_projects=False
         )
         self.assertEqual(self.expected_columns_no_group, columns)
         self.assertEqual(self.expected_data_no_group, list(data))
@@ -462,8 +472,8 @@ class TestListSecurityGroupRuleCompute(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_client.api.security_group_find.assert_called_once_with(
-            self._security_group['id']
+        compute_v2.find_security_group.assert_called_once_with(
+            self.compute_sdk_client, self._security_group['id']
         )
         self.assertEqual(self.expected_columns_with_group, columns)
         self.assertEqual(self.expected_data_with_group, list(data))
@@ -478,8 +488,8 @@ class TestListSecurityGroupRuleCompute(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_client.api.security_group_list.assert_called_once_with(
-            search_opts={'all_tenants': True}
+        compute_v2.list_security_groups.assert_called_once_with(
+            self.compute_sdk_client, all_projects=True
         )
         self.assertEqual(self.expected_columns_no_group, columns)
         self.assertEqual(self.expected_data_no_group, list(data))
@@ -494,8 +504,8 @@ class TestListSecurityGroupRuleCompute(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_client.api.security_group_list.assert_called_once_with(
-            search_opts={'all_tenants': False}
+        compute_v2.list_security_groups.assert_called_once_with(
+            self.compute_sdk_client, all_projects=False
         )
         self.assertEqual(self.expected_columns_no_group, columns)
         self.assertEqual(self.expected_data_no_group, list(data))
@@ -510,14 +520,14 @@ class TestShowSecurityGroupRuleCompute(compute_fakes.TestComputev2):
     )
 
     def setUp(self):
-        super(TestShowSecurityGroupRuleCompute, self).setUp()
+        super().setUp()
 
         self.app.client_manager.network_endpoint_enabled = False
 
         # Build a security group fake customized for this test.
         security_group_rules = [self._security_group_rule]
         security_group = {'rules': security_group_rules}
-        self.compute_client.api.security_group_list = mock.Mock(
+        compute_v2.list_security_groups = mock.Mock(
             return_value=[security_group],
         )
 
@@ -540,6 +550,8 @@ class TestShowSecurityGroupRuleCompute(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_client.api.security_group_list.assert_called_once_with()
+        compute_v2.list_security_groups.assert_called_once_with(
+            self.compute_sdk_client
+        )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)