python-openstackclient 6.3.0__py3-none-any.whl → 6.5.0__py3-none-any.whl

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

@@ -24,16 +24,8 @@ from openstackclient.tests.unit import utils as tests_utils
 # Tests for Nova network
 
 
-class TestFloatingIPCompute(compute_fakes.TestComputev2):
-    def setUp(self):
-        super(TestFloatingIPCompute, self).setUp()
-
-        # Get a shortcut to the compute client
-        self.compute = self.app.client_manager.compute
-
-
 @mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_create')
-class TestCreateFloatingIPCompute(TestFloatingIPCompute):
+class TestCreateFloatingIPCompute(compute_fakes.TestComputev2):
     # The floating ip to be deleted.
     _floating_ip = compute_fakes.create_one_floating_ip()
 
@@ -58,7 +50,7 @@ class TestCreateFloatingIPCompute(TestFloatingIPCompute):
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        # self.compute.floating_ips.create.return_value = self.floating_ip
+        # self.compute_client.floating_ips.create.return_value = self.floating_ip
 
         # Get the command object to test
         self.cmd = fip.CreateFloatingIP(self.app, None)
@@ -93,7 +85,7 @@ class TestCreateFloatingIPCompute(TestFloatingIPCompute):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_delete')
-class TestDeleteFloatingIPCompute(TestFloatingIPCompute):
+class TestDeleteFloatingIPCompute(compute_fakes.TestComputev2):
     # The floating ips to be deleted.
     _floating_ips = compute_fakes.create_floating_ips(count=2)
 
@@ -169,7 +161,7 @@ class TestDeleteFloatingIPCompute(TestFloatingIPCompute):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_list')
-class TestListFloatingIPCompute(TestFloatingIPCompute):
+class TestListFloatingIPCompute(compute_fakes.TestComputev2):
     # The floating ips to be list up
     _floating_ips = compute_fakes.create_floating_ips(count=3)
 
@@ -215,7 +207,7 @@ class TestListFloatingIPCompute(TestFloatingIPCompute):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_find')
-class TestShowFloatingIPCompute(TestFloatingIPCompute):
+class TestShowFloatingIPCompute(compute_fakes.TestComputev2):
     # The floating ip to display.
     _floating_ip = compute_fakes.create_one_floating_ip()
 

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

@@ -20,16 +20,8 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 # Tests for Compute network
 
 
-class TestFloatingIPPoolCompute(compute_fakes.TestComputev2):
-    def setUp(self):
-        super(TestFloatingIPPoolCompute, self).setUp()
-
-        # Get a shortcut to the compute client
-        self.compute = self.app.client_manager.compute
-
-
 @mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_pool_list')
-class TestListFloatingIPPoolCompute(TestFloatingIPPoolCompute):
+class TestListFloatingIPPoolCompute(compute_fakes.TestComputev2):
     # The floating ip pools to list up
     _floating_ip_pools = compute_fakes.create_floating_ip_pools(count=3)
 

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

@@ -1063,6 +1063,39 @@ class TestSetNetwork(TestNetwork):
         )
         self.assertIsNone(result)
 
