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

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

@@ -21,23 +21,8 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 
 
-class TestServerImage(compute_fakes.TestComputev2):
-    def setup_servers_mock(self, count):
-        servers = compute_fakes.create_sdk_servers(
-            count=count,
-        )
-
-        # This is the return value for compute_client.find_server()
-        self.compute_sdk_client.find_server = compute_fakes.get_servers(
-            servers,
-            0,
-        )
-        return servers
-
-
-class TestServerImageCreate(TestServerImage):
+class TestServerImageCreate(compute_fakes.TestComputev2):
     def image_columns(self, image):
-        # columnlist = tuple(sorted(image.keys()))
         columnlist = (
             'id',
             'name',
@@ -64,41 +49,24 @@ class TestServerImageCreate(TestServerImage):
     def setUp(self):
         super().setUp()
 
-        # Get the command object to test
-        self.cmd = server_image.CreateServerImage(self.app, None)
+        self.server = compute_fakes.create_one_server()
+        self.compute_client.find_server.return_value = self.server
 
-    def setup_images_mock(self, count, servers=None):
-        if servers:
-            images = image_fakes.create_images(
-                attrs={
-                    'name': servers[0].name,
-                    'status': 'active',
-                },
-                count=count,
-            )
-        else:
-            images = image_fakes.create_images(
-                attrs={
-                    'status': 'active',
-                },
-                count=count,
-            )
-
-        self.image_client.find_image = mock.Mock(side_effect=images)
-        self.compute_sdk_client.create_server_image = mock.Mock(
-            return_value=images[0],
+        self.image = image_fakes.create_one_image(
+            {'name': self.server.name, 'status': 'active'}
         )
-        return images
+        self.image_client.find_image.return_value = self.image
+        self.compute_client.create_server_image.return_value = self.image
 
-    def test_server_image_create_defaults(self):
-        servers = self.setup_servers_mock(count=1)
-        images = self.setup_images_mock(count=1, servers=servers)
+        # Get the command object to test
+        self.cmd = server_image.CreateServerImage(self.app, None)
 
+    def test_server_image_create_defaults(self):
         arglist = [
-            servers[0].id,
+            self.server.id,
         ]
         verifylist = [
-            ('server', servers[0].id),
+            ('server', self.server.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -107,29 +75,26 @@ class TestServerImageCreate(TestServerImage):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.create_server_image.assert_called_with(
-            servers[0].id,
-            servers[0].name,
+        self.compute_client.create_server_image.assert_called_with(
+            self.server.id,
+            self.server.name,
             None,
         )
 
-        self.assertEqual(self.image_columns(images[0]), columns)
-        self.assertCountEqual(self.image_data(images[0]), data)
+        self.assertEqual(self.image_columns(self.image), columns)
+        self.assertCountEqual(self.image_data(self.image), data)
 
     def test_server_image_create_options(self):
-        servers = self.setup_servers_mock(count=1)
-        images = self.setup_images_mock(count=1, servers=servers)
-
         arglist = [
             '--name',
             'img-nam',
             '--property',
             'key=value',
-            servers[0].id,
+            self.server.id,
         ]
         verifylist = [
             ('name', 'img-nam'),
-            ('server', servers[0].id),
+            ('server', self.server.id),
             ('properties', {'key': 'value'}),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -139,27 +104,24 @@ class TestServerImageCreate(TestServerImage):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.create_server_image.assert_called_with(
-            servers[0].id,
+        self.compute_client.create_server_image.assert_called_with(
+            self.server.id,
             'img-nam',
             {'key': 'value'},
         )
 
-        self.assertEqual(self.image_columns(images[0]), columns)
-        self.assertCountEqual(self.image_data(images[0]), data)
+        self.assertEqual(self.image_columns(self.image), columns)
+        self.assertCountEqual(self.image_data(self.image), data)
 
     @mock.patch.object(common_utils, 'wait_for_status', return_value=False)
     def test_server_create_image_wait_fail(self, mock_wait_for_status):
-        servers = self.setup_servers_mock(count=1)
-        images = self.setup_images_mock(count=1, servers=servers)
-
         arglist = [
             '--wait',
-            servers[0].id,
+            self.server.id,
         ]
         verifylist = [
             ('wait', True),
-            ('server', servers[0].id),
+            ('server', self.server.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -169,28 +131,25 @@ class TestServerImageCreate(TestServerImage):
             parsed_args,
         )
 
-        self.compute_sdk_client.create_server_image.assert_called_with(
-            servers[0].id,
-            servers[0].name,
+        self.compute_client.create_server_image.assert_called_with(
+            self.server.id,
+            self.server.name,
             None,
         )
 
         mock_wait_for_status.assert_called_once_with(
-            self.image_client.get_image, images[0].id, callback=mock.ANY
+            self.image_client.get_image, self.image.id, callback=mock.ANY
         )
 
     @mock.patch.object(common_utils, 'wait_for_status', return_value=True)
     def test_server_create_image_wait_ok(self, mock_wait_for_status):
-        servers = self.setup_servers_mock(count=1)
-        images = self.setup_images_mock(count=1, servers=servers)
-
         arglist = [
             '--wait',
-            servers[0].id,
+            self.server.id,
         ]
         verifylist = [
             ('wait', True),
-            ('server', servers[0].id),
+            ('server', self.server.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -199,15 +158,15 @@ class TestServerImageCreate(TestServerImage):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.create_server_image.assert_called_with(
-            servers[0].id,
-            servers[0].name,
+        self.compute_client.create_server_image.assert_called_with(
+            self.server.id,
+            self.server.name,
             None,
         )
 
         mock_wait_for_status.assert_called_once_with(
-            self.image_client.get_image, images[0].id, callback=mock.ANY
+            self.image_client.get_image, self.image.id, callback=mock.ANY
         )
 
-        self.assertEqual(self.image_columns(images[0]), columns)
-        self.assertCountEqual(self.image_data(images[0]), data)
+        self.assertEqual(self.image_columns(self.image), columns)
+        self.assertCountEqual(self.image_data(self.image), data)

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

@@ -52,11 +52,11 @@ class TestListMigration(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self.server = compute_fakes.create_one_sdk_server()
-        self.compute_sdk_client.find_server.return_value = self.server
+        self.server = compute_fakes.create_one_server()
+        self.compute_client.find_server.return_value = self.server
 
         self.migrations = compute_fakes.create_migrations(count=3)
-        self.compute_sdk_client.migrations.return_value = self.migrations
+        self.compute_client.migrations.return_value = self.migrations
 
         self.data = (
             common_utils.get_item_properties(s, self.MIGRATION_FIELDS)
@@ -76,7 +76,7 @@ class TestListMigration(compute_fakes.TestComputev2):
         # Set expected values
         kwargs = {}
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -108,10 +108,10 @@ class TestListMigration(compute_fakes.TestComputev2):
             'migration_type': 'migration',
         }
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             'server1', ignore_missing=False
         )
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -169,7 +169,7 @@ class TestListMigrationV223(TestListMigration):
             'status': 'migrating',
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -247,7 +247,7 @@ class TestListMigrationV259(TestListMigration):
             'changes_since': '2019-08-09T08:03:25Z',
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -376,7 +376,7 @@ class TestListMigrationV266(TestListMigration):
             'changes_before': '2019-08-09T08:03:25Z',
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -495,7 +495,7 @@ class TestListMigrationV280(TestListMigration):
             'changes_before': "2019-08-09T08:03:25Z",
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.MIGRATION_COLUMNS.insert(
             len(self.MIGRATION_COLUMNS) - 2, "Project"
@@ -572,7 +572,7 @@ class TestListMigrationV280(TestListMigration):
             'changes_before': "2019-08-09T08:03:25Z",
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_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")
@@ -644,7 +644,7 @@ class TestListMigrationV280(TestListMigration):
             'changes_before': "2019-08-09T08:03:25Z",
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.MIGRATION_COLUMNS.insert(
             len(self.MIGRATION_COLUMNS) - 2, "Project"
@@ -694,14 +694,14 @@ class TestServerMigrationShow(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self.server = compute_fakes.create_one_sdk_server()
-        self.compute_sdk_client.find_server.return_value = self.server
+        self.server = compute_fakes.create_one_server()
+        self.compute_client.find_server.return_value = self.server
 
         self.server_migration = compute_fakes.create_one_server_migration()
-        self.compute_sdk_client.get_server_migration.return_value = (
+        self.compute_client.get_server_migration.return_value = (
             self.server_migration
         )
-        self.compute_sdk_client.server_migrations.return_value = iter(
+        self.compute_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -759,10 +759,10 @@ class TestServerMigrationShow(compute_fakes.TestComputev2):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.get_server_migration.assert_called_with(
+        self.compute_client.get_server_migration.assert_called_with(
             self.server.id, '2', ignore_missing=False
         )
 
@@ -811,7 +811,7 @@ class TestServerMigrationShow(compute_fakes.TestComputev2):
     def test_server_migration_show_by_uuid(self):
         self.set_compute_api_version('2.59')
 
-        self.compute_sdk_client.server_migrations.return_value = iter(
+        self.compute_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -830,18 +830,18 @@ class TestServerMigrationShow(compute_fakes.TestComputev2):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.server_migrations.assert_called_with(
+        self.compute_client.server_migrations.assert_called_with(
             self.server.id
         )
-        self.compute_sdk_client.get_server_migration.assert_not_called()
+        self.compute_client.get_server_migration.assert_not_called()
 
     def test_server_migration_show_by_uuid_no_matches(self):
         self.set_compute_api_version('2.59')
 
-        self.compute_sdk_client.server_migrations.return_value = iter([])
+        self.compute_client.server_migrations.return_value = iter([])
 
         arglist = [
             self.server.id,
@@ -897,10 +897,10 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self.server = compute_fakes.create_one_sdk_server()
+        self.server = compute_fakes.create_one_server()
 
         # Return value for utils.find_resource for server.
-        self.compute_sdk_client.find_server.return_value = self.server
+        self.compute_client.find_server.return_value = self.server
 
         # Get the command object to test
         self.cmd = server_migration.AbortMigration(self.app, None)
@@ -917,10 +917,10 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.abort_server_migration.assert_called_with(
+        self.compute_client.abort_server_migration.assert_called_with(
             '2', self.server.id, ignore_missing=False
         )
         self.assertIsNone(result)
@@ -946,7 +946,7 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
         self.set_compute_api_version('2.59')
 
         self.server_migration = compute_fakes.create_one_server_migration()
-        self.compute_sdk_client.server_migrations.return_value = iter(
+        self.compute_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -959,13 +959,13 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.server_migrations.assert_called_with(
+        self.compute_client.server_migrations.assert_called_with(
             self.server.id
         )
-        self.compute_sdk_client.abort_server_migration.assert_called_with(
+        self.compute_client.abort_server_migration.assert_called_with(
             self.server_migration.id, self.server.id, ignore_missing=False
         )
         self.assertIsNone(result)
@@ -973,7 +973,7 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
     def test_server_migration_abort_by_uuid_no_matches(self):
         self.set_compute_api_version('2.59')
 
-        self.compute_sdk_client.server_migrations.return_value = iter([])
+        self.compute_client.server_migrations.return_value = iter([])
 
         arglist = [
             self.server.id,
@@ -1012,10 +1012,10 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self.server = compute_fakes.create_one_sdk_server()
+        self.server = compute_fakes.create_one_server()
 
         # Return value for utils.find_resource for server.
-        self.compute_sdk_client.find_server.return_value = self.server
+        self.compute_client.find_server.return_value = self.server
 
         # Get the command object to test
         self.cmd = server_migration.ForceCompleteMigration(self.app, None)
@@ -1032,10 +1032,10 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.force_complete_server_migration.assert_called_with(
+        self.compute_client.force_complete_server_migration.assert_called_with(
             '2', self.server.id
         )
         self.assertIsNone(result)
@@ -1061,7 +1061,7 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
         self.set_compute_api_version('2.59')
 
         self.server_migration = compute_fakes.create_one_server_migration()
-        self.compute_sdk_client.server_migrations.return_value = iter(
+        self.compute_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -1074,13 +1074,13 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.server_migrations.assert_called_with(
+        self.compute_client.server_migrations.assert_called_with(
             self.server.id
         )
-        self.compute_sdk_client.force_complete_server_migration.assert_called_with(
+        self.compute_client.force_complete_server_migration.assert_called_with(
             self.server_migration.id, self.server.id
         )
         self.assertIsNone(result)
@@ -1088,7 +1088,7 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
     def test_server_migration_force_complete_by_uuid_no_matches(self):
         self.set_compute_api_version('2.59')
 
-        self.compute_sdk_client.server_migrations.return_value = iter([])
+        self.compute_client.server_migrations.return_value = iter([])
 
         arglist = [
             self.server.id,

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

@@ -31,8 +31,8 @@ class TestServerVolumeList(compute_fakes.TestComputev2):
             )
         )
 
-        self.compute_sdk_client.find_server.return_value = self.server
-        self.compute_sdk_client.volume_attachments.return_value = (
+        self.compute_client.find_server.return_value = self.server
+        self.compute_client.volume_attachments.return_value = (
             self.volume_attachments
         )
 
@@ -68,7 +68,7 @@ class TestServerVolumeList(compute_fakes.TestComputev2):
             ),
             tuple(data),
         )
-        self.compute_sdk_client.volume_attachments.assert_called_once_with(
+        self.compute_client.volume_attachments.assert_called_once_with(
             self.server,
         )
 
@@ -114,7 +114,7 @@ class TestServerVolumeList(compute_fakes.TestComputev2):
             ),
             tuple(data),
         )
-        self.compute_sdk_client.volume_attachments.assert_called_once_with(
+        self.compute_client.volume_attachments.assert_called_once_with(
             self.server,
         )
 
@@ -163,7 +163,7 @@ class TestServerVolumeList(compute_fakes.TestComputev2):
             ),
             tuple(data),
         )
-        self.compute_sdk_client.volume_attachments.assert_called_once_with(
+        self.compute_client.volume_attachments.assert_called_once_with(
             self.server,
         )
 
@@ -215,7 +215,7 @@ class TestServerVolumeList(compute_fakes.TestComputev2):
             ),
             tuple(data),
         )
-        self.compute_sdk_client.volume_attachments.assert_called_once_with(
+        self.compute_client.volume_attachments.assert_called_once_with(
             self.server,
         )
 
@@ -225,7 +225,7 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2):
         super().setUp()
 
         self.server = sdk_fakes.generate_fake_resource(_server.Server)
-        self.compute_sdk_client.find_server.return_value = self.server
+        self.compute_client.find_server.return_value = self.server
 
         self.volume = sdk_fakes.generate_fake_resource(_volume.Volume)
         self.volume_sdk_client.find_volume.return_value = self.volume
@@ -248,7 +248,7 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2):
         result = self.cmd.take_action(parsed_args)
 
         # This is a no-op
-        self.compute_sdk_client.update_volume_attachment.assert_not_called()
+        self.compute_client.update_volume_attachment.assert_not_called()
         self.assertIsNone(result)
 
     def test_server_volume_update_with_delete_on_termination(self):
@@ -268,7 +268,7 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.update_volume_attachment.assert_called_once_with(
+        self.compute_client.update_volume_attachment.assert_called_once_with(
             self.server,
             self.volume,
             delete_on_termination=True,
@@ -292,7 +292,7 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.update_volume_attachment.assert_called_once_with(
+        self.compute_client.update_volume_attachment.assert_called_once_with(
             self.server, self.volume, delete_on_termination=False
         )
         self.assertIsNone(result)
@@ -317,7 +317,7 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2):
             self.cmd.take_action,
             parsed_args,
         )
-        self.compute_sdk_client.update_volume_attachment.assert_not_called()
+        self.compute_client.update_volume_attachment.assert_not_called()
 
     def test_server_volume_update_with_preserve_on_termination_pre_v285(self):
         self.set_compute_api_version('2.84')
@@ -339,4 +339,4 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2):
             self.cmd.take_action,
             parsed_args,
         )
-        self.compute_sdk_client.update_volume_attachment.assert_not_called()
+        self.compute_client.update_volume_attachment.assert_not_called()