tests: Migrate to 'set_xxx_api_version' helpers

Clean things up somewhat.

Change-Id: I868f496fc8285a28e8fd551377f2ae6228051d19
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstackclient/compute/v2/server.py

@@ -4418,23 +4418,23 @@ def take_action(self, parsed_args):
         )
 
         if parsed_args.description:
-            if server.api_version < api_versions.APIVersion("2.19"):
+            if compute_client.api_version < api_versions.APIVersion("2.19"):
                 msg = _(
                     '--os-compute-api-version 2.19 or greater is required to '
                     'support the --description option'
                 )
                 raise exceptions.CommandError(msg)
 
         if parsed_args.tags:
-            if server.api_version < api_versions.APIVersion('2.26'):
+            if compute_client.api_version < api_versions.APIVersion('2.26'):
                 msg = _(
                     '--os-compute-api-version 2.26 or greater is required to '
                     'support the --tag option'
                 )
                 raise exceptions.CommandError(msg)
 
         if parsed_args.hostname:
-            if server.api_version < api_versions.APIVersion('2.90'):
+            if compute_client.api_version < api_versions.APIVersion('2.90'):
                 msg = _(
                     '--os-compute-api-version 2.90 or greater is required to '
                     'support the --hostname option'

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

@@ -17,7 +17,6 @@
 from unittest.mock import call
 
 from openstack import exceptions as sdk_exceptions
-from openstack import utils as sdk_utils
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
@@ -608,8 +607,9 @@ def setUp(self):
 
         self.cmd = aggregate.CacheImageForAggregate(self.app, None)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
-    def test_aggregate_not_supported(self, sm_mock):
+    def test_aggregate_cache_pre_v281(self):
+        self.set_compute_api_version('2.80')
+
         arglist = ['ag1', 'im1']
         verifylist = [
             ('aggregate', 'ag1'),
@@ -620,8 +620,9 @@ def test_aggregate_not_supported(self, sm_mock):
             exceptions.CommandError, self.cmd.take_action, parsed_args
         )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
-    def test_aggregate_add_single_image(self, sm_mock):
+    def test_aggregate_cache_add_single_image(self):
+        self.set_compute_api_version('2.81')
+
         arglist = ['ag1', 'im1']
         verifylist = [
             ('aggregate', 'ag1'),
@@ -636,8 +637,9 @@ def test_aggregate_add_single_image(self, sm_mock):
             self.fake_ag.id, [self.images[0].id]
         )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
-    def test_aggregate_add_multiple_images(self, sm_mock):
+    def test_aggregate_cache_add_multiple_images(self):
+        self.set_compute_api_version('2.81')
+
         arglist = [
             'ag1',
             'im1',

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

@@ -16,7 +16,6 @@
 
 from openstack.compute.v2 import flavor as _flavor
 from openstack import exceptions as sdk_exceptions
-from openstack import utils as sdk_utils
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
@@ -118,6 +117,8 @@ def test_flavor_create_default_options(self):
         self.assertCountEqual(self.data, data)
 
     def test_flavor_create_all_options(self):
+        self.set_compute_api_version('2.55')
+
         arglist = [
             '--id',
             self.flavor.id,
@@ -184,22 +185,19 @@ def test_flavor_create_all_options(self):
             expected_flavor
         )
 
-        with mock.patch.object(
-            sdk_utils, 'supports_microversion', return_value=True
-        ):
-            columns, data = self.cmd.take_action(parsed_args)
-            self.compute_sdk_client.create_flavor.assert_called_once_with(
-                **args
-            )
-            self.compute_sdk_client.create_flavor_extra_specs.assert_called_once_with(
-                create_flavor, props
-            )
-            self.compute_sdk_client.get_flavor_access.assert_not_called()
+        columns, data = self.cmd.take_action(parsed_args)
+        self.compute_sdk_client.create_flavor.assert_called_once_with(**args)
+        self.compute_sdk_client.create_flavor_extra_specs.assert_called_once_with(
+            create_flavor, props
+        )
+        self.compute_sdk_client.get_flavor_access.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(tuple(cmp_data), data)
 
     def test_flavor_create_other_options(self):
+        self.set_compute_api_version('2.55')
+
         self.flavor.is_public = False
         arglist = [
             '--id',
@@ -272,10 +270,8 @@ def test_flavor_create_other_options(self):
             expected_flavor
         )
 
-        with mock.patch.object(
-            sdk_utils, 'supports_microversion', return_value=True
-        ):
-            columns, data = self.cmd.take_action(parsed_args)
+        columns, data = self.cmd.take_action(parsed_args)
+
         self.compute_sdk_client.create_flavor.assert_called_once_with(**args)
         self.compute_sdk_client.flavor_add_tenant_access.assert_called_with(
             self.flavor.id,
@@ -314,7 +310,9 @@ def test_flavor_create_no_options(self):
             verifylist,
         )
 
-    def test_flavor_create_with_description_api_newer(self):
+    def test_flavor_create_with_description(self):
+        self.set_compute_api_version('2.55')
+
         arglist = [
             '--id',
             self.flavor.id,
@@ -348,10 +346,8 @@ def test_flavor_create_with_description_api_newer(self):
             ('name', self.flavor.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        with mock.patch.object(
-            sdk_utils, 'supports_microversion', return_value=True
-        ):
-            columns, data = self.cmd.take_action(parsed_args)
+
+        columns, data = self.cmd.take_action(parsed_args)
 
         args = {
             'name': self.flavor.name,
@@ -371,7 +367,9 @@ def test_flavor_create_with_description_api_newer(self):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data_private, data)
 
-    def test_flavor_create_with_description_api_older(self):
+    def test_flavor_create_with_description_pre_v255(self):
+        self.set_compute_api_version('2.54')
+
         arglist = [
             '--id',
             self.flavor.id,
@@ -391,12 +389,9 @@ def test_flavor_create_with_description_api_older(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        with mock.patch.object(
-            sdk_utils, 'supports_microversion', return_value=False
-        ):
-            self.assertRaises(
-                exceptions.CommandError, self.cmd.take_action, parsed_args
-            )
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
 
 
 class TestFlavorDelete(TestFlavor):
@@ -887,7 +882,9 @@ def test_flavor_set_nothing(self):
         self.compute_sdk_client.flavor_add_tenant_access.assert_not_called()
         self.assertIsNone(result)
 
-    def test_flavor_set_description_api_newer(self):
+    def test_flavor_set_description(self):
+        self.set_compute_api_version('2.55')
+
         arglist = [
             '--description',
             'description',
@@ -899,16 +896,15 @@ def test_flavor_set_description_api_newer(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        with mock.patch.object(
-            sdk_utils, 'supports_microversion', return_value=True
-        ):
-            result = self.cmd.take_action(parsed_args)
-            self.compute_sdk_client.update_flavor.assert_called_with(
-                flavor=self.flavor.id, description='description'
-            )
-            self.assertIsNone(result)
+        result = self.cmd.take_action(parsed_args)
+        self.compute_sdk_client.update_flavor.assert_called_with(
+            flavor=self.flavor.id, description='description'
+        )
+        self.assertIsNone(result)
+
+    def test_flavor_set_description_pre_v254(self):
+        self.set_compute_api_version('2.54')
 
-    def test_flavor_set_description_api_older(self):
         arglist = [
             '--description',
             'description',
@@ -920,14 +916,13 @@ def test_flavor_set_description_api_older(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        with mock.patch.object(
-            sdk_utils, 'supports_microversion', return_value=False
-        ):
-            self.assertRaises(
-                exceptions.CommandError, self.cmd.take_action, parsed_args
-            )
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+
+    def test_flavor_set_description_using_name(self):
+        self.set_compute_api_version('2.55')
 
-    def test_flavor_set_description_using_name_api_newer(self):
         arglist = [
             '--description',
             'description',
@@ -939,16 +934,15 @@ def test_flavor_set_description_using_name_api_newer(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        with mock.patch.object(
-            sdk_utils, 'supports_microversion', return_value=True
-        ):
-            result = self.cmd.take_action(parsed_args)
-            self.compute_sdk_client.update_flavor.assert_called_with(
-                flavor=self.flavor.id, description='description'
-            )
-            self.assertIsNone(result)
+        result = self.cmd.take_action(parsed_args)
+        self.compute_sdk_client.update_flavor.assert_called_with(
+            flavor=self.flavor.id, description='description'
+        )
+        self.assertIsNone(result)
+
+    def test_flavor_set_description_using_name_pre_v255(self):
+        self.set_compute_api_version('2.54')
 
-    def test_flavor_set_description_using_name_api_older(self):
         arglist = [
             '--description',
             'description',
@@ -960,12 +954,9 @@ def test_flavor_set_description_using_name_api_older(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        with mock.patch.object(
-            sdk_utils, 'supports_microversion', return_value=False
-        ):
-            self.assertRaises(
-                exceptions.CommandError, self.cmd.take_action, parsed_args
-            )
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
 
 
 class TestFlavorShow(TestFlavor):