+    def test_set_to_empty(self):
+        # Test if empty strings are accepted to clear any of the fields,
+        # so once they are set to a value its possible to clear them again.
+
+        arglist = [
+            self._network.name,
+            '--name',
+            '',
+            '--description',
+            '',
+            '--dns-domain',
+            '',
+        ]
+        verifylist = [
+            ('network', self._network.name),
+            ('description', ''),
+            ('name', ''),
+            ('dns_domain', ''),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        result = self.cmd.take_action(parsed_args)
+
+        attrs = {
+            'name': '',
+            'description': '',
+            'dns_domain': '',
+        }
+        self.network_client.update_network.assert_called_once_with(
+            self._network, **attrs
+        )
+        self.assertIsNone(result)
+
     def test_set_nothing(self):
         arglist = [
             self._network.name,

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

@@ -23,16 +23,10 @@ from openstackclient.tests.unit import utils as tests_utils
 
 # Tests for Nova network
 #
-class TestNetworkCompute(compute_fakes.TestComputev2):
-    def setUp(self):
-        super(TestNetworkCompute, self).setUp()
-
-        # Get a shortcut to the compute client
-        self.compute = self.app.client_manager.compute
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.network_create')
-class TestCreateNetworkCompute(TestNetworkCompute):
+class TestCreateNetworkCompute(compute_fakes.TestComputev2):
     # The network to create.
     _network = compute_fakes.create_one_network()
 
@@ -172,7 +166,7 @@ class TestCreateNetworkCompute(TestNetworkCompute):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.network_delete')
-class TestDeleteNetworkCompute(TestNetworkCompute):
+class TestDeleteNetworkCompute(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestDeleteNetworkCompute, self).setUp()
 
@@ -182,7 +176,7 @@ class TestDeleteNetworkCompute(TestNetworkCompute):
         self._networks = compute_fakes.create_networks(count=3)
 
         # Return value of utils.find_resource()
-        self.compute.api.network_find = compute_fakes.get_networks(
+        self.compute_client.api.network_find = compute_fakes.get_networks(
             networks=self._networks
         )
 
@@ -252,7 +246,7 @@ class TestDeleteNetworkCompute(TestNetworkCompute):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.network_list')
-class TestListNetworkCompute(TestNetworkCompute):
+class TestListNetworkCompute(compute_fakes.TestComputev2):
     # The networks going to be listed up.
     _networks = compute_fakes.create_networks(count=3)
 
@@ -297,7 +291,7 @@ class TestListNetworkCompute(TestNetworkCompute):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.network_find')
-class TestShowNetworkCompute(TestNetworkCompute):
+class TestShowNetworkCompute(compute_fakes.TestComputev2):
     # The network to show.
     _network = compute_fakes.create_one_network()
 

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

@@ -9,9 +9,7 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
-import argparse
 import copy
 from unittest import mock
 from unittest.mock import call
@@ -23,7 +21,7 @@ import testtools
 from openstackclient.network.v2 import network_trunk
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes
-from openstackclient.tests.unit import utils as tests_utils
+from openstackclient.tests.unit import utils as test_utils
 
 
 # Tests for Neutron trunks
@@ -104,7 +102,7 @@ class TestCreateNetworkTrunk(TestNetworkTrunk):
         verifylist = []
 
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -289,7 +287,7 @@ class TestCreateNetworkTrunk(TestNetworkTrunk):
             ),
         ]
 
-        with testtools.ExpectedException(argparse.ArgumentTypeError):
+        with testtools.ExpectedException(test_utils.ParserException):
             self.check_parser(self.cmd, arglist, verifylist)
 
 
@@ -432,7 +430,7 @@ class TestShowNetworkTrunk(TestNetworkTrunk):
         verifylist = []
 
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -755,7 +753,7 @@ class TestSetNetworkTrunk(TestNetworkTrunk):
             ),
         ]
 
-        with testtools.ExpectedException(argparse.ArgumentTypeError):
+        with testtools.ExpectedException(test_utils.ParserException):
             self.check_parser(self.cmd, arglist, verifylist)
 
         self.network_client.add_trunk_subports.assert_not_called()
@@ -949,7 +947,7 @@ class TestUnsetNetworkTrunk(TestNetworkTrunk):
             ('trunk', self._trunk['name']),
         ]
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,

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

@@ -9,9 +9,7 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
-import argparse
 from unittest import mock
 from unittest.mock import call
 
@@ -23,7 +21,7 @@ from openstackclient.network.v2 import port
 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.network.v2 import fakes as network_fakes
-from openstackclient.tests.unit import utils as tests_utils
+from openstackclient.tests.unit import utils as test_utils
 
 
 LIST_FIELDS_TO_RETRIEVE = ('id', 'name', 'mac_address', 'fixed_ips', 'status')
@@ -58,6 +56,7 @@ class TestPort(network_fakes.TestNetworkV2):
             'dns_name',
             'extra_dhcp_opts',
             'fixed_ips',
+            'hardware_offload_type',
             'hints',
             'id',
             'ip_allocation',
@@ -98,6 +97,7 @@ class TestPort(network_fakes.TestNetworkV2):
             fake_port.dns_name,
             format_columns.ListDictColumn(fake_port.extra_dhcp_opts),
             format_columns.ListDictColumn(fake_port.fixed_ips),
+            fake_port.hardware_offload_type,
             fake_port.hints,
             fake_port.id,
             fake_port.ip_allocation,
