python-openstackclient 6.6.1__py3-none-any.whl → 7.0.0__py3-none-any.whl

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

@@ -64,7 +64,7 @@ class TestServerBackupCreate(TestServerBackup):
         return datalist
 
     def setUp(self):
-        super(TestServerBackupCreate, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = server_backup.CreateServerBackup(self.app, None)

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

@@ -15,40 +15,14 @@
 from unittest import mock
 
 import iso8601
-from novaclient import api_versions
-from openstack import utils as sdk_utils
 from osc_lib import exceptions
 
 from openstackclient.compute.v2 import server_event
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestServerEvent(compute_fakes.TestComputev2):
-    fake_server = compute_fakes.create_one_server()
-
-    def setUp(self):
-        super(TestServerEvent, self).setUp()
-
-        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.compute_client.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)
-        )
-
-
-class TestListServerEvent(TestServerEvent):
+class TestListServerEvent(compute_fakes.TestComputev2):
+    fake_server = compute_fakes.create_one_sdk_server()
     fake_event = compute_fakes.create_one_server_action()
 
     columns = (
@@ -145,7 +119,7 @@ class TestListServerEvent(TestServerEvent):
         self.assertEqual(self.long_data, tuple(data))
 
     def test_server_event_list_with_changes_since(self):
-        self._set_mock_microversion('2.58')
+        self.set_compute_api_version('2.58')
 
         arglist = [
             '--changes-since',
@@ -177,7 +151,7 @@ class TestListServerEvent(TestServerEvent):
         self,
         mock_parse_isotime,
     ):
-        self._set_mock_microversion('2.58')
+        self.set_compute_api_version('2.58')
 
         arglist = [
             '--changes-since',
@@ -200,7 +174,7 @@ class TestListServerEvent(TestServerEvent):
         mock_parse_isotime.assert_called_once_with('Invalid time value')
 
     def test_server_event_list_with_changes_since_pre_v258(self):
-        self._set_mock_microversion('2.57')
+        self.set_compute_api_version('2.57')
 
         arglist = [
             '--changes-since',
@@ -225,7 +199,7 @@ class TestListServerEvent(TestServerEvent):
         )
 
     def test_server_event_list_with_changes_before(self):
-        self._set_mock_microversion('2.66')
+        self.set_compute_api_version('2.66')
 
         arglist = [
             '--changes-before',
@@ -257,7 +231,7 @@ class TestListServerEvent(TestServerEvent):
         self,
         mock_parse_isotime,
     ):
-        self._set_mock_microversion('2.66')
+        self.set_compute_api_version('2.66')
 
         arglist = [
             '--changes-before',
@@ -278,7 +252,7 @@ class TestListServerEvent(TestServerEvent):
         mock_parse_isotime.assert_called_once_with('Invalid time value')
 
     def test_server_event_list_with_changes_before_pre_v266(self):
-        self._set_mock_microversion('2.65')
+        self.set_compute_api_version('2.65')
 
         arglist = [
             '--changes-before',
@@ -301,7 +275,7 @@ class TestListServerEvent(TestServerEvent):
         )
 
     def test_server_event_list_with_limit(self):
-        self._set_mock_microversion('2.58')
+        self.set_compute_api_version('2.58')
 
         arglist = [
             '--limit',
@@ -323,7 +297,7 @@ class TestListServerEvent(TestServerEvent):
         )
 
     def test_server_event_list_with_limit_pre_v258(self):
-        self._set_mock_microversion('2.57')
+        self.set_compute_api_version('2.57')
 
         arglist = [
             '--limit',
@@ -348,7 +322,7 @@ class TestListServerEvent(TestServerEvent):
         )
 
     def test_server_event_list_with_marker(self):
-        self._set_mock_microversion('2.58')
+        self.set_compute_api_version('2.58')
 
         arglist = [
             '--marker',
@@ -369,7 +343,7 @@ class TestListServerEvent(TestServerEvent):
         )
 
     def test_server_event_list_with_marker_pre_v258(self):
-        self._set_mock_microversion('2.57')
+        self.set_compute_api_version('2.57')
 
         arglist = [
             '--marker',
@@ -391,7 +365,8 @@ class TestListServerEvent(TestServerEvent):
         )
 
 
-class TestShowServerEvent(TestServerEvent):
+class TestShowServerEvent(compute_fakes.TestComputev2):
+    fake_server = compute_fakes.create_one_sdk_server()
     fake_event = compute_fakes.create_one_server_action()
     columns = (
         'action',

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

@@ -13,9 +13,6 @@
 #   under the License.
 #
 
-from unittest import mock
-
-from openstack import utils as sdk_utils
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
@@ -57,8 +54,9 @@ class TestServerGroupCreate(TestServerGroup):
         )
         self.cmd = server_group.CreateServerGroup(self.app, None)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
-    def test_server_group_create(self, sm_mock):
+    def test_server_group_create(self):
+        self.set_compute_api_version('2.64')
+
         arglist = [
             '--policy',
             'anti-affinity',
@@ -78,8 +76,9 @@ class TestServerGroupCreate(TestServerGroup):
         self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
-    def test_server_group_create_with_soft_policies(self, sm_mock):
+    def test_server_group_create_with_soft_policies(self):
+        self.set_compute_api_version('2.64')
+
         arglist = [
             '--policy',
             'soft-anti-affinity',
@@ -99,8 +98,9 @@ class TestServerGroupCreate(TestServerGroup):
         self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
-    def test_server_group_create_with_soft_policies_pre_v215(self, sm_mock):
+    def test_server_group_create_with_soft_policies_pre_v215(self):
+        self.set_compute_api_version('2.14')
+
         arglist = [
             '--policy',
             'soft-anti-affinity',
@@ -118,8 +118,9 @@ class TestServerGroupCreate(TestServerGroup):
             '--os-compute-api-version 2.15 or greater is required', str(ex)
         )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
-    def test_server_group_create_with_rules(self, sm_mock):
+    def test_server_group_create_with_rules(self):
+        self.set_compute_api_version('2.64')
+
         arglist = [
             '--policy',
             'soft-anti-affinity',
@@ -143,10 +144,9 @@ class TestServerGroupCreate(TestServerGroup):
         self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
-    @mock.patch.object(
-        sdk_utils, 'supports_microversion', side_effect=[True, False]
-    )
-    def test_server_group_create_with_rules_pre_v264(self, sm_mock):
+    def test_server_group_create_with_rules_pre_v264(self):
+        self.set_compute_api_version('2.63')
+
         arglist = [
             '--policy',
             'soft-anti-affinity',
@@ -346,8 +346,7 @@ class TestServerGroupList(TestServerGroup):
         ]
         self.cmd = server_group.ListServerGroup(self.app, None)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
-    def test_server_group_list(self, sm_mock):
+    def test_server_group_list(self):
         arglist = []
         verifylist = [
             ('all_projects', False),
@@ -363,8 +362,7 @@ class TestServerGroupList(TestServerGroup):
         self.assertCountEqual(self.list_columns, columns)
         self.assertCountEqual(self.list_data, tuple(data))
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
-    def test_server_group_list_with_all_projects_and_long(self, sm_mock):
+    def test_server_group_list_with_all_projects_and_long(self):
         arglist = [
             '--all-projects',
             '--long',
@@ -384,8 +382,7 @@ class TestServerGroupList(TestServerGroup):
         self.assertCountEqual(self.list_columns_long, columns)
         self.assertCountEqual(self.list_data_long, tuple(data))
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
-    def test_server_group_list_with_limit(self, sm_mock):
+    def test_server_group_list_with_limit(self):
         arglist = [
             '--limit',
             '1',
@@ -402,8 +399,7 @@ class TestServerGroupList(TestServerGroup):
 
         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):
+    def test_server_group_list_with_offset(self):
         arglist = [
             '--offset',
             '5',
@@ -420,8 +416,9 @@ class TestServerGroupList(TestServerGroup):
 
         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):
+    def test_server_group_list_v264(self):
+        self.set_compute_api_version('2.64')
+
         arglist = []
         verifylist = [
             ('all_projects', False),
@@ -434,8 +431,9 @@ class TestServerGroupList(TestServerGroup):
         self.assertCountEqual(self.list_columns_v264, columns)
         self.assertCountEqual(self.list_data_v264, tuple(data))
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
-    def test_server_group_list_with_all_projects_and_long_v264(self, sm_mock):
+    def test_server_group_list_with_all_projects_and_long_v264(self):
+        self.set_compute_api_version('2.64')
+
         arglist = [
             '--all-projects',
             '--long',
@@ -463,8 +461,9 @@ class TestServerGroupShow(TestServerGroup):
         )
         self.cmd = server_group.ShowServerGroup(self.app, None)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
-    def test_server_group_show(self, sm_mock):
+    def test_server_group_show(self):
+        self.set_compute_api_version('2.64')
+
         arglist = [
             'affinity_group',
         ]

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

@@ -10,10 +10,6 @@
 # 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
 from osc_lib import utils as common_utils
 
@@ -22,34 +18,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestServerMigration(compute_fakes.TestComputev2):
-    def setUp(self):
-        super().setUp()
-
-        # Get a shortcut to the compute client ServerManager Mock
-        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.compute_client.server_migrations
-        self.server_migrations_mock.reset_mock()
-
-        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):
+class TestListMigration(compute_fakes.TestComputev2):
     """Test fetch all migrations."""
 
     MIGRATION_COLUMNS = [
@@ -83,8 +52,6 @@ class TestListMigration(TestServerMigration):
     def setUp(self):
         super().setUp()
 
-        self._set_mock_microversion('2.1')
-
         self.server = compute_fakes.create_one_sdk_server()
         self.compute_sdk_client.find_server.return_value = self.server
 
@@ -189,7 +156,7 @@ class TestListMigrationV223(TestListMigration):
     def setUp(self):
         super().setUp()
 
-        self._set_mock_microversion('2.23')
+        self.set_compute_api_version('2.23')
 
     def test_server_migration_list(self):
         arglist = ['--status', 'migrating']
@@ -249,7 +216,7 @@ class TestListMigrationV259(TestListMigration):
     def setUp(self):
         super().setUp()
 
-        self._set_mock_microversion('2.59')
+        self.set_compute_api_version('2.59')
 
     def test_server_migration_list(self):
         arglist = [
@@ -286,7 +253,8 @@ class TestListMigrationV259(TestListMigration):
         self.assertEqual(tuple(self.data), tuple(data))
 
     def test_server_migration_list_with_limit_pre_v259(self):
-        self._set_mock_microversion('2.58')
+        self.set_compute_api_version('2.58')
+
         arglist = ['--status', 'migrating', '--limit', '1']
         verifylist = [('status', 'migrating'), ('limit', 1)]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -298,7 +266,8 @@ class TestListMigrationV259(TestListMigration):
         )
 
     def test_server_migration_list_with_marker_pre_v259(self):
-        self._set_mock_microversion('2.58')
+        self.set_compute_api_version('2.58')
+
         arglist = ['--status', 'migrating', '--marker', 'test_kp']
         verifylist = [('status', 'migrating'), ('marker', 'test_kp')]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -310,7 +279,8 @@ class TestListMigrationV259(TestListMigration):
         )
 
     def test_server_migration_list_with_changes_since_pre_v259(self):
-        self._set_mock_microversion('2.58')
+        self.set_compute_api_version('2.58')
+
         arglist = [
             '--status',
             'migrating',
@@ -371,7 +341,7 @@ class TestListMigrationV266(TestListMigration):
     def setUp(self):
         super().setUp()
 
-        self._set_mock_microversion('2.66')
+        self.set_compute_api_version('2.66')
 
     def test_server_migration_list_with_changes_before(self):
         arglist = [
@@ -412,7 +382,8 @@ class TestListMigrationV266(TestListMigration):
         self.assertEqual(tuple(self.data), tuple(data))
 
     def test_server_migration_list_with_changes_before_pre_v266(self):
-        self._set_mock_microversion('2.65')
+        self.set_compute_api_version('2.65')
+
         arglist = [
             '--status',
             'migrating',
@@ -476,16 +447,16 @@ class TestListMigrationV280(TestListMigration):
     def setUp(self):
         super().setUp()
 
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         self.projects_mock.reset_mock()
 
-        self.users_mock = self.app.client_manager.identity.users
+        self.users_mock = self.identity_client.users
         self.users_mock.reset_mock()
 
         self.projects_mock.get.return_value = self.project
         self.users_mock.get.return_value = self.user
 
-        self._set_mock_microversion('2.80')
+        self.set_compute_api_version('2.80')
 
     def test_server_migration_list_with_project(self):
         arglist = [
@@ -540,7 +511,8 @@ class TestListMigrationV280(TestListMigration):
         self.MIGRATION_FIELDS.remove('project_id')
 
     def test_get_migrations_with_project_pre_v280(self):
-        self._set_mock_microversion('2.79')
+        self.set_compute_api_version('2.79')
+
         arglist = [
             '--status',
             'migrating',
@@ -612,7 +584,8 @@ class TestListMigrationV280(TestListMigration):
         self.MIGRATION_FIELDS.remove('user_id')
 
     def test_get_migrations_with_user_pre_v280(self):
-        self._set_mock_microversion('2.79')
+        self.set_compute_api_version('2.79')
+
         arglist = [
             '--status',
             'migrating',
@@ -690,7 +663,8 @@ class TestListMigrationV280(TestListMigration):
         self.MIGRATION_FIELDS.remove('user_id')
 
     def test_get_migrations_with_project_and_user_pre_v280(self):
-        self._set_mock_microversion('2.79')
+        self.set_compute_api_version('2.79')
+
         arglist = [
             '--status',
             'migrating',
@@ -716,7 +690,7 @@ class TestListMigrationV280(TestListMigration):
         )
 
 
-class TestServerMigrationShow(TestServerMigration):
+class TestServerMigrationShow(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
@@ -793,12 +767,12 @@ class TestServerMigrationShow(TestServerMigration):
         )
 
     def test_server_migration_show(self):
-        self._set_mock_microversion('2.24')
+        self.set_compute_api_version('2.24')
 
         self._test_server_migration_show()
 
     def test_server_migration_show_v259(self):
-        self._set_mock_microversion('2.59')
+        self.set_compute_api_version('2.59')
 
         self.columns += ('UUID',)
         self.data += (self.server_migration.uuid,)
@@ -806,7 +780,7 @@ class TestServerMigrationShow(TestServerMigration):
         self._test_server_migration_show()
 
     def test_server_migration_show_v280(self):
-        self._set_mock_microversion('2.80')
+        self.set_compute_api_version('2.80')
 
         self.columns += ('UUID', 'User ID', 'Project ID')
         self.data += (
@@ -818,7 +792,7 @@ class TestServerMigrationShow(TestServerMigration):
         self._test_server_migration_show()
 
     def test_server_migration_show_pre_v224(self):
-        self._set_mock_microversion('2.23')
+        self.set_compute_api_version('2.23')
 
         arglist = [
             self.server.id,
@@ -835,7 +809,7 @@ class TestServerMigrationShow(TestServerMigration):
         )
 
     def test_server_migration_show_by_uuid(self):
-        self._set_mock_microversion('2.59')
+        self.set_compute_api_version('2.59')
 
         self.compute_sdk_client.server_migrations.return_value = iter(
             [self.server_migration]
@@ -865,7 +839,8 @@ class TestServerMigrationShow(TestServerMigration):
         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.set_compute_api_version('2.59')
+
         self.compute_sdk_client.server_migrations.return_value = iter([])
 
         arglist = [
@@ -884,7 +859,7 @@ class TestServerMigrationShow(TestServerMigration):
         )
 
     def test_server_migration_show_by_uuid_pre_v259(self):
-        self._set_mock_microversion('2.58')
+        self.set_compute_api_version('2.58')
 
         arglist = [
             self.server.id,
@@ -901,7 +876,7 @@ class TestServerMigrationShow(TestServerMigration):
         )
 
     def test_server_migration_show_invalid_id(self):
-        self._set_mock_microversion('2.24')
+        self.set_compute_api_version('2.24')
 
         arglist = [
             self.server.id,
@@ -918,7 +893,7 @@ class TestServerMigrationShow(TestServerMigration):
         )
 
 
-class TestServerMigrationAbort(TestServerMigration):
+class TestServerMigrationAbort(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
@@ -931,7 +906,7 @@ class TestServerMigrationAbort(TestServerMigration):
         self.cmd = server_migration.AbortMigration(self.app, None)
 
     def test_migration_abort(self):
-        self._set_mock_microversion('2.24')
+        self.set_compute_api_version('2.24')
 
         arglist = [
             self.server.id,
@@ -951,7 +926,7 @@ class TestServerMigrationAbort(TestServerMigration):
         self.assertIsNone(result)
 
     def test_migration_abort_pre_v224(self):
-        self._set_mock_microversion('2.23')
+        self.set_compute_api_version('2.23')
 
         arglist = [
             self.server.id,
@@ -968,7 +943,7 @@ class TestServerMigrationAbort(TestServerMigration):
         )
 
     def test_server_migration_abort_by_uuid(self):
-        self._set_mock_microversion('2.59')
+        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(
@@ -996,7 +971,7 @@ class TestServerMigrationAbort(TestServerMigration):
         self.assertIsNone(result)
 
     def test_server_migration_abort_by_uuid_no_matches(self):
-        self._set_mock_microversion('2.59')
+        self.set_compute_api_version('2.59')
 
         self.compute_sdk_client.server_migrations.return_value = iter([])
 
@@ -1016,7 +991,7 @@ class TestServerMigrationAbort(TestServerMigration):
         )
 
     def test_server_migration_abort_by_uuid_pre_v259(self):
-        self._set_mock_microversion('2.58')
+        self.set_compute_api_version('2.58')
 
         arglist = [
             self.server.id,
@@ -1033,7 +1008,7 @@ class TestServerMigrationAbort(TestServerMigration):
         )
 
 
-class TestServerMigrationForceComplete(TestServerMigration):
+class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
@@ -1046,7 +1021,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
         self.cmd = server_migration.ForceCompleteMigration(self.app, None)
 
     def test_migration_force_complete(self):
-        self._set_mock_microversion('2.22')
+        self.set_compute_api_version('2.22')
 
         arglist = [
             self.server.id,
@@ -1066,7 +1041,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
         self.assertIsNone(result)
 
     def test_migration_force_complete_pre_v222(self):
-        self._set_mock_microversion('2.21')
+        self.set_compute_api_version('2.21')
 
         arglist = [
             self.server.id,
@@ -1083,7 +1058,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
         )
 
     def test_server_migration_force_complete_by_uuid(self):
-        self._set_mock_microversion('2.59')
+        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(
@@ -1111,7 +1086,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
         self.assertIsNone(result)
 
     def test_server_migration_force_complete_by_uuid_no_matches(self):
-        self._set_mock_microversion('2.59')
+        self.set_compute_api_version('2.59')
 
         self.compute_sdk_client.server_migrations.return_value = iter([])
 
@@ -1131,7 +1106,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
         )
 
     def test_server_migration_force_complete_by_uuid_pre_v259(self):
-        self._set_mock_microversion('2.58')
+        self.set_compute_api_version('2.58')
 
         arglist = [
             self.server.id,