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

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

@@ -27,19 +27,13 @@ class TestServerMigration(compute_fakes.TestComputev2):
         super().setUp()
 
         # Get a shortcut to the compute client ServerManager Mock
-        self.servers_mock = self.app.client_manager.compute.servers
+        self.servers_mock = self.compute_client.servers
         self.servers_mock.reset_mock()
 
         # Get a shortcut to the compute client ServerMigrationsManager Mock
-        self.server_migrations_mock = (
-            self.app.client_manager.compute.server_migrations
-        )
+        self.server_migrations_mock = self.compute_client.server_migrations
         self.server_migrations_mock.reset_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
-
         patcher = mock.patch.object(
             sdk_utils, 'supports_microversion', return_value=True
         )
@@ -92,10 +86,10 @@ class TestListMigration(TestServerMigration):
         self._set_mock_microversion('2.1')
 
         self.server = compute_fakes.create_one_sdk_server()
-        self.sdk_client.find_server.return_value = self.server
+        self.compute_sdk_client.find_server.return_value = self.server
 
         self.migrations = compute_fakes.create_migrations(count=3)
-        self.sdk_client.migrations.return_value = self.migrations
+        self.compute_sdk_client.migrations.return_value = self.migrations
 
         self.data = (
             common_utils.get_item_properties(s, self.MIGRATION_FIELDS)
@@ -115,7 +109,7 @@ class TestListMigration(TestServerMigration):
         # Set expected values
         kwargs = {}
 
-        self.sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -147,8 +141,8 @@ class TestListMigration(TestServerMigration):
             'migration_type': 'migration',
         }
 
-        self.sdk_client.find_server.assert_called_with('server1')
-        self.sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_sdk_client.find_server.assert_called_with('server1')
+        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -206,7 +200,7 @@ class TestListMigrationV223(TestListMigration):
             'status': 'migrating',
         }
 
-        self.sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -284,7 +278,7 @@ class TestListMigrationV259(TestListMigration):
             'changes_since': '2019-08-09T08:03:25Z',
         }
 
-        self.sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -410,7 +404,7 @@ class TestListMigrationV266(TestListMigration):
             'changes_before': '2019-08-09T08:03:25Z',
         }
 
-        self.sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -528,7 +522,7 @@ class TestListMigrationV280(TestListMigration):
             'changes_before': "2019-08-09T08:03:25Z",
         }
 
-        self.sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
 
         self.MIGRATION_COLUMNS.insert(
             len(self.MIGRATION_COLUMNS) - 2, "Project"
@@ -604,7 +598,7 @@ class TestListMigrationV280(TestListMigration):
             'changes_before': "2019-08-09T08:03:25Z",
         }
 
-        self.sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
 
         self.MIGRATION_COLUMNS.insert(len(self.MIGRATION_COLUMNS) - 2, "User")
         self.MIGRATION_FIELDS.insert(len(self.MIGRATION_FIELDS) - 2, "user_id")
@@ -675,7 +669,7 @@ class TestListMigrationV280(TestListMigration):
             'changes_before': "2019-08-09T08:03:25Z",
         }
 
