python-openstackclient 6.1.0__py3-none-any.whl → 6.2.1__py3-none-any.whl

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

@@ -17,6 +17,7 @@ from unittest import mock
 
 from openstackclient.compute.v2 import host
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
+from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
@@ -26,7 +27,10 @@ class TestHost(compute_fakes.TestComputev2):
         super(TestHost, self).setUp()
 
         # Get a shortcut to the compute client
-        self.compute = self.app.client_manager.compute
+        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.get = mock.Mock()
 
 
 @mock.patch(
@@ -34,27 +38,29 @@ class TestHost(compute_fakes.TestComputev2):
 )
 class TestHostList(TestHost):
 
-    host = compute_fakes.FakeHost.create_one_host()
-
-    columns = (
-        'Host Name',
-        'Service',
-        'Zone',
-    )
-
-    data = [(
-        host['host_name'],
-        host['service'],
-        host['zone'],
-    )]
+    _host = compute_fakes.FakeHost.create_one_host()
 
     def setUp(self):
         super(TestHostList, self).setUp()
 
+        self.sdk_client.get.return_value = fakes.FakeResponse(
+            data={'hosts': [self._host]}
+        )
+
+        self.columns = (
+            'Host Name', 'Service', 'Zone'
+        )
+
+        self.data = [(
+            self._host['host_name'],
+            self._host['service'],
+            self._host['zone'],
+        )]
+
         self.cmd = host.ListHost(self.app, None)
 
     def test_host_list_no_option(self, h_mock):
-        h_mock.return_value = [self.host]
+        h_mock.return_value = [self._host]
         arglist = []
         verifylist = []
 
@@ -62,24 +68,24 @@ class TestHostList(TestHost):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        h_mock.assert_called_with(None)
+        self.sdk_client.get.assert_called_with('/os-hosts', microversion='2.1')
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
     def test_host_list_with_option(self, h_mock):
-        h_mock.return_value = [self.host]
+        h_mock.return_value = [self._host]
         arglist = [
-            '--zone', self.host['zone'],
+            '--zone', self._host['zone'],
         ]
         verifylist = [
-            ('zone', self.host['zone']),
+            ('zone', self._host['zone']),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        h_mock.assert_called_with(self.host['zone'])
+        self.sdk_client.get.assert_called_with('/os-hosts', microversion='2.1')
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
@@ -141,31 +147,43 @@ class TestHostSet(TestHost):
 )
 class TestHostShow(TestHost):
 
-    host = compute_fakes.FakeHost.create_one_host()
-
-    columns = (
-        'Host',
-        'Project',
-        'CPU',
-        'Memory MB',
-        'Disk GB',
-    )
-
-    data = [(
-        host['host'],
-        host['project'],
-        host['cpu'],
-        host['memory_mb'],
-        host['disk_gb'],
-    )]
+    _host = compute_fakes.FakeHost.create_one_host()
 
     def setUp(self):
         super(TestHostShow, self).setUp()
 
+        output_data = {"resource": {
+            "host": self._host['host'],
+            "project": self._host['project'],
+            "cpu": self._host['cpu'],
+            "memory_mb": self._host['memory_mb'],
+            "disk_gb": self._host['disk_gb']
+        }}
+
+        self.sdk_client.get.return_value = fakes.FakeResponse(
+            data={'host': [output_data]}
+        )
+
+        self.columns = (
+            'Host',
+            'Project',
+            'CPU',
+            'Memory MB',
+            'Disk GB',
+        )
+
+        self.data = [(
+            self._host['host'],
+            self._host['project'],
+            self._host['cpu'],
+            self._host['memory_mb'],
+            self._host['disk_gb'],
+        )]
+
         self.cmd = host.ShowHost(self.app, None)
 
     def test_host_show_no_option(self, h_mock):
-        h_mock.host_show.return_value = [self.host]
+        h_mock.host_show.return_value = [self._host]
         arglist = []
         verifylist = []
 
@@ -174,18 +192,21 @@ class TestHostShow(TestHost):
                           self.cmd, arglist, verifylist)
 
     def test_host_show_with_option(self, h_mock):
