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

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

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-from unittest import mock
 from unittest.mock import call
 
 from osc_lib import exceptions
@@ -58,12 +57,9 @@ class TestCreateNetworkSegment(TestNetworkSegment):
     def setUp(self):
         super().setUp()
 
-        self.network_client.create_segment = mock.Mock(
-            return_value=self._network_segment
-        )
-        self.network_client.find_network = mock.Mock(
-            return_value=self._network
-        )
+        self.network_client.create_segment.return_value = self._network_segment
+
+        self.network_client.find_network.return_value = self._network
 
         # Get the command object to test
         self.cmd = network_segment.CreateNetworkSegment(self.app, None)
@@ -172,10 +168,8 @@ class TestDeleteNetworkSegment(TestNetworkSegment):
     def setUp(self):
         super().setUp()
 
-        self.network_client.delete_segment = mock.Mock(return_value=None)
-        self.network_client.find_segment = mock.Mock(
-            side_effect=self._network_segments
-        )
+        self.network_client.delete_segment.return_value = None
+        self.network_client.find_segment.side_effect = self._network_segments
 
         # Get the command object to test
         self.cmd = network_segment.DeleteNetworkSegment(self.app, None)
@@ -224,9 +218,7 @@ class TestDeleteNetworkSegment(TestNetworkSegment):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         find_mock_result = [self._network_segments[0], exceptions.CommandError]
-        self.network_client.find_segment = mock.Mock(
-            side_effect=find_mock_result
-        )
+        self.network_client.find_segment.side_effect = find_mock_result
 
         try:
             self.cmd.take_action(parsed_args)
@@ -291,12 +283,9 @@ class TestListNetworkSegment(TestNetworkSegment):
         # Get the command object to test
         self.cmd = network_segment.ListNetworkSegment(self.app, None)
 
-        self.network_client.find_network = mock.Mock(
-            return_value=self._network
-        )
-        self.network_client.segments = mock.Mock(
-            return_value=self._network_segments
-        )
+        self.network_client.find_network.return_value = self._network
+
+        self.network_client.segments.return_value = self._network_segments
 
     def test_list_no_option(self):
         arglist = []
@@ -352,12 +341,9 @@ class TestSetNetworkSegment(TestNetworkSegment):
     def setUp(self):
         super().setUp()
 
-        self.network_client.find_segment = mock.Mock(
-            return_value=self._network_segment
-        )
-        self.network_client.update_segment = mock.Mock(
-            return_value=self._network_segment
-        )
+        self.network_client.find_segment.return_value = self._network_segment
+
+        self.network_client.update_segment.return_value = self._network_segment
 
         # Get the command object to test
         self.cmd = network_segment.SetNetworkSegment(self.app, None)
@@ -432,9 +418,7 @@ class TestShowNetworkSegment(TestNetworkSegment):
     def setUp(self):
         super().setUp()
 
-        self.network_client.find_segment = mock.Mock(
-            return_value=self._network_segment
-        )
+        self.network_client.find_segment.return_value = self._network_segment
 
         # Get the command object to test
         self.cmd = network_segment.ShowNetworkSegment(self.app, None)

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

@@ -78,8 +78,8 @@ class TestCreateNetworkSegmentRange(TestNetworkSegmentRange):
     def setUp(self):
         super().setUp()
 
