tests: Make use of fake client aliases

Change-Id: Iae56252c955540360b50c77594a1dff9d82b764f
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstackclient/tests/unit/common/test_extension.py

@@ -294,7 +294,7 @@ def setUp(self):
 
         self.cmd = extension.ShowExtension(self.app, None)
 
-        self.app.client_manager.network.find_extension.return_value = (
+        self.network_client.find_extension.return_value = (
             self.extension_details
         )
 
@@ -322,7 +322,7 @@ def test_show_all_options(self):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.app.client_manager.network.find_extension.assert_called_with(
+        self.network_client.find_extension.assert_called_with(
             self.extension_details.alias, ignore_missing=False
         )
 

openstackclient/tests/unit/compute/v2/test_server.py

@@ -1608,8 +1608,8 @@ def find_port(name_or_id, ignore_missing):
                 port_port2.id: port_port2,
             }[name_or_id]
 
-        self.app.client_manager.network.find_network.side_effect = find_network
-        self.app.client_manager.network.find_port.side_effect = find_port
+        self.network_client.find_network.side_effect = find_network
+        self.network_client.find_port.side_effect = find_port
 
         arglist = [
             '--image',
@@ -1728,7 +1728,7 @@ def test_server_create_with_network_tag(self):
         self.set_compute_api_version('2.43')
 
         network = network_fakes.create_one_network()
-        self.app.client_manager.network.find_network.return_value = network
+        self.network_client.find_network.return_value = network
 
         arglist = [
             '--image',

…nit/network/v2/taas/test_osc_tap_flow.py …ts/unit/network/v2/taas/test_tap_flow.pyopenstackclient/tests/unit/network/v2/taas/test_osc_tap_flow.py renamed to openstackclient/tests/unit/network/v2/taas/test_tap_flow.py openstackclient/tests/unit/network/v2/taas/test_osc_tap_flow.py renamed to openstackclient/tests/unit/network/v2/taas/test_tap_flow.py

@@ -77,13 +77,9 @@ def test_create_tap_flow(self):
                 'direction': 'BOTH',
             },
         )
-        self.app.client_manager.network.create_tap_flow.return_value = (
-            fake_tap_flow
-        )
-        self.app.client_manager.network.find_port.return_value = fake_port
-        self.app.client_manager.network.find_tap_service.return_value = (
-            fake_tap_service
-        )
+        self.network_client.create_tap_flow.return_value = fake_tap_flow
+        self.network_client.find_port.return_value = fake_port
+        self.network_client.find_tap_service.return_value = fake_tap_service
         arg_list = [
             '--name',
             fake_tap_flow['name'],
@@ -103,8 +99,7 @@ def test_create_tap_flow(self):
 
         parsed_args = self.check_parser(self.cmd, arg_list, verify_list)
         columns, data = self.cmd.take_action(parsed_args)
-        mock_create_t_f = self.app.client_manager.network.create_tap_flow
-        mock_create_t_f.assert_called_once_with(
+        self.network_client.create_tap_flow.assert_called_once_with(
             **{
                 'name': fake_tap_flow['name'],
                 'source_port': fake_tap_flow['source_port'],
@@ -129,15 +124,15 @@ def test_list_tap_flows(self):
         fake_tap_flows = list(
             sdk_fakes.generate_fake_resources(_tap_flow.TapFlow, count=2)
         )
-        self.app.client_manager.network.tap_flows.return_value = fake_tap_flows
+        self.network_client.tap_flows.return_value = fake_tap_flows
         arg_list = []
         verify_list = []
 
         parsed_args = self.check_parser(self.cmd, arg_list, verify_list)
 
         headers, data = self.cmd.take_action(parsed_args)
 
-        self.app.client_manager.network.tap_flows.assert_called_once()
+        self.network_client.tap_flows.assert_called_once()
         self.assertEqual(headers, list(headers_long))
         self.assertCountEqual(
             list(data),
@@ -151,7 +146,7 @@ def test_list_tap_flows(self):
 class TestDeleteTapFlow(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
-        self.app.client_manager.network.find_tap_flow.side_effect = (
+        self.network_client.find_tap_flow.side_effect = (
             lambda name_or_id, ignore_missing: _tap_flow.TapFlow(id=name_or_id)
         )
         self.cmd = osc_tap_flow.DeleteTapFlow(self.app, None)
@@ -171,8 +166,9 @@ def test_delete_tap_flow(self):
 
         result = self.cmd.take_action(parsed_args)
 
-        mock_delete_tap_flow = self.app.client_manager.network.delete_tap_flow
-        mock_delete_tap_flow.assert_called_once_with(fake_tap_flow['id'])
+        self.network_client.delete_tap_flow.assert_called_once_with(
+            fake_tap_flow['id']
+        )
         self.assertIsNone(result)
 
 
@@ -190,17 +186,15 @@ class TestShowTapFlow(network_fakes.TestNetworkV2):
 
     def setUp(self):
         super().setUp()
-        self.app.client_manager.network.find_tap_flow.side_effect = (
+        self.network_client.find_tap_flow.side_effect = (
             lambda name_or_id, ignore_missing: _tap_flow.TapFlow(id=name_or_id)
         )
         self.cmd = osc_tap_flow.ShowTapFlow(self.app, None)
 
     def test_show_tap_flow(self):
         """Test Show tap flow."""
         fake_tap_flow = sdk_fakes.generate_fake_resource(_tap_flow.TapFlow)
-        self.app.client_manager.network.get_tap_flow.return_value = (
-            fake_tap_flow
-        )
+        self.network_client.get_tap_flow.return_value = fake_tap_flow
         arg_list = [
             fake_tap_flow['id'],
         ]
@@ -212,7 +206,7 @@ def test_show_tap_flow(self):
 
         headers, data = self.cmd.take_action(parsed_args)
 
-        self.app.client_manager.network.get_tap_flow.assert_called_once_with(
+        self.network_client.get_tap_flow.assert_called_once_with(
             fake_tap_flow['id']
         )
         self.assertEqual(self.columns, headers)
@@ -245,7 +239,7 @@ class TestUpdateTapFlow(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
         self.cmd = osc_tap_flow.UpdateTapFlow(self.app, None)
-        self.app.client_manager.network.find_tap_flow.side_effect = (
+        self.network_client.find_tap_flow.side_effect = (
             lambda name_or_id, ignore_missing: _tap_flow.TapFlow(id=name_or_id)
         )
 
@@ -255,9 +249,7 @@ def test_update_tap_flow(self):
         new_tap_flow = copy.deepcopy(fake_tap_flow)
         new_tap_flow['name'] = self._new_name
 
-        self.app.client_manager.network.update_tap_flow.return_value = (
-            new_tap_flow
-        )
+        self.network_client.update_tap_flow.return_value = new_tap_flow
 
         arg_list = [
             fake_tap_flow['id'],
@@ -270,7 +262,8 @@ def test_update_tap_flow(self):
         columns, data = self.cmd.take_action(parsed_args)
         attrs = {'name': self._new_name}
 
-        mock_update_t_f = self.app.client_manager.network.update_tap_flow
-        mock_update_t_f.assert_called_once_with(new_tap_flow['id'], **attrs)
+        self.network_client.update_tap_flow.assert_called_once_with(
+            new_tap_flow['id'], **attrs
+        )
         self.assertEqual(self.columns, columns)
         self.assertEqual(_get_data(new_tap_flow, self.columns), data)

…t/network/v2/taas/test_osc_tap_mirror.py …/unit/network/v2/taas/test_tap_mirror.pyopenstackclient/tests/unit/network/v2/taas/test_osc_tap_mirror.py renamed to openstackclient/tests/unit/network/v2/taas/test_tap_mirror.py openstackclient/tests/unit/network/v2/taas/test_osc_tap_mirror.py renamed to openstackclient/tests/unit/network/v2/taas/test_tap_mirror.py

@@ -64,11 +64,9 @@ def test_create_tap_mirror(self):
         fake_tap_mirror = sdk_fakes.generate_fake_resource(
             tap_mirror.TapMirror, **{'port_id': port_id, 'directions': 'IN=99'}
         )
-        self.app.client_manager.network.create_tap_mirror.return_value = (
-            fake_tap_mirror
-        )
-        self.app.client_manager.network.find_port.return_value = fake_port
-        self.app.client_manager.network.find_tap_mirror.side_effect = (
+        self.network_client.create_tap_mirror.return_value = fake_tap_mirror
+        self.network_client.find_port.return_value = fake_port
+        self.network_client.find_tap_mirror.side_effect = (
             lambda _, name_or_id: {'id': name_or_id}
         )
         arg_list = [
@@ -96,13 +94,10 @@ def test_create_tap_mirror(self):
         ]
 
         parsed_args = self.check_parser(self.cmd, arg_list, verify_list)
-        self.app.client_manager.network.find_tap_mirror.return_value = (
-            fake_tap_mirror
-        )
+        self.network_client.find_tap_mirror.return_value = fake_tap_mirror
 
         columns, data = self.cmd.take_action(parsed_args)
-        create_tap_m_mock = self.app.client_manager.network.create_tap_mirror
-        create_tap_m_mock.assert_called_once_with(
+        self.network_client.create_tap_mirror.assert_called_once_with(
             **{
                 'name': fake_tap_mirror['name'],
                 'port_id': fake_tap_mirror['port_id'],
@@ -128,9 +123,7 @@ def test_list_tap_mirror(self):
         fake_tap_mirrors = list(
             sdk_fakes.generate_fake_resources(tap_mirror.TapMirror, count=4)
         )
-        self.app.client_manager.network.tap_mirrors.return_value = (
-            fake_tap_mirrors
-        )
+        self.network_client.tap_mirrors.return_value = fake_tap_mirrors
 
         arg_list = []
         verify_list = []
@@ -139,7 +132,7 @@ def test_list_tap_mirror(self):
 
         headers, data = self.cmd.take_action(parsed_args)
 
-        self.app.client_manager.network.tap_mirrors.assert_called_once()
+        self.network_client.tap_mirrors.assert_called_once()
         self.assertEqual(headers, list(headers_long))
         self.assertCountEqual(
             list(data),
@@ -153,7 +146,7 @@ def test_list_tap_mirror(self):
 class TestDeleteTapMirror(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
-        self.app.client_manager.network.find_tap_mirror.side_effect = (
+        self.network_client.find_tap_mirror.side_effect = (
             lambda name_or_id, ignore_missing: tap_mirror.TapMirror(
                 id=name_or_id
             )
@@ -177,8 +170,9 @@ def test_delete_tap_mirror(self):
         parsed_args = self.check_parser(self.cmd, arg_list, verify_list)
         result = self.cmd.take_action(parsed_args)
 
-        mock_delete_tap_m = self.app.client_manager.network.delete_tap_mirror
-        mock_delete_tap_m.assert_called_once_with(fake_tap_mirror['id'])
+        self.network_client.delete_tap_mirror.assert_called_once_with(
+            fake_tap_mirror['id']
+        )
         self.assertIsNone(result)
 
 
@@ -196,7 +190,7 @@ class TestShowTapMirror(network_fakes.TestNetworkV2):
 
     def setUp(self):
         super().setUp()
-        self.app.client_manager.network.find_tap_mirror.side_effect = (
+        self.network_client.find_tap_mirror.side_effect = (
             lambda name_or_id, ignore_missing: tap_mirror.TapMirror(
                 id=name_or_id
             )
@@ -209,9 +203,7 @@ def test_show_tap_mirror(self):
         fake_tap_mirror = sdk_fakes.generate_fake_resource(
             tap_mirror.TapMirror
         )
-        self.app.client_manager.network.get_tap_mirror.return_value = (
-            fake_tap_mirror
-        )
+        self.network_client.get_tap_mirror.return_value = fake_tap_mirror
         arg_list = [
             fake_tap_mirror['id'],
         ]
@@ -223,8 +215,9 @@ def test_show_tap_mirror(self):
 
         headers, data = self.cmd.take_action(parsed_args)
 
-        mock_get_tap_m = self.app.client_manager.network.get_tap_mirror
-        mock_get_tap_m.assert_called_once_with(fake_tap_mirror['id'])
+        self.network_client.get_tap_mirror.assert_called_once_with(
+            fake_tap_mirror['id']
+        )
         self.assertEqual(self.columns, headers)
         fake_data = _get_data(
             fake_tap_mirror, osc_tap_mirror._get_columns(fake_tap_mirror)[1]
@@ -248,7 +241,7 @@ class TestUpdateTapMirror(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
         self.cmd = osc_tap_mirror.UpdateTapMirror(self.app, None)
-        self.app.client_manager.network.find_tap_mirror.side_effect = (
+        self.network_client.find_tap_mirror.side_effect = (
             lambda name_or_id, ignore_missing: tap_mirror.TapMirror(
                 id=name_or_id
             )
@@ -262,9 +255,7 @@ def test_update_tap_mirror(self):
         new_tap_mirror = copy.deepcopy(fake_tap_mirror)
         new_tap_mirror['name'] = self._new_name
 
-        self.app.client_manager.network.update_tap_mirror.return_value = (
-            new_tap_mirror
-        )
+        self.network_client.update_tap_mirror.return_value = new_tap_mirror
 
         arg_list = [
             fake_tap_mirror['id'],
@@ -277,8 +268,7 @@ def test_update_tap_mirror(self):
         columns, data = self.cmd.take_action(parsed_args)
         attrs = {'name': self._new_name}
 
-        mock_update_tap_m = self.app.client_manager.network.update_tap_mirror
-        mock_update_tap_m.assert_called_once_with(
+        self.network_client.update_tap_mirror.assert_called_once_with(
             fake_tap_mirror['id'], **attrs
         )
         self.assertEqual(self.columns, columns)