-        h_mock.return_value = [self.host]
+        h_mock.return_value = [self._host]
         arglist = [
-            self.host['host_name'],
+            self._host['host_name'],
         ]
         verifylist = [
-            ('host', self.host['host_name']),
+            ('host', self._host['host_name']),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        h_mock.assert_called_with(self.host['host_name'])
+        self.sdk_client.get.assert_called_with(
+            '/os-hosts/' + self._host['host_name'],
+            microversion='2.1'
+        )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))

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

@@ -931,8 +931,7 @@ class TestServerVolume(TestServer):
             'volume_id': self.volumes[0].id,
         }
         self.volume_attachment = \
-            compute_fakes.FakeVolumeAttachment.\
-            create_one_sdk_volume_attachment(attrs=attrs)
+            compute_fakes.create_one_volume_attachment(attrs=attrs)
 
         self.sdk_client.create_volume_attachment.return_value = \
             self.volume_attachment

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

@@ -40,6 +40,18 @@ class TestServerMigration(compute_fakes.TestComputev2):
         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)
+        self.addCleanup(patcher.stop)
+        self.supports_microversion_mock = patcher.start()
+
+    def _set_mock_microversion(self, mock_v):
+        """Set a specific microversion for the mock supports_microversion()."""
+        self.supports_microversion_mock.reset_mock(return_value=True)
+        self.supports_microversion_mock.side_effect = (
+            lambda _, v:
+            api_versions.APIVersion(v) <= api_versions.APIVersion(mock_v))
+
 
 class TestListMigration(TestServerMigration):
     """Test fetch all migrations."""
@@ -51,19 +63,20 @@ class TestListMigration(TestServerMigration):
     ]
 
     MIGRATION_FIELDS = [
-        'source_node', 'dest_node', 'source_compute', 'dest_compute',
-        'dest_host', 'status', 'server_id', 'old_flavor_id',
+        'source_node', 'dest_node', 'source_compute',
+        'dest_compute', 'dest_host', 'status', 'server_id', 'old_flavor_id',
         'new_flavor_id', 'created_at', 'updated_at'
     ]
 
     def setUp(self):
         super().setUp()
 
-        self.server = compute_fakes.FakeServer.create_one_server()
+        self._set_mock_microversion('2.1')
+
+        self.server = compute_fakes.FakeServer.create_one_sdk_server()
         self.sdk_client.find_server.return_value = self.server
 
