python-openstackclient 8.2.0__py3-none-any.whl → 8.3.0__py3-none-any.whl

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

@@ -11,11 +11,9 @@
 #   under the License.
 #
 
-from unittest import mock
 from unittest.mock import call
 import uuid
 
-from openstack.network.v2 import _proxy
 from openstack.network.v2 import (
     default_security_group_rule as _default_security_group_rule,
 )
@@ -28,18 +26,7 @@ from openstackclient.tests.unit.network.v2 import fakes as network_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-class TestDefaultSecurityGroupRule(network_fakes.TestNetworkV2):
-    def setUp(self):
-        super().setUp()
-
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.network = mock.Mock(
-            spec=_proxy.Proxy,
-        )
-        self.sdk_client = self.app.client_manager.sdk_connection.network
-
-
-class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
+class TestCreateDefaultSecurityGroupRule(network_fakes.TestNetworkV2):
     expected_columns = (
         'description',
         'direction',
@@ -82,7 +69,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
             **default_security_group_rule_attrs,
         )
 
-        self.sdk_client.create_default_security_group_rule.return_value = (
+        self.network_client.create_default_security_group_rule.return_value = (
             self._default_sg_rule
         )
         self.expected_data = (
@@ -208,7 +195,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -252,7 +239,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -302,7 +289,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -347,7 +334,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -381,7 +368,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -415,7 +402,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -449,7 +436,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -599,7 +586,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -637,7 +624,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -675,7 +662,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -713,7 +700,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -754,7 +741,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -794,7 +781,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'direction': self._default_sg_rule.direction,
                 'ethertype': self._default_sg_rule.ether_type,
@@ -825,7 +812,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_default_security_group_rule.assert_called_once_with(
+        self.network_client.create_default_security_group_rule.assert_called_once_with(
             **{
                 'description': self._default_sg_rule.description,
                 'direction': self._default_sg_rule.direction,
@@ -840,7 +827,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
         self.assertEqual(self.expected_data, data)
 
 
-class TestDeleteDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
+class TestDeleteDefaultSecurityGroupRule(network_fakes.TestNetworkV2):
     # The default security group rules to be deleted.
     default_security_group_rule_attrs = {
         'direction': 'ingress',
@@ -866,7 +853,9 @@ class TestDeleteDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
     def setUp(self):
         super().setUp()
 
-        self.sdk_client.delete_default_security_group_rule.return_value = None
+        self.network_client.delete_default_security_group_rule.return_value = (
+            None
+        )
 
         # Get the command object to test
         self.cmd = default_security_group_rule.DeleteDefaultSecurityGroupRule(
@@ -880,7 +869,7 @@ class TestDeleteDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
         verifylist = [
             ('rule', [self._default_sg_rules[0].id]),
         ]
-        self.sdk_client.find_default_security_group_rule.return_value = (
+        self.network_client.find_default_security_group_rule.return_value = (
             self._default_sg_rules[0]
         )
 
@@ -888,7 +877,7 @@ class TestDeleteDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.delete_default_security_group_rule.assert_called_once_with(
+        self.network_client.delete_default_security_group_rule.assert_called_once_with(
             self._default_sg_rules[0]
         )
         self.assertIsNone(result)
@@ -902,7 +891,7 @@ class TestDeleteDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
         verifylist = [
             ('rule', arglist),
         ]
-        self.sdk_client.find_default_security_group_rule.side_effect = (
+        self.network_client.find_default_security_group_rule.side_effect = (
             self._default_sg_rules
         )
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -912,7 +901,7 @@ class TestDeleteDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
         calls = []
         for s in self._default_sg_rules:
             calls.append(call(s))
-        self.sdk_client.delete_default_security_group_rule.assert_has_calls(
+        self.network_client.delete_default_security_group_rule.assert_has_calls(
             calls
         )
         self.assertIsNone(result)
@@ -931,8 +920,8 @@ class TestDeleteDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
             self._default_sg_rules[0],
             exceptions.CommandError,
         ]
-        self.sdk_client.find_default_security_group_rule = mock.Mock(
-            side_effect=find_mock_result
+        self.network_client.find_default_security_group_rule.side_effect = (
+            find_mock_result
         )
 
         try:
@@ -941,18 +930,18 @@ class TestDeleteDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
         except exceptions.CommandError as e:
             self.assertEqual('1 of 2 default rules failed to delete.', str(e))
 
-        self.sdk_client.find_default_security_group_rule.assert_any_call(
+        self.network_client.find_default_security_group_rule.assert_any_call(
             self._default_sg_rules[0].id, ignore_missing=False
         )
-        self.sdk_client.find_default_security_group_rule.assert_any_call(
+        self.network_client.find_default_security_group_rule.assert_any_call(
             'unexist_rule', ignore_missing=False
         )
-        self.sdk_client.delete_default_security_group_rule.assert_called_once_with(
+        self.network_client.delete_default_security_group_rule.assert_called_once_with(
             self._default_sg_rules[0]
         )
 
 
-class TestListDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
+class TestListDefaultSecurityGroupRule(network_fakes.TestNetworkV2):
     # The security group rule to be listed.
     _default_sg_rule_tcp = sdk_fakes.generate_fake_resource(
         _default_security_group_rule.DefaultSecurityGroupRule,
@@ -1001,7 +990,7 @@ class TestListDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
     def setUp(self):
         super().setUp()
 
-        self.sdk_client.default_security_group_rules.return_value = (
+        self.network_client.default_security_group_rules.return_value = (
             self._default_sg_rules
         )
 
@@ -1016,7 +1005,7 @@ class TestListDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.default_security_group_rules.assert_called_once_with(
+        self.network_client.default_security_group_rules.assert_called_once_with(
             **{}
         )
         self.assertEqual(self.expected_columns, columns)
@@ -1035,7 +1024,7 @@ class TestListDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.default_security_group_rules.assert_called_once_with(
+        self.network_client.default_security_group_rules.assert_called_once_with(
             **{
                 'protocol': 'tcp',
             }
@@ -1055,7 +1044,7 @@ class TestListDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.default_security_group_rules.assert_called_once_with(
+        self.network_client.default_security_group_rules.assert_called_once_with(
             **{
                 'direction': 'ingress',
             }
@@ -1075,7 +1064,7 @@ class TestListDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.default_security_group_rules.assert_called_once_with(
+        self.network_client.default_security_group_rules.assert_called_once_with(
             **{
                 'direction': 'egress',
             }
@@ -1084,7 +1073,7 @@ class TestListDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
         self.assertEqual(self.expected_data, list(data))
 
 
-class TestShowDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
+class TestShowDefaultSecurityGroupRule(network_fakes.TestNetworkV2):
     # The default security group rule to be shown.
     _default_sg_rule = sdk_fakes.generate_fake_resource(
         _default_security_group_rule.DefaultSecurityGroupRule
@@ -1123,7 +1112,7 @@ class TestShowDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
     def setUp(self):
         super().setUp()
 
-        self.sdk_client.find_default_security_group_rule.return_value = (
+        self.network_client.find_default_security_group_rule.return_value = (
             self._default_sg_rule
         )
 
@@ -1148,7 +1137,7 @@ class TestShowDefaultSecurityGroupRule(TestDefaultSecurityGroupRule):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_default_security_group_rule.assert_called_once_with(
+        self.network_client.find_default_security_group_rule.assert_called_once_with(
             self._default_sg_rule.id, ignore_missing=False
         )
         self.assertEqual(self.columns, columns)

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

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-from unittest import mock
 from unittest.mock import call
 
 from openstack.network.v2 import floating_ip as _floating_ip
@@ -86,16 +85,14 @@ class TestCreateFloatingIPNetwork(TestFloatingIPNetwork):
     def setUp(self):
         super().setUp()
 
-        self.network_client.create_ip = mock.Mock(
-            return_value=self.floating_ip
-        )
-        self.network_client.set_tags = mock.Mock(return_value=None)
+        self.network_client.create_ip.return_value = self.floating_ip
 
-        self.network_client.find_network = mock.Mock(
-            return_value=self.floating_network
-        )
-        self.network_client.find_subnet = mock.Mock(return_value=self.subnet)
-        self.network_client.find_port = mock.Mock(return_value=self.port)
+        self.network_client.set_tags.return_value = None
+
+        self.network_client.find_network.return_value = self.floating_network
+
+        self.network_client.find_subnet.return_value = self.subnet
+        self.network_client.find_port.return_value = self.port
 
         # Get the command object to test
         self.cmd = fip.CreateFloatingIP(self.app, None)
@@ -304,7 +301,7 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
     def setUp(self):
         super().setUp()
 
-        self.network_client.delete_ip = mock.Mock(return_value=None)
+        self.network_client.delete_ip.return_value = None
 
         # Get the command object to test
         self.cmd = fip.DeleteFloatingIP(self.app, None)
@@ -470,14 +467,11 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
     def setUp(self):
         super().setUp()
 
-        self.network_client.ips = mock.Mock(return_value=self.floating_ips)
-        self.network_client.find_network = mock.Mock(
-            return_value=self.fake_network
-        )
-        self.network_client.find_port = mock.Mock(return_value=self.fake_port)
-        self.network_client.find_router = mock.Mock(
-            return_value=self.fake_router
-        )
+        self.network_client.ips.return_value = self.floating_ips
+        self.network_client.find_network.return_value = self.fake_network
+
+        self.network_client.find_port.return_value = self.fake_port
+        self.network_client.find_router.return_value = self.fake_router
 
         # Get the command object to test
         self.cmd = fip.ListFloatingIP(self.app, None)
@@ -713,7 +707,7 @@ class TestShowFloatingIPNetwork(TestFloatingIPNetwork):
         self.floating_ip = sdk_fakes.generate_fake_resource(
             _floating_ip.FloatingIP
         )
-        self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
+        self.network_client.find_ip.return_value = self.floating_ip
 
         self.columns = (
             'created_at',
@@ -797,10 +791,10 @@ class TestSetFloatingIP(TestFloatingIPNetwork):
 
     def setUp(self):
         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)
+        self.network_client.find_ip.return_value = self.floating_ip
+        self.network_client.find_port.return_value = self.port
+        self.network_client.update_ip.return_value = None
+        self.network_client.set_tags.return_value = None
 
         # Get the command object to test
         self.cmd = fip.SetFloatingIP(self.app, None)
@@ -1044,9 +1038,9 @@ class TestUnsetFloatingIP(TestFloatingIPNetwork):
 
     def setUp(self):
         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)
+        self.network_client.find_ip.return_value = self.floating_ip
+        self.network_client.update_ip.return_value = None
+        self.network_client.set_tags.return_value = None
 
         # Get the command object to test
         self.cmd = fip.UnsetFloatingIP(self.app, None)

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

@@ -33,7 +33,7 @@ class TestFloatingIPPortForwarding(network_fakes.TestNetworkV2):
         )
         self.port = network_fakes.create_one_port()
         self.project = identity_fakes_v2.FakeProject.create_one_project()
-        self.network_client.find_port = mock.Mock(return_value=self.port)
+        self.network_client.find_port.return_value = self.port
 
 
 class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
@@ -54,11 +54,11 @@ class TestCreateFloatingIPPortForwarding(TestFloatingIPPortForwarding):
             },
         )
 
-        self.network_client.create_floating_ip_port_forwarding = mock.Mock(
-            return_value=self.new_port_forwarding
+        self.network_client.create_floating_ip_port_forwarding.return_value = (
+            self.new_port_forwarding
         )
 
-        self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
+        self.network_client.find_ip.return_value = self.floating_ip
 
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.CreateFloatingIPPortForwarding(
@@ -351,11 +351,11 @@ class TestDeleteFloatingIPPortForwarding(TestFloatingIPPortForwarding):
                 },
             )
         )
-        self.network_client.delete_floating_ip_port_forwarding = mock.Mock(
-            return_value=None
+        self.network_client.delete_floating_ip_port_forwarding.return_value = (
+            None
         )
 
-        self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
+        self.network_client.find_ip.return_value = self.floating_ip
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.DeleteFloatingIPPortForwarding(
             self.app, None
@@ -490,10 +490,11 @@ class TestListFloatingIPPortForwarding(TestFloatingIPPortForwarding):
                     port_forwarding.description,
                 )
             )
-        self.network_client.floating_ip_port_forwardings = mock.Mock(
-            return_value=self.port_forwardings
+        self.network_client.floating_ip_port_forwardings.return_value = (
+            self.port_forwardings
         )
-        self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
+
+        self.network_client.find_ip.return_value = self.floating_ip
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.ListFloatingIPPortForwarding(
             self.app, None
@@ -557,14 +558,15 @@ class TestSetFloatingIPPortForwarding(TestFloatingIPPortForwarding):
                 'floatingip_id': self.floating_ip.id,
             }
         )
-        self.network_client.update_floating_ip_port_forwarding = mock.Mock(
-            return_value=None
+        self.network_client.update_floating_ip_port_forwarding.return_value = (
+            None
         )
 
-        self.network_client.find_floating_ip_port_forwarding = mock.Mock(
-            return_value=self._port_forwarding
+        self.network_client.find_floating_ip_port_forwarding.return_value = (
+            self._port_forwarding
         )
-        self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
+
+        self.network_client.find_ip.return_value = self.floating_ip
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.SetFloatingIPPortForwarding(
             self.app, None
@@ -690,10 +692,11 @@ class TestShowFloatingIPPortForwarding(TestFloatingIPPortForwarding):
             self._port_forwarding.internal_port_range,
             self._port_forwarding.protocol,
         )
-        self.network_client.find_floating_ip_port_forwarding = mock.Mock(
-            return_value=self._port_forwarding
+        self.network_client.find_floating_ip_port_forwarding.return_value = (
+            self._port_forwarding
         )
-        self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
+
+        self.network_client.find_ip.return_value = self.floating_ip
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.ShowFloatingIPPortForwarding(
             self.app, None

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

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-from unittest import mock
 
 from osc_lib.cli import format_columns
 
@@ -55,8 +54,8 @@ class TestListIPAvailability(TestIPAvailability):
         super().setUp()
 
         self.cmd = ip_availability.ListIPAvailability(self.app, None)
-        self.network_client.network_ip_availabilities = mock.Mock(
-            return_value=self._ip_availability
+        self.network_client.network_ip_availabilities.return_value = (
+            self._ip_availability
         )
 
     def test_list_no_options(self):
@@ -134,13 +133,12 @@ class TestShowIPAvailability(TestIPAvailability):
     def setUp(self):
         super().setUp()
 
-        self.network_client.find_network_ip_availability = mock.Mock(
-            return_value=self._ip_availability
-        )
-        self.network_client.find_network = mock.Mock(
-            return_value=self._network
+        self.network_client.find_network_ip_availability.return_value = (
+            self._ip_availability
         )
 
+        self.network_client.find_network.return_value = self._network
+
         # Get the command object to test
         self.cmd = ip_availability.ShowIPAvailability(self.app, None)
 

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

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-from unittest import mock
 
 from osc_lib import exceptions
 
@@ -46,8 +45,8 @@ class TestCreateL3ConntrackHelper(TestConntrackHelper):
             self.ct_helper.protocol,
             self.ct_helper.router_id,
         )
-        self.network_client.create_conntrack_helper = mock.Mock(
-            return_value=self.ct_helper
+        self.network_client.create_conntrack_helper.return_value = (
+            self.ct_helper
         )
 
         # Get the command object to test
@@ -119,9 +118,7 @@ class TestDeleteL3ConntrackHelper(TestConntrackHelper):
                 attrs
             )
         )
-        self.network_client.delete_conntrack_helper = mock.Mock(
-            return_value=None
-        )
+        self.network_client.delete_conntrack_helper.return_value = None
 
         # Get the command object to test
         self.cmd = l3_conntrack_helper.DeleteConntrackHelper(self.app, None)
@@ -181,9 +178,7 @@ class TestListL3ConntrackHelper(TestConntrackHelper):
                     ct_helper.port,
                 )
             )
-        self.network_client.conntrack_helpers = mock.Mock(
-            return_value=ct_helpers
-        )
+        self.network_client.conntrack_helpers.return_value = ct_helpers
 
         # Get the command object to test
         self.cmd = l3_conntrack_helper.ListConntrackHelper(self.app, None)
@@ -216,9 +211,7 @@ class TestSetL3ConntrackHelper(TestConntrackHelper):
                 attrs
             )
         )
-        self.network_client.update_conntrack_helper = mock.Mock(
-            return_value=None
-        )
+        self.network_client.update_conntrack_helper.return_value = None
 
         # Get the command object to test
         self.cmd = l3_conntrack_helper.SetConntrackHelper(self.app, None)
@@ -281,9 +274,7 @@ class TestShowL3ConntrackHelper(TestConntrackHelper):
             self.ct_helper.protocol,
             self.ct_helper.router_id,
         )
-        self.network_client.get_conntrack_helper = mock.Mock(
-            return_value=self.ct_helper
-        )
+        self.network_client.get_conntrack_helper.return_value = self.ct_helper
 
         # Get the command object to test
         self.cmd = l3_conntrack_helper.ShowConntrackHelper(self.app, None)