@@ -172,7 +172,7 @@ class TestCreatePort(TestPort):
         )
         self.assertFalse(self.network_client.set_tags.called)
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_full_options(self):
@@ -245,7 +245,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_invalid_json_binding_profile(self):
@@ -257,7 +257,7 @@ class TestCreatePort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -273,7 +273,7 @@ class TestCreatePort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -309,7 +309,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_with_security_group(self):
@@ -347,7 +347,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_port_with_dns_name(self):
@@ -380,7 +380,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_with_security_groups(self):
@@ -420,7 +420,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_with_no_security_groups(self):
@@ -449,7 +449,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_with_no_fixed_ips(self):
@@ -478,7 +478,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_port_with_allowed_address_pair_ipaddr(self):
@@ -520,7 +520,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_port_with_allowed_address_pair(self):
@@ -571,7 +571,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_port_with_qos(self):
@@ -608,7 +608,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_port_security_enabled(self):
@@ -733,12 +733,12 @@ class TestCreatePort(TestPort):
             )
             if add_tags:
                 self.network_client.set_tags.assert_called_once_with(
-                    self._port, tests_utils.CompareBySet(['red', 'blue'])
+                    self._port, test_utils.CompareBySet(['red', 'blue'])
                 )
             else:
                 self.assertFalse(self.network_client.set_tags.called)
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_with_tags(self):
@@ -787,7 +787,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_with_uplink_status_propagation_enabled(self):
@@ -893,7 +893,7 @@ class TestCreatePort(TestPort):
             create_args['numa_affinity_policy'] = numa_affinity_policy
         self.network_client.create_port.assert_called_once_with(**create_args)
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_with_numa_affinity_policy_required(self):
@@ -940,7 +940,7 @@ class TestCreatePort(TestPort):
             'device_profile': 'cyborg_device_profile_1',
         }
         self.network_client.create_port.assert_called_once_with(**create_args)
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_hints_invalid_json(self):
@@ -952,7 +952,7 @@ class TestCreatePort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -976,7 +976,7 @@ class TestCreatePort(TestPort):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            exceptions.CommandError,
             self.cmd.take_action,
             parsed_args,
         )
@@ -998,7 +998,7 @@ class TestCreatePort(TestPort):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            exceptions.CommandError,
             self.cmd.take_action,
             parsed_args,
         )
@@ -1032,7 +1032,7 @@ class TestCreatePort(TestPort):
             }
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
     def test_create_hints_valid_json(self):
@@ -1067,9 +1067,51 @@ class TestCreatePort(TestPort):
             }
         )
 
+        self.assertCountEqual(self.columns, columns)
+        self.assertCountEqual(self.data, data)
+
+    def _test_create_with_hardware_offload_type(self, hwol_type=None):
+        arglist = [
+            '--network',
+            self._port.network_id,
+            'test-port',
+        ]
+        if hwol_type:
+            arglist += ['--hardware-offload-type', hwol_type]
+
+        hardware_offload_type = None if not hwol_type else hwol_type
+        verifylist = [
+            (
+                'network',
+                self._port.network_id,
+            ),
+            ('name', 'test-port'),
+        ]
+        if hwol_type:
+            verifylist.append(('hardware_offload_type', hwol_type))
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        create_args = {
+            'admin_state_up': True,
+            'network_id': self._port.network_id,
+            'name': 'test-port',
+        }
+        if hwol_type:
+            create_args['hardware_offload_type'] = hardware_offload_type
+        self.network_client.create_port.assert_called_once_with(**create_args)
+
         self.assertEqual(set(self.columns), set(columns))
         self.assertCountEqual(self.data, data)
 
+    def test_create_with_hardware_offload_type_switchdev(self):
+        self._test_create_with_hardware_offload_type(hwol_type='switchdev')
+
+    def test_create_with_hardware_offload_type_null(self):
+        self._test_create_with_hardware_offload_type()
+
 
 class TestDeletePort(TestPort):
     # Ports to delete.
@@ -1200,8 +1242,6 @@ class TestListPort(TestPort):
     def setUp(self):
         super(TestListPort, self).setUp()
 
