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

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

@@ -23,25 +23,13 @@ from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 
 
 class TestServerBackup(compute_fakes.TestComputev2):
-    def setUp(self):
-        super(TestServerBackup, self).setUp()
-
-        # Get a shortcut to the compute client ServerManager Mock
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-
-        # Set object attributes to be tested. Could be overwritten in subclass.
-        self.attrs = {}
-
     def setup_servers_mock(self, count):
         servers = compute_fakes.create_sdk_servers(
-            attrs=self.attrs,
             count=count,
         )
 
         # This is the return value for compute_client.find_server()
-        self.sdk_client.find_server = compute_fakes.get_servers(
+        self.compute_sdk_client.find_server = compute_fakes.get_servers(
             servers,
             0,
         )
@@ -122,7 +110,7 @@ class TestServerBackupCreate(TestServerBackup):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.backup_server.assert_called_with(
+        self.compute_sdk_client.backup_server.assert_called_with(
             servers[0].id,
             servers[0].name,
             '',
@@ -158,7 +146,7 @@ class TestServerBackupCreate(TestServerBackup):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.backup_server.assert_called_with(
+        self.compute_sdk_client.backup_server.assert_called_with(
             servers[0].id,
             'image',
             'daily',
@@ -198,7 +186,7 @@ class TestServerBackupCreate(TestServerBackup):
             parsed_args,
         )
 
-        self.sdk_client.backup_server.assert_called_with(
+        self.compute_sdk_client.backup_server.assert_called_with(
             servers[0].id,
             'image',
             'daily',
@@ -239,7 +227,7 @@ class TestServerBackupCreate(TestServerBackup):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.backup_server.assert_called_with(
+        self.compute_sdk_client.backup_server.assert_called_with(
             servers[0].id,
             'image',
             'daily',

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

@@ -29,21 +29,13 @@ class TestServerEvent(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestServerEvent, self).setUp()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-        self.sdk_client.find_server = mock.Mock()
-        self.sdk_client.server_actions = mock.Mock()
-        self.sdk_client.get_server_action = mock.Mock()
-        self.sdk_client.reset_mock()
-
         patcher = mock.patch.object(
             sdk_utils, 'supports_microversion', return_value=True
         )
         self.addCleanup(patcher.stop)
         self.supports_microversion_mock = patcher.start()
         self._set_mock_microversion(
-            self.app.client_manager.compute.api_version.get_string()
+            self.compute_client.api_version.get_string()
         )
 
     def _set_mock_microversion(self, mock_v):
@@ -98,8 +90,8 @@ class TestListServerEvent(TestServerEvent):
     def setUp(self):
         super().setUp()
 
-        self.sdk_client.find_server.return_value = self.fake_server
-        self.sdk_client.server_actions.return_value = [
+        self.compute_sdk_client.find_server.return_value = self.fake_server
+        self.compute_sdk_client.server_actions.return_value = [
             self.fake_event,
         ]
 
@@ -117,11 +109,13 @@ class TestListServerEvent(TestServerEvent):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.fake_server.name,
             ignore_missing=False,
         )
-        self.sdk_client.server_actions.assert_called_with(self.fake_server.id)
+        self.compute_sdk_client.server_actions.assert_called_with(
+            self.fake_server.id
+        )
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -139,11 +133,13 @@ class TestListServerEvent(TestServerEvent):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.fake_server.name,
             ignore_missing=False,
         )
-        self.sdk_client.server_actions.assert_called_with(self.fake_server.id)
+        self.compute_sdk_client.server_actions.assert_called_with(
+            self.fake_server.id
+        )
 
         self.assertEqual(self.long_columns, columns)
         self.assertEqual(self.long_data, tuple(data))
@@ -164,11 +160,11 @@ class TestListServerEvent(TestServerEvent):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.fake_server.name,
             ignore_missing=False,
         )
-        self.sdk_client.server_actions.assert_called_with(
+        self.compute_sdk_client.server_actions.assert_called_with(
             self.fake_server.id,
             changes_since='2016-03-04T06:27:59Z',
         )
@@ -244,11 +240,11 @@ class TestListServerEvent(TestServerEvent):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.fake_server.name,
             ignore_missing=False,
         )
-        self.sdk_client.server_actions.assert_called_with(
+        self.compute_sdk_client.server_actions.assert_called_with(
             self.fake_server.id,
             changes_before='2016-03-04T06:27:59Z',
         )
@@ -320,7 +316,7 @@ class TestListServerEvent(TestServerEvent):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.server_actions.assert_called_with(
+        self.compute_sdk_client.server_actions.assert_called_with(
             self.fake_server.id,
             limit=1,
             paginated=False,
@@ -367,7 +363,7 @@ class TestListServerEvent(TestServerEvent):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.server_actions.assert_called_with(
+        self.compute_sdk_client.server_actions.assert_called_with(
             self.fake_server.id,
             marker='test_event',
         )
@@ -421,8 +417,10 @@ class TestShowServerEvent(TestServerEvent):
     def setUp(self):
         super().setUp()
 
-        self.sdk_client.find_server.return_value = self.fake_server
-        self.sdk_client.get_server_action.return_value = self.fake_event
+        self.compute_sdk_client.find_server.return_value = self.fake_server
+        self.compute_sdk_client.get_server_action.return_value = (
+            self.fake_event
+        )
 
         self.cmd = server_event.ShowServerEvent(self.app, None)
 
@@ -439,11 +437,11 @@ class TestShowServerEvent(TestServerEvent):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.fake_server.name,
             ignore_missing=False,
         )
-        self.sdk_client.get_server_action.assert_called_with(
+        self.compute_sdk_client.get_server_action.assert_called_with(
             self.fake_event.request_id,
             self.fake_server.id,
         )

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

@@ -47,20 +47,12 @@ class TestServerGroup(compute_fakes.TestComputev2):
         fake_server_group.user_id,
     )
 
-    def setUp(self):
-        super().setUp()
-
-        # Create and get a shortcut to the compute client mock
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-        self.sdk_client.reset_mock()
-
 
 class TestServerGroupCreate(TestServerGroup):
     def setUp(self):
         super().setUp()
 
-        self.sdk_client.create_server_group.return_value = (
+        self.compute_sdk_client.create_server_group.return_value = (
             self.fake_server_group
         )
         self.cmd = server_group.CreateServerGroup(self.app, None)
@@ -78,7 +70,7 @@ class TestServerGroupCreate(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.sdk_client.create_server_group.assert_called_once_with(
+        self.compute_sdk_client.create_server_group.assert_called_once_with(
             name=parsed_args.name,
             policy=parsed_args.policy,
         )
@@ -99,7 +91,7 @@ class TestServerGroupCreate(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.sdk_client.create_server_group.assert_called_once_with(
+        self.compute_sdk_client.create_server_group.assert_called_once_with(
             name=parsed_args.name,
             policy=parsed_args.policy,
         )
@@ -142,7 +134,7 @@ class TestServerGroupCreate(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.sdk_client.create_server_group.assert_called_once_with(
+        self.compute_sdk_client.create_server_group.assert_called_once_with(
             name=parsed_args.name,
             policy=parsed_args.policy,
             rules=parsed_args.rules,
@@ -181,7 +173,9 @@ class TestServerGroupDelete(TestServerGroup):
     def setUp(self):
         super().setUp()
 
-        self.sdk_client.find_server_group.return_value = self.fake_server_group
+        self.compute_sdk_client.find_server_group.return_value = (
+            self.fake_server_group
+        )
         self.cmd = server_group.DeleteServerGroup(self.app, None)
 
     def test_server_group_delete(self):
@@ -193,10 +187,10 @@ class TestServerGroupDelete(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.sdk_client.find_server_group.assert_called_once_with(
+        self.compute_sdk_client.find_server_group.assert_called_once_with(
             'affinity_group'
         )
-        self.sdk_client.delete_server_group.assert_called_once_with(
+        self.compute_sdk_client.delete_server_group.assert_called_once_with(
             self.fake_server_group.id
         )
         self.assertIsNone(result)
@@ -208,15 +202,21 @@ class TestServerGroupDelete(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.sdk_client.find_server_group.assert_any_call('affinity_group')
-        self.sdk_client.find_server_group.assert_any_call(
+        self.compute_sdk_client.find_server_group.assert_any_call(
+            'affinity_group'
+        )
+        self.compute_sdk_client.find_server_group.assert_any_call(
             'anti_affinity_group'
         )
-        self.sdk_client.delete_server_group.assert_called_with(
+        self.compute_sdk_client.delete_server_group.assert_called_with(
             self.fake_server_group.id
         )
-        self.assertEqual(2, self.sdk_client.find_server_group.call_count)
-        self.assertEqual(2, self.sdk_client.delete_server_group.call_count)
+        self.assertEqual(
+            2, self.compute_sdk_client.find_server_group.call_count
+        )
+        self.assertEqual(
+            2, self.compute_sdk_client.delete_server_group.call_count
+        )
         self.assertIsNone(result)
 
     def test_server_group_delete_no_input(self):
@@ -237,7 +237,7 @@ class TestServerGroupDelete(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.sdk_client.find_server_group.side_effect = [
+        self.compute_sdk_client.find_server_group.side_effect = [
             self.fake_server_group,
             exceptions.CommandError,
         ]
@@ -247,12 +247,16 @@ class TestServerGroupDelete(TestServerGroup):
         except exceptions.CommandError as e:
             self.assertEqual('1 of 2 server groups failed to delete.', str(e))
 
-        self.sdk_client.find_server_group.assert_any_call('affinity_group')
-        self.sdk_client.find_server_group.assert_any_call(
+        self.compute_sdk_client.find_server_group.assert_any_call(
+            'affinity_group'
+        )
+        self.compute_sdk_client.find_server_group.assert_any_call(
             'anti_affinity_group'
         )
-        self.assertEqual(2, self.sdk_client.find_server_group.call_count)
-        self.sdk_client.delete_server_group.assert_called_once_with(
+        self.assertEqual(
+            2, self.compute_sdk_client.find_server_group.call_count
+        )
+        self.compute_sdk_client.delete_server_group.assert_called_once_with(
             self.fake_server_group.id
         )
 
@@ -337,7 +341,9 @@ class TestServerGroupList(TestServerGroup):
     def setUp(self):
         super().setUp()
 
-        self.sdk_client.server_groups.return_value = [self.fake_server_group]
+        self.compute_sdk_client.server_groups.return_value = [
+            self.fake_server_group
+        ]
         self.cmd = server_group.ListServerGroup(self.app, None)
 
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
@@ -352,7 +358,7 @@ class TestServerGroupList(TestServerGroup):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.server_groups.assert_called_once_with()
+        self.compute_sdk_client.server_groups.assert_called_once_with()
 
         self.assertCountEqual(self.list_columns, columns)
         self.assertCountEqual(self.list_data, tuple(data))
@@ -371,7 +377,7 @@ class TestServerGroupList(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.sdk_client.server_groups.assert_called_once_with(
+        self.compute_sdk_client.server_groups.assert_called_once_with(
             all_projects=True
         )
 
@@ -394,7 +400,7 @@ class TestServerGroupList(TestServerGroup):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.server_groups.assert_called_once_with(limit=1)
+        self.compute_sdk_client.server_groups.assert_called_once_with(limit=1)
 
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
     def test_server_group_list_with_offset(self, sm_mock):
@@ -412,7 +418,7 @@ class TestServerGroupList(TestServerGroup):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.server_groups.assert_called_once_with(offset=5)
+        self.compute_sdk_client.server_groups.assert_called_once_with(offset=5)
 
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
     def test_server_group_list_v264(self, sm_mock):
@@ -423,7 +429,7 @@ class TestServerGroupList(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.sdk_client.server_groups.assert_called_once_with()
+        self.compute_sdk_client.server_groups.assert_called_once_with()
 
         self.assertCountEqual(self.list_columns_v264, columns)
         self.assertCountEqual(self.list_data_v264, tuple(data))
@@ -440,7 +446,7 @@ class TestServerGroupList(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.sdk_client.server_groups.assert_called_once_with(
+        self.compute_sdk_client.server_groups.assert_called_once_with(
             all_projects=True
         )
 
@@ -452,7 +458,9 @@ class TestServerGroupShow(TestServerGroup):
     def setUp(self):
         super().setUp()
 
-        self.sdk_client.find_server_group.return_value = self.fake_server_group
+        self.compute_sdk_client.find_server_group.return_value = (
+            self.fake_server_group
+        )
         self.cmd = server_group.ShowServerGroup(self.app, None)
 
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)

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

@@ -22,25 +22,13 @@ from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 
 
 class TestServerImage(compute_fakes.TestComputev2):
-    def setUp(self):
-        super().setUp()
-
-        # Get a shortcut to the compute client ServerManager Mock
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-
-        # Set object attributes to be tested. Could be overwritten in subclass.
-        self.attrs = {}
-
     def setup_servers_mock(self, count):
         servers = compute_fakes.create_sdk_servers(
-            attrs=self.attrs,
             count=count,
         )
 
         # This is the return value for compute_client.find_server()
-        self.sdk_client.find_server = compute_fakes.get_servers(
+        self.compute_sdk_client.find_server = compute_fakes.get_servers(
             servers,
             0,
         )
@@ -97,7 +85,7 @@ class TestServerImageCreate(TestServerImage):
             )
 
         self.image_client.find_image = mock.Mock(side_effect=images)
-        self.sdk_client.create_server_image = mock.Mock(
+        self.compute_sdk_client.create_server_image = mock.Mock(
             return_value=images[0],
         )
         return images
@@ -119,7 +107,7 @@ class TestServerImageCreate(TestServerImage):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_server_image.assert_called_with(
+        self.compute_sdk_client.create_server_image.assert_called_with(
             servers[0].id,
             servers[0].name,
             None,
@@ -151,7 +139,7 @@ class TestServerImageCreate(TestServerImage):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_server_image.assert_called_with(
+        self.compute_sdk_client.create_server_image.assert_called_with(
             servers[0].id,
             'img-nam',
             {'key': 'value'},
@@ -181,7 +169,7 @@ class TestServerImageCreate(TestServerImage):
             parsed_args,
         )
 
-        self.sdk_client.create_server_image.assert_called_with(
+        self.compute_sdk_client.create_server_image.assert_called_with(
             servers[0].id,
             servers[0].name,
             None,
@@ -211,7 +199,7 @@ class TestServerImageCreate(TestServerImage):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_server_image.assert_called_with(
+        self.compute_sdk_client.create_server_image.assert_called_with(
             servers[0].id,
             servers[0].name,
             None,