-        self.migrations = compute_fakes.FakeMigration.create_migrations(
-            count=3)
+        self.migrations = compute_fakes.create_migrations(count=3)
         self.sdk_client.migrations.return_value = self.migrations
 
         self.data = (common_utils.get_item_properties(
@@ -72,20 +85,6 @@ class TestListMigration(TestServerMigration):
         # Get the command object to test
         self.cmd = server_migration.ListMigration(self.app, None)
 
-        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())
-
-    def _set_mock_microversion(self, mock_v):
-        """Set a specific microversion for the mock supports_microversion()."""
-        self.supports_microversion_mock.reset_mock(return_value=True)
-        self.supports_microversion_mock.side_effect = (
-            lambda _, v:
-            api_versions.APIVersion(v) <= api_versions.APIVersion(mock_v))
-
     def test_server_migration_list_no_options(self):
         arglist = []
         verifylist = []
@@ -601,12 +600,15 @@ class TestServerMigrationShow(TestServerMigration):
     def setUp(self):
         super().setUp()
 
-        self.server = compute_fakes.FakeServer.create_one_server()
-        self.servers_mock.get.return_value = self.server
+        self.server = compute_fakes.FakeServer.create_one_sdk_server()
+        self.sdk_client.find_server.return_value = self.server
 
-        self.server_migration = compute_fakes.FakeServerMigration\
-            .create_one_server_migration()
-        self.server_migrations_mock.get.return_value = self.server_migration
+        self.server_migration = compute_fakes.create_one_server_migration()
+        self.sdk_client.get_server_migration.return_value =\
+            self.server_migration
+        self.sdk_client.server_migrations.return_value = iter(
+            [self.server_migration]
+        )
 
         self.columns = (
             'ID',
@@ -629,7 +631,7 @@ class TestServerMigrationShow(TestServerMigration):
 
         self.data = (
             self.server_migration.id,
-            self.server_migration.server_uuid,
+            self.server_migration.server_id,
             self.server_migration.status,
             self.server_migration.source_compute,
             self.server_migration.source_node,
@@ -662,19 +664,18 @@ class TestServerMigrationShow(TestServerMigration):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-        self.servers_mock.get.assert_called_with(self.server.id)
-        self.server_migrations_mock.get.assert_called_with(
-            self.server.id, '2',)
+        self.sdk_client.find_server.assert_called_with(
+            self.server.id, ignore_missing=False)
+        self.sdk_client.get_server_migration.assert_called_with(
+            self.server.id, '2', ignore_missing=False)
 
     def test_server_migration_show(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.24')
+        self._set_mock_microversion('2.24')
 
         self._test_server_migration_show()
 
     def test_server_migration_show_v259(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.59')
+        self._set_mock_microversion('2.59')
 
         self.columns += ('UUID',)
         self.data += (self.server_migration.uuid,)
@@ -682,8 +683,7 @@ class TestServerMigrationShow(TestServerMigration):
         self._test_server_migration_show()
 
     def test_server_migration_show_v280(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.80')
+        self._set_mock_microversion('2.80')
 
         self.columns += ('UUID', 'User ID', 'Project ID')
         self.data += (
@@ -695,8 +695,7 @@ class TestServerMigrationShow(TestServerMigration):
         self._test_server_migration_show()
 
     def test_server_migration_show_pre_v224(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.23')
+        self._set_mock_microversion('2.23')
 
         arglist = [
             self.server.id,
@@ -714,9 +713,11 @@ class TestServerMigrationShow(TestServerMigration):
             str(ex))
 
     def test_server_migration_show_by_uuid(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.59')
-        self.server_migrations_mock.list.return_value = [self.server_migration]
+        self._set_mock_microversion('2.59')
+
+        self.sdk_client.server_migrations.return_value = iter(
+            [self.server_migration]
+        )
 
         self.columns += ('UUID',)
         self.data += (self.server_migration.uuid,)
@@ -733,14 +734,14 @@ class TestServerMigrationShow(TestServerMigration):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-        self.servers_mock.get.assert_called_with(self.server.id)
-        self.server_migrations_mock.list.assert_called_with(self.server.id)
-        self.server_migrations_mock.get.assert_not_called()
+        self.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()
 
     def test_server_migration_show_by_uuid_no_matches(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.59')
-        self.server_migrations_mock.list.return_value = []
+        self._set_mock_microversion('2.59')
+        self.sdk_client.server_migrations.return_value = iter([])
 
         arglist = [
             self.server.id,
@@ -758,8 +759,7 @@ class TestServerMigrationShow(TestServerMigration):
             str(ex))
 
     def test_server_migration_show_by_uuid_pre_v259(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.58')
+        self._set_mock_microversion('2.58')
 
         arglist = [
             self.server.id,
@@ -777,8 +777,7 @@ class TestServerMigrationShow(TestServerMigration):
             str(ex))
 
     def test_server_migration_show_invalid_id(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.24')
+        self._set_mock_microversion('2.24')
 
         arglist = [
             self.server.id,
@@ -801,17 +800,16 @@ class TestServerMigrationAbort(TestServerMigration):
     def setUp(self):
         super().setUp()
 
-        self.server = compute_fakes.FakeServer.create_one_server()
+        self.server = compute_fakes.FakeServer.create_one_sdk_server()
 
         # Return value for utils.find_resource for server.
-        self.servers_mock.get.return_value = self.server
+        self.sdk_client.find_server.return_value = self.server
 
         # Get the command object to test
         self.cmd = server_migration.AbortMigration(self.app, None)
 
     def test_migration_abort(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.24')
+        self._set_mock_microversion('2.24')
 
         arglist = [
             self.server.id,
@@ -822,14 +820,14 @@ class TestServerMigrationAbort(TestServerMigration):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.servers_mock.get.assert_called_with(self.server.id)
-        self.server_migrations_mock.live_migration_abort.assert_called_with(
-            self.server.id, '2',)
+        self.sdk_client.find_server.assert_called_with(
+            self.server.id, ignore_missing=False)
+        self.sdk_client.abort_server_migration.assert_called_with(
+            '2', self.server.id, ignore_missing=False)
         self.assertIsNone(result)
 
     def test_migration_abort_pre_v224(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.23')
+        self._set_mock_microversion('2.23')
 
         arglist = [
             self.server.id,
@@ -847,12 +845,12 @@ class TestServerMigrationAbort(TestServerMigration):
             str(ex))
 
     def test_server_migration_abort_by_uuid(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.59')
+        self._set_mock_microversion('2.59')
 
-        self.server_migration = compute_fakes.FakeServerMigration\
-            .create_one_server_migration()
-        self.server_migrations_mock.list.return_value = [self.server_migration]
+        self.server_migration = compute_fakes.create_one_server_migration()
+        self.sdk_client.server_migrations.return_value = iter(
+            [self.server_migration]
+        )
 
         arglist = [
             self.server.id,
@@ -863,17 +861,19 @@ class TestServerMigrationAbort(TestServerMigration):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.servers_mock.get.assert_called_with(self.server.id)
-        self.server_migrations_mock.list.assert_called_with(self.server.id)
-        self.server_migrations_mock.live_migration_abort.assert_called_with(
-            self.server.id, self.server_migration.id)
+        self.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.server_migration.id, self.server.id, ignore_missing=False)
         self.assertIsNone(result)
 
     def test_server_migration_abort_by_uuid_no_matches(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.59')
+        self._set_mock_microversion('2.59')
 
-        self.server_migrations_mock.list.return_value = []
+        self.sdk_client.server_migrations.return_value = iter(
+            []
+        )
 
         arglist = [
             self.server.id,
@@ -891,8 +891,7 @@ class TestServerMigrationAbort(TestServerMigration):
             str(ex))
 
     def test_server_migration_abort_by_uuid_pre_v259(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.58')
+        self._set_mock_microversion('2.58')
 
         arglist = [
             self.server.id,
@@ -915,17 +914,16 @@ class TestServerMigrationForceComplete(TestServerMigration):
     def setUp(self):
         super().setUp()
 
-        self.server = compute_fakes.FakeServer.create_one_server()
+        self.server = compute_fakes.FakeServer.create_one_sdk_server()
 
         # Return value for utils.find_resource for server.
-        self.servers_mock.get.return_value = self.server
+        self.sdk_client.find_server.return_value = self.server
 
         # Get the command object to test
         self.cmd = server_migration.ForceCompleteMigration(self.app, None)
 
     def test_migration_force_complete(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.22')
+        self._set_mock_microversion('2.22')
 
         arglist = [
             self.server.id,
@@ -936,14 +934,14 @@ class TestServerMigrationForceComplete(TestServerMigration):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.servers_mock.get.assert_called_with(self.server.id)
-        self.server_migrations_mock.live_migrate_force_complete\
-            .assert_called_with(self.server.id, '2',)
+        self.sdk_client.find_server.assert_called_with(
+            self.server.id, ignore_missing=False)
+        self.sdk_client.force_complete_server_migration\
+            .assert_called_with('2', self.server.id)
         self.assertIsNone(result)
 
     def test_migration_force_complete_pre_v222(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.21')
+        self._set_mock_microversion('2.21')
 
         arglist = [
             self.server.id,
@@ -961,12 +959,12 @@ class TestServerMigrationForceComplete(TestServerMigration):
             str(ex))
 
     def test_server_migration_force_complete_by_uuid(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.59')
+        self._set_mock_microversion('2.59')
 
-        self.server_migration = compute_fakes.FakeServerMigration\
-            .create_one_server_migration()
-        self.server_migrations_mock.list.return_value = [self.server_migration]
+        self.server_migration = compute_fakes.create_one_server_migration()
+        self.sdk_client.server_migrations.return_value = iter(
+            [self.server_migration]
+        )
 
         arglist = [
             self.server.id,
@@ -977,17 +975,17 @@ class TestServerMigrationForceComplete(TestServerMigration):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.servers_mock.get.assert_called_with(self.server.id)
-        self.server_migrations_mock.list.assert_called_with(self.server.id)
-        self.server_migrations_mock.live_migrate_force_complete\
-            .assert_called_with(self.server.id, self.server_migration.id)
+        self.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.server_migration.id, self.server.id)
         self.assertIsNone(result)
 
     def test_server_migration_force_complete_by_uuid_no_matches(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.59')
+        self._set_mock_microversion('2.59')
 
-        self.server_migrations_mock.list.return_value = []
+        self.sdk_client.server_migrations.return_value = iter([])
 
         arglist = [
             self.server.id,
@@ -1005,8 +1003,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
             str(ex))
 
     def test_server_migration_force_complete_by_uuid_pre_v259(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.58')
+        self._set_mock_microversion('2.58')
 
         arglist = [
             self.server.id,