-        # Get the command object to test
-        self.cmd = port.ListPort(self.app, self.namespace)
         self.network_client.ports = mock.Mock(return_value=self._ports)
         fake_router = network_fakes.FakeRouter.create_one_router(
             {
@@ -1215,7 +1255,12 @@ class TestListPort(TestPort):
         )
         self.network_client.find_router = mock.Mock(return_value=fake_router)
         self.network_client.find_network = mock.Mock(return_value=fake_network)
+
         self.app.client_manager.compute = mock.Mock()
+        self.compute_client = self.app.client_manager.compute
+
+        # Get the command object to test
+        self.cmd = port.ListPort(self.app, self.namespace)
 
     def test_port_list_no_options(self):
         arglist = []
@@ -1662,7 +1707,7 @@ class TestListPort(TestPort):
 
         columns, data = self.cmd.take_action(parsed_args)
         filters = {
-            'security_groups': ['sg-id1', 'sg-id2'],
+            'security_group_ids': ['sg-id1', 'sg-id2'],
             'fields': LIST_FIELDS_TO_RETRIEVE,
         }
 
@@ -1902,7 +1947,7 @@ class TestSetPort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -1916,7 +1961,7 @@ class TestSetPort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2282,7 +2327,7 @@ class TestSetPort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2306,7 +2351,7 @@ class TestSetPort(TestPort):
 
         self.assertFalse(self.network_client.update_port.called)
         self.network_client.set_tags.assert_called_once_with(
-            self._port, tests_utils.CompareBySet(expected_args)
+            self._port, test_utils.CompareBySet(expected_args)
         )
         self.assertIsNone(result)
 
@@ -2355,7 +2400,7 @@ class TestSetPort(TestPort):
             'test-port',
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2374,7 +2419,7 @@ class TestSetPort(TestPort):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            exceptions.CommandError,
             self.cmd.take_action,
             parsed_args,
         )
@@ -2391,7 +2436,7 @@ class TestSetPort(TestPort):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            exceptions.CommandError,
             self.cmd.take_action,
             parsed_args,
         )
@@ -2474,7 +2519,7 @@ class TestShowPort(TestPort):
         verifylist = []
 
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2496,7 +2541,7 @@ class TestShowPort(TestPort):
             self._port.name, ignore_missing=False
         )
 
-        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
 
@@ -2753,7 +2798,7 @@ class TestUnsetPort(TestPort):
 
         self.assertFalse(self.network_client.update_port.called)
         self.network_client.set_tags.assert_called_once_with(
-            self._testport, tests_utils.CompareBySet(expected_args)
+            self._testport, test_utils.CompareBySet(expected_args)
         )
         self.assertIsNone(result)
 

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

@@ -22,16 +22,8 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-class TestSecurityGroupCompute(compute_fakes.TestComputev2):
-    def setUp(self):
-        super(TestSecurityGroupCompute, self).setUp()
-
-        # Get a shortcut to the compute client
-        self.compute = self.app.client_manager.compute
-
-
 @mock.patch('openstackclient.api.compute_v2.APIv2.security_group_create')
-class TestCreateSecurityGroupCompute(TestSecurityGroupCompute):
+class TestCreateSecurityGroupCompute(compute_fakes.TestComputev2):
     project = identity_fakes.FakeProject.create_one_project()
     domain = identity_fakes.FakeDomain.create_one_domain()
 
@@ -110,7 +102,7 @@ class TestCreateSecurityGroupCompute(TestSecurityGroupCompute):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.security_group_delete')
-class TestDeleteSecurityGroupCompute(TestSecurityGroupCompute):
+class TestDeleteSecurityGroupCompute(compute_fakes.TestComputev2):
     # The security groups to be deleted.
     _security_groups = compute_fakes.create_security_groups()
 
@@ -119,7 +111,7 @@ class TestDeleteSecurityGroupCompute(TestSecurityGroupCompute):
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        self.compute.api.security_group_find = (
+        self.compute_client.api.security_group_find = (
             compute_fakes.get_security_groups(self._security_groups)
         )
 
@@ -192,7 +184,7 @@ class TestDeleteSecurityGroupCompute(TestSecurityGroupCompute):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.security_group_list')
-class TestListSecurityGroupCompute(TestSecurityGroupCompute):
+class TestListSecurityGroupCompute(compute_fakes.TestComputev2):
     # The security group to be listed.
     _security_groups = compute_fakes.create_security_groups(count=3)
 
@@ -270,7 +262,7 @@ class TestListSecurityGroupCompute(TestSecurityGroupCompute):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.security_group_set')
-class TestSetSecurityGroupCompute(TestSecurityGroupCompute):
+class TestSetSecurityGroupCompute(compute_fakes.TestComputev2):
     # The security group to be set.
     _security_group = compute_fakes.create_one_security_group()
 
@@ -279,7 +271,7 @@ class TestSetSecurityGroupCompute(TestSecurityGroupCompute):
 
         self.app.client_manager.network_endpoint_enabled = False
 
-        self.compute.api.security_group_find = mock.Mock(
+        self.compute_client.api.security_group_find = mock.Mock(
             return_value=self._security_group
         )
 
@@ -337,7 +329,7 @@ class TestSetSecurityGroupCompute(TestSecurityGroupCompute):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.security_group_find')
-class TestShowSecurityGroupCompute(TestSecurityGroupCompute):
+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()