-        self.network_client.create_network_segment_range = mock.Mock(
-            return_value=self._network_segment_range
+        self.network_client.create_network_segment_range.return_value = (
+            self._network_segment_range
         )
 
         # Get the command object to test
@@ -351,11 +351,10 @@ class TestDeleteNetworkSegmentRange(TestNetworkSegmentRange):
     def setUp(self):
         super().setUp()
 
-        self.network_client.delete_network_segment_range = mock.Mock(
-            return_value=None
-        )
-        self.network_client.find_network_segment_range = mock.Mock(
-            side_effect=self._network_segment_ranges
+        self.network_client.delete_network_segment_range.return_value = None
+
+        self.network_client.find_network_segment_range.side_effect = (
+            self._network_segment_ranges
         )
 
         # Get the command object to test
@@ -412,8 +411,8 @@ class TestDeleteNetworkSegmentRange(TestNetworkSegmentRange):
             self._network_segment_ranges[0],
             exceptions.CommandError,
         ]
-        self.network_client.find_network_segment_range = mock.Mock(
-            side_effect=find_mock_result
+        self.network_client.find_network_segment_range.side_effect = (
+            find_mock_result
         )
 
         try:
@@ -493,8 +492,8 @@ class TestListNetworkSegmentRange(TestNetworkSegmentRange):
     def setUp(self):
         super().setUp()
 
-        self.network_client.network_segment_ranges = mock.Mock(
-            return_value=self._network_segment_ranges
+        self.network_client.network_segment_ranges.return_value = (
+            self._network_segment_ranges
         )
 
         # Get the command object to test
@@ -567,8 +566,8 @@ class TestSetNetworkSegmentRange(TestNetworkSegmentRange):
     def setUp(self):
         super().setUp()
 
-        self.network_client.find_network_segment_range = mock.Mock(
-            return_value=self._network_segment_range
+        self.network_client.find_network_segment_range.return_value = (
+            self._network_segment_range
         )
 
         # Get the command object to test
@@ -583,9 +582,10 @@ class TestSetNetworkSegmentRange(TestNetworkSegmentRange):
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.network_client.update_network_segment_range = mock.Mock(
-            return_value=self._network_segment_range
+        self.network_client.update_network_segment_range.return_value = (
+            self._network_segment_range
         )
+
         result = self.cmd.take_action(parsed_args)
 
         self.network_client.update_network_segment_range.assert_called_once_with(
@@ -611,9 +611,10 @@ class TestSetNetworkSegmentRange(TestNetworkSegmentRange):
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.network_client.update_network_segment_range = mock.Mock(
-            return_value=self._network_segment_range_updated
+        self.network_client.update_network_segment_range.return_value = (
+            self._network_segment_range_updated
         )
+
         result = self.cmd.take_action(parsed_args)
 
         attrs = {
@@ -662,8 +663,8 @@ class TestShowNetworkSegmentRange(TestNetworkSegmentRange):
     def setUp(self):
         super().setUp()
 
-        self.network_client.find_network_segment_range = mock.Mock(
-            return_value=self._network_segment_range
+        self.network_client.find_network_segment_range.return_value = (
+            self._network_segment_range
         )
 
         # Get the command object to test

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

@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from unittest import mock
 
 from openstackclient.network.v2 import (
     network_service_provider as service_provider,
@@ -52,9 +51,7 @@ class TestListNetworkServiceProvider(TestNetworkServiceProvider):
 
     def setUp(self):
         super().setUp()
-        self.network_client.service_providers = mock.Mock(
-            return_value=self.provider_list
-        )
+        self.network_client.service_providers.return_value = self.provider_list
 
         self.cmd = service_provider.ListNetworkServiceProvider(self.app, None)
 

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

@@ -11,7 +11,6 @@
 #   under the License.
 
 import copy
-from unittest import mock
 from unittest.mock import call
 
 from osc_lib.cli import format_columns
@@ -84,12 +83,12 @@ class TestCreateNetworkTrunk(TestNetworkTrunk):
 
     def setUp(self):
         super().setUp()
-        self.network_client.create_trunk = mock.Mock(
-            return_value=self.new_trunk
-        )
-        self.network_client.find_port = mock.Mock(
-            side_effect=[self.parent_port, self.sub_port]
-        )
+        self.network_client.create_trunk.return_value = self.new_trunk
+
+        self.network_client.find_port.side_effect = [
+            self.parent_port,
+            self.sub_port,
+        ]
 
         # Get the command object to test
         self.cmd = network_trunk.CreateNetworkTrunk(self.app, None)
@@ -313,13 +312,16 @@ class TestDeleteNetworkTrunk(TestNetworkTrunk):
 
     def setUp(self):
         super().setUp()
-        self.network_client.find_trunk = mock.Mock(
-            side_effect=[self.new_trunks[0], self.new_trunks[1]]
-        )
-        self.network_client.delete_trunk = mock.Mock(return_value=None)
-        self.network_client.find_port = mock.Mock(
-            side_effect=[self.parent_port, self.sub_port]
-        )
+        self.network_client.find_trunk.side_effect = [
+            self.new_trunks[0],
+            self.new_trunks[1],
+        ]
+
+        self.network_client.delete_trunk.return_value = None
+        self.network_client.find_port.side_effect = [
+            self.parent_port,
+            self.sub_port,
+        ]
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
@@ -371,9 +373,11 @@ class TestDeleteNetworkTrunk(TestNetworkTrunk):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.network_client.find_trunk = mock.Mock(
-            side_effect=[self.new_trunks[0], exceptions.CommandError]
-        )
+        self.network_client.find_trunk.side_effect = [
+            self.new_trunks[0],
+            exceptions.CommandError,
+        ]
+
         with testtools.ExpectedException(exceptions.CommandError) as e:
             self.cmd.take_action(parsed_args)
             self.assertEqual('1 of 2 trunks failed to delete.', str(e))
@@ -412,8 +416,8 @@ class TestShowNetworkTrunk(TestNetworkTrunk):
 
     def setUp(self):
         super().setUp()
-        self.network_client.find_trunk = mock.Mock(return_value=self.new_trunk)
-        self.network_client.get_trunk = mock.Mock(return_value=self.new_trunk)
+        self.network_client.find_trunk.return_value = self.new_trunk
+        self.network_client.get_trunk.return_value = self.new_trunk
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
@@ -485,7 +489,7 @@ class TestListNetworkTrunk(TestNetworkTrunk):
 
     def setUp(self):
         super().setUp()
-        self.network_client.trunks = mock.Mock(return_value=self.new_trunks)
+        self.network_client.trunks.return_value = self.new_trunks
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
@@ -564,14 +568,14 @@ class TestSetNetworkTrunk(TestNetworkTrunk):
 
     def setUp(self):
         super().setUp()
-        self.network_client.update_trunk = mock.Mock(return_value=self._trunk)
-        self.network_client.add_trunk_subports = mock.Mock(
-            return_value=self._trunk
-        )
-        self.network_client.find_trunk = mock.Mock(return_value=self._trunk)
-        self.network_client.find_port = mock.Mock(
-            side_effect=[self.sub_port, self.sub_port]
-        )
+        self.network_client.update_trunk.return_value = self._trunk
+        self.network_client.add_trunk_subports.return_value = self._trunk
+
+        self.network_client.find_trunk.return_value = self._trunk
+        self.network_client.find_port.side_effect = [
+            self.sub_port,
+            self.sub_port,
+        ]
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
@@ -763,9 +767,8 @@ class TestSetNetworkTrunk(TestNetworkTrunk):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.network_client.update_trunk = mock.Mock(
-            side_effect=exceptions.CommandError
-        )
+        self.network_client.update_trunk.side_effect = exceptions.CommandError
+
         with testtools.ExpectedException(exceptions.CommandError) as e:
             self.cmd.take_action(parsed_args)
             self.assertEqual(
@@ -790,12 +793,14 @@ class TestSetNetworkTrunk(TestNetworkTrunk):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.network_client.add_trunk_subports = mock.Mock(
-            side_effect=exceptions.CommandError
-        )
-        self.network_client.find_port = mock.Mock(
-            return_value={'id': 'invalid_subport'}
+        self.network_client.add_trunk_subports.side_effect = (
+            exceptions.CommandError
         )
+
+        self.network_client.find_port.side_effect = [
+            network_fakes.create_one_port({'id': 'invalid_subport'})
+        ]
+
         with testtools.ExpectedException(exceptions.CommandError) as e:
             self.cmd.take_action(parsed_args)
             self.assertEqual(
@@ -832,10 +837,10 @@ class TestListNetworkSubport(TestNetworkTrunk):
     def setUp(self):
         super().setUp()
 
-        self.network_client.find_trunk = mock.Mock(return_value=self._trunk)
-        self.network_client.get_trunk_subports = mock.Mock(
-            return_value={network_trunk.SUB_PORTS: self._subports}
-        )
+        self.network_client.find_trunk.return_value = self._trunk
+        self.network_client.get_trunk_subports.return_value = {
+            network_trunk.SUB_PORTS: self._subports
+        }
 
         # Get the command object to test
         self.cmd = network_trunk.ListNetworkSubport(self.app, None)
@@ -902,13 +907,13 @@ class TestUnsetNetworkTrunk(TestNetworkTrunk):
     def setUp(self):
         super().setUp()
 
-        self.network_client.find_trunk = mock.Mock(return_value=self._trunk)
-        self.network_client.find_port = mock.Mock(
-            side_effect=[self.sub_port, self.sub_port]
-        )
-        self.network_client.delete_trunk_subports = mock.Mock(
-            return_value=None
-        )
+        self.network_client.find_trunk.return_value = self._trunk
+        self.network_client.find_port.side_effect = [
+            self.sub_port,
+            self.sub_port,
+        ]
+
+        self.network_client.delete_trunk_subports.return_value = None
 
         # Get the command object to test
         self.cmd = network_trunk.UnsetNetworkTrunk(self.app, None)