-        self.sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
 
         self.MIGRATION_COLUMNS.insert(
             len(self.MIGRATION_COLUMNS) - 2, "Project"
@@ -725,13 +719,13 @@ class TestServerMigrationShow(TestServerMigration):
         super().setUp()
 
         self.server = compute_fakes.create_one_sdk_server()
-        self.sdk_client.find_server.return_value = self.server
+        self.compute_sdk_client.find_server.return_value = self.server
 
         self.server_migration = compute_fakes.create_one_server_migration()
-        self.sdk_client.get_server_migration.return_value = (
+        self.compute_sdk_client.get_server_migration.return_value = (
             self.server_migration
         )
-        self.sdk_client.server_migrations.return_value = iter(
+        self.compute_sdk_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -789,10 +783,10 @@ class TestServerMigrationShow(TestServerMigration):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.sdk_client.get_server_migration.assert_called_with(
+        self.compute_sdk_client.get_server_migration.assert_called_with(
             self.server.id, '2', ignore_missing=False
         )
 
@@ -841,7 +835,7 @@ class TestServerMigrationShow(TestServerMigration):
     def test_server_migration_show_by_uuid(self):
         self._set_mock_microversion('2.59')
 
-        self.sdk_client.server_migrations.return_value = iter(
+        self.compute_sdk_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -860,15 +854,17 @@ class TestServerMigrationShow(TestServerMigration):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.sdk_client.server_migrations.assert_called_with(self.server.id)
-        self.sdk_client.get_server_migration.assert_not_called()
+        self.compute_sdk_client.server_migrations.assert_called_with(
+            self.server.id
+        )
+        self.compute_sdk_client.get_server_migration.assert_not_called()
 
     def test_server_migration_show_by_uuid_no_matches(self):
         self._set_mock_microversion('2.59')
-        self.sdk_client.server_migrations.return_value = iter([])
+        self.compute_sdk_client.server_migrations.return_value = iter([])
 
         arglist = [
             self.server.id,
@@ -927,7 +923,7 @@ class TestServerMigrationAbort(TestServerMigration):
         self.server = compute_fakes.create_one_sdk_server()
 
         # Return value for utils.find_resource for server.
-        self.sdk_client.find_server.return_value = self.server
+        self.compute_sdk_client.find_server.return_value = self.server
 
         # Get the command object to test
         self.cmd = server_migration.AbortMigration(self.app, None)
@@ -944,10 +940,10 @@ class TestServerMigrationAbort(TestServerMigration):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.sdk_client.abort_server_migration.assert_called_with(
+        self.compute_sdk_client.abort_server_migration.assert_called_with(
             '2', self.server.id, ignore_missing=False
         )
         self.assertIsNone(result)
@@ -973,7 +969,7 @@ class TestServerMigrationAbort(TestServerMigration):
         self._set_mock_microversion('2.59')
 
         self.server_migration = compute_fakes.create_one_server_migration()
-        self.sdk_client.server_migrations.return_value = iter(
+        self.compute_sdk_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -986,11 +982,13 @@ class TestServerMigrationAbort(TestServerMigration):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.sdk_client.server_migrations.assert_called_with(self.server.id)
-        self.sdk_client.abort_server_migration.assert_called_with(
+        self.compute_sdk_client.server_migrations.assert_called_with(
+            self.server.id
+        )
+        self.compute_sdk_client.abort_server_migration.assert_called_with(
             self.server_migration.id, self.server.id, ignore_missing=False
         )
         self.assertIsNone(result)
@@ -998,7 +996,7 @@ class TestServerMigrationAbort(TestServerMigration):
     def test_server_migration_abort_by_uuid_no_matches(self):
         self._set_mock_microversion('2.59')
 
-        self.sdk_client.server_migrations.return_value = iter([])
+        self.compute_sdk_client.server_migrations.return_value = iter([])
 
         arglist = [
             self.server.id,
@@ -1040,7 +1038,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
         self.server = compute_fakes.create_one_sdk_server()
 
         # Return value for utils.find_resource for server.
-        self.sdk_client.find_server.return_value = self.server
+        self.compute_sdk_client.find_server.return_value = self.server
 
         # Get the command object to test
         self.cmd = server_migration.ForceCompleteMigration(self.app, None)
@@ -1057,10 +1055,10 @@ class TestServerMigrationForceComplete(TestServerMigration):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.sdk_client.force_complete_server_migration.assert_called_with(
+        self.compute_sdk_client.force_complete_server_migration.assert_called_with(
             '2', self.server.id
         )
         self.assertIsNone(result)
@@ -1086,7 +1084,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
         self._set_mock_microversion('2.59')
 
         self.server_migration = compute_fakes.create_one_server_migration()
-        self.sdk_client.server_migrations.return_value = iter(
+        self.compute_sdk_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -1099,11 +1097,13 @@ class TestServerMigrationForceComplete(TestServerMigration):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.sdk_client.server_migrations.assert_called_with(self.server.id)
-        self.sdk_client.force_complete_server_migration.assert_called_with(
+        self.compute_sdk_client.server_migrations.assert_called_with(
+            self.server.id
+        )
+        self.compute_sdk_client.force_complete_server_migration.assert_called_with(
             self.server_migration.id, self.server.id
         )
         self.assertIsNone(result)
@@ -1111,7 +1111,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
     def test_server_migration_force_complete_by_uuid_no_matches(self):
         self._set_mock_microversion('2.59')
 
-        self.sdk_client.server_migrations.return_value = iter([])
+        self.compute_sdk_client.server_migrations.return_value = iter([])
 
         arglist = [
             self.server.id,

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

@@ -9,11 +9,9 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 from unittest import mock
 
-from novaclient import api_versions
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 
@@ -22,26 +20,15 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
 
 
-class TestServerVolume(compute_fakes.TestComputev2):
-    def setUp(self):
-        super().setUp()
-
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.app.client_manager.sdk_connection.volume = mock.Mock()
-        self.compute_client = self.app.client_manager.sdk_connection.compute
-        self.volume_client = self.app.client_manager.sdk_connection.volume
-
-
-class TestServerVolumeList(TestServerVolume):
+class TestServerVolumeList(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
         self.server = compute_fakes.create_one_sdk_server()
         self.volume_attachments = compute_fakes.create_volume_attachments()
 
-        self.compute_client.find_server.return_value = self.server
-        self.compute_client.volume_attachments.return_value = (
+        self.compute_sdk_client.find_server.return_value = self.server
+        self.compute_sdk_client.volume_attachments.return_value = (
             self.volume_attachments
         )
 
@@ -50,9 +37,6 @@ class TestServerVolumeList(TestServerVolume):
 
     @mock.patch.object(sdk_utils, 'supports_microversion')
     def test_server_volume_list(self, sm_mock):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.1'
-        )
         sm_mock.side_effect = [False, False, False, False]
 
         arglist = [
@@ -83,7 +67,7 @@ class TestServerVolumeList(TestServerVolume):
             ),
             tuple(data),
         )
-        self.compute_client.volume_attachments.assert_called_once_with(
+        self.compute_sdk_client.volume_attachments.assert_called_once_with(
             self.server,
         )
 
@@ -130,7 +114,7 @@ class TestServerVolumeList(TestServerVolume):
             ),
             tuple(data),
         )
-        self.compute_client.volume_attachments.assert_called_once_with(
+        self.compute_sdk_client.volume_attachments.assert_called_once_with(
             self.server,
         )
 
@@ -179,7 +163,7 @@ class TestServerVolumeList(TestServerVolume):
             ),
             tuple(data),
         )
-        self.compute_client.volume_attachments.assert_called_once_with(
+        self.compute_sdk_client.volume_attachments.assert_called_once_with(
             self.server,
         )
 
@@ -231,20 +215,20 @@ class TestServerVolumeList(TestServerVolume):
             ),
             tuple(data),
         )
-        self.compute_client.volume_attachments.assert_called_once_with(
+        self.compute_sdk_client.volume_attachments.assert_called_once_with(
             self.server,
         )
 
 
-class TestServerVolumeUpdate(TestServerVolume):
+class TestServerVolumeUpdate(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
         self.server = compute_fakes.create_one_sdk_server()
-        self.compute_client.find_server.return_value = self.server
+        self.compute_sdk_client.find_server.return_value = self.server
 
         self.volume = volume_fakes.create_one_sdk_volume()
-        self.volume_client.find_volume.return_value = self.volume
+        self.volume_sdk_client.find_volume.return_value = self.volume
 
         # Get the command object to test
         self.cmd = server_volume.UpdateServerVolume(self.app, None)
@@ -264,7 +248,7 @@ class TestServerVolumeUpdate(TestServerVolume):
         result = self.cmd.take_action(parsed_args)
 
         # This is a no-op
-        self.compute_client.update_volume_attachment.assert_not_called()
+        self.compute_sdk_client.update_volume_attachment.assert_not_called()
         self.assertIsNone(result)
 
     @mock.patch.object(sdk_utils, 'supports_microversion')
@@ -285,7 +269,7 @@ class TestServerVolumeUpdate(TestServerVolume):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_client.update_volume_attachment.assert_called_once_with(
+        self.compute_sdk_client.update_volume_attachment.assert_called_once_with(
             self.server,
             self.volume,
             delete_on_termination=True,
@@ -310,7 +294,7 @@ class TestServerVolumeUpdate(TestServerVolume):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_client.update_volume_attachment.assert_called_once_with(
+        self.compute_sdk_client.update_volume_attachment.assert_called_once_with(
             self.server, self.volume, delete_on_termination=False
         )
         self.assertIsNone(result)
@@ -339,7 +323,7 @@ class TestServerVolumeUpdate(TestServerVolume):
             self.cmd.take_action,
             parsed_args,
         )
-        self.compute_client.update_volume_attachment.assert_not_called()
+        self.compute_sdk_client.update_volume_attachment.assert_not_called()
 
     @mock.patch.object(sdk_utils, 'supports_microversion')
     def test_server_volume_update_with_preserve_on_termination_pre_v285(
@@ -365,4 +349,4 @@ class TestServerVolumeUpdate(TestServerVolume):
             self.cmd.take_action,
             parsed_args,
         )
-        self.compute_client.update_volume_attachment.assert_not_called()
+        self.compute_sdk_client.update_volume_attachment.assert_not_called()