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

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

@@ -17,7 +17,6 @@ from unittest import mock
 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
 
@@ -58,7 +57,7 @@ class TestAggregate(compute_fakes.TestComputev2):
 
 class TestAggregateAddHost(TestAggregate):
     def setUp(self):
-        super(TestAggregateAddHost, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
         self.compute_sdk_client.add_host_to_aggregate.return_value = (
@@ -89,7 +88,7 @@ class TestAggregateAddHost(TestAggregate):
 
 class TestAggregateCreate(TestAggregate):
     def setUp(self):
-        super(TestAggregateCreate, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.create_aggregate.return_value = self.fake_ag
         self.compute_sdk_client.set_aggregate_metadata.return_value = (
@@ -159,7 +158,7 @@ class TestAggregateDelete(TestAggregate):
     fake_ags = compute_fakes.create_aggregates(count=2)
 
     def setUp(self):
-        super(TestAggregateDelete, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.find_aggregate = compute_fakes.get_aggregates(
             self.fake_ags
@@ -228,58 +227,61 @@ class TestAggregateDelete(TestAggregate):
 
 
 class TestAggregateList(TestAggregate):
-    list_columns = (
-        "ID",
-        "Name",
-        "Availability Zone",
-    )
+    def setUp(self):
+        super().setUp()
 
-    list_columns_long = (
-        "ID",
-        "Name",
-        "Availability Zone",
-        "Properties",
-        "Hosts",
-    )
+        self.compute_sdk_client.aggregates.return_value = [self.fake_ag]
+        self.cmd = aggregate.ListAggregate(self.app, None)
 
-    list_data = (
-        (
-            TestAggregate.fake_ag.id,
-            TestAggregate.fake_ag.name,
-            TestAggregate.fake_ag.availability_zone,
-        ),
-    )
+    def test_aggregate_list(self):
+        self.set_compute_api_version('2.41')
 
-    list_data_long = (
-        (
-            TestAggregate.fake_ag.id,
-            TestAggregate.fake_ag.name,
-            TestAggregate.fake_ag.availability_zone,
-            format_columns.DictColumn(
-                {
-                    key: value
-                    for key, value in TestAggregate.fake_ag.metadata.items()
-                    if key != 'availability_zone'
-                }
+        parsed_args = self.check_parser(self.cmd, [], [])
+        columns, data = self.cmd.take_action(parsed_args)
+
+        expected_columns = (
+            "ID",
+            "UUID",
+            "Name",
+            "Availability Zone",
+        )
+        expected_data = (
+            (
+                self.fake_ag.id,
+                self.fake_ag.uuid,
+                self.fake_ag.name,
+                self.fake_ag.availability_zone,
             ),
-            format_columns.ListColumn(TestAggregate.fake_ag.hosts),
-        ),
-    )
+        )
 
-    def setUp(self):
-        super(TestAggregateList, self).setUp()
+        self.assertEqual(expected_columns, columns)
+        self.assertCountEqual(expected_data, tuple(data))
 
-        self.compute_sdk_client.aggregates.return_value = [self.fake_ag]
-        self.cmd = aggregate.ListAggregate(self.app, None)
+    def test_aggregate_list_pre_v241(self):
+        self.set_compute_api_version('2.40')
 
-    def test_aggregate_list(self):
         parsed_args = self.check_parser(self.cmd, [], [])
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.assertEqual(self.list_columns, columns)
-        self.assertCountEqual(self.list_data, tuple(data))
+        expected_columns = (
+            "ID",
+            "Name",
+            "Availability Zone",
+        )
+        expected_data = (
+            (
+                self.fake_ag.id,
+                self.fake_ag.name,
+                self.fake_ag.availability_zone,
+            ),
+        )
+
+        self.assertEqual(expected_columns, columns)
+        self.assertCountEqual(expected_data, tuple(data))
 
     def test_aggregate_list_with_long(self):
+        self.set_compute_api_version('2.41')
+
         arglist = [
             '--long',
         ]
@@ -289,13 +291,38 @@ class TestAggregateList(TestAggregate):
         parsed_args = self.check_parser(self.cmd, arglist, vertifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.assertEqual(self.list_columns_long, columns)
-        self.assertCountEqual(self.list_data_long, tuple(data))
+        expected_columns = (
+            "ID",
+            "UUID",
+            "Name",
+            "Availability Zone",
+            "Properties",
+            "Hosts",
+        )
+        expected_data = (
+            (
+                self.fake_ag.id,
+                self.fake_ag.uuid,
+                self.fake_ag.name,
+                self.fake_ag.availability_zone,
+                format_columns.DictColumn(
+                    {
+                        key: value
+                        for key, value in self.fake_ag.metadata.items()
+                        if key != 'availability_zone'
+                    }
+                ),
+                format_columns.ListColumn(self.fake_ag.hosts),
+            ),
+        )
+
+        self.assertEqual(expected_columns, columns)
+        self.assertCountEqual(expected_data, tuple(data))
 
 
 class TestAggregateRemoveHost(TestAggregate):
     def setUp(self):
-        super(TestAggregateRemoveHost, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
         self.compute_sdk_client.remove_host_from_aggregate.return_value = (
@@ -326,7 +353,7 @@ class TestAggregateRemoveHost(TestAggregate):
 
 class TestAggregateSet(TestAggregate):
     def setUp(self):
-        super(TestAggregateSet, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
         self.cmd = aggregate.SetAggregate(self.app, None)
@@ -513,7 +540,7 @@ class TestAggregateShow(TestAggregate):
     )
 
     def setUp(self):
-        super(TestAggregateShow, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
         self.cmd = aggregate.ShowAggregate(self.app, None)
@@ -537,7 +564,7 @@ class TestAggregateShow(TestAggregate):
 
 class TestAggregateUnset(TestAggregate):
     def setUp(self):
-        super(TestAggregateUnset, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
         self.cmd = aggregate.UnsetAggregate(self.app, None)
@@ -598,7 +625,7 @@ class TestAggregateCacheImage(TestAggregate):
     images = image_fakes.create_images(count=2)
 
     def setUp(self):
-        super(TestAggregateCacheImage, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
         self.find_image_mock = mock.Mock(side_effect=self.images)
@@ -608,8 +635,9 @@ class TestAggregateCacheImage(TestAggregate):
 
         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 +648,9 @@ class TestAggregateCacheImage(TestAggregate):
             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 +665,9 @@ class TestAggregateCacheImage(TestAggregate):
             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_console.py

@@ -21,11 +21,10 @@ from openstackclient.tests.unit import utils
 
 
 class TestConsoleLog(compute_fakes.TestComputev2):
-    _server = compute_fakes.create_one_server()
-
     def setUp(self):
-        super(TestConsoleLog, self).setUp()
+        super().setUp()
 
+        self._server = compute_fakes.create_one_sdk_server()
         self.compute_sdk_client.find_server.return_value = self._server
 
         self.cmd = console.ShowConsoleLog(self.app, None)
@@ -77,10 +76,10 @@ class TestConsoleLog(compute_fakes.TestComputev2):
 
 
 class TestConsoleUrlShow(compute_fakes.TestComputev2):
-    _server = compute_fakes.create_one_server()
+    _server = compute_fakes.create_one_sdk_server()
 
     def setUp(self):
-        super(TestConsoleUrlShow, self).setUp()
+        super().setUp()
         self.compute_sdk_client.find_server.return_value = self._server
         fake_console_data = {
             'url': 'http://localhost',

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

@@ -16,7 +16,6 @@ from unittest import mock
 
 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
 
@@ -28,9 +27,9 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestFlavor(compute_fakes.TestComputev2):
     def setUp(self):
-        super(TestFlavor, self).setUp()
+        super().setUp()
 
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         self.projects_mock.reset_mock()
 
 
@@ -83,7 +82,7 @@ class TestFlavorCreate(TestFlavor):
     )
 
     def setUp(self):
-        super(TestFlavorCreate, self).setUp()
+        super().setUp()
 
         # Return a project
         self.projects_mock.get.return_value = self.project
@@ -118,6 +117,8 @@ class TestFlavorCreate(TestFlavor):
         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 @@ class TestFlavorCreate(TestFlavor):
             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 @@ class TestFlavorCreate(TestFlavor):
             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 @@ class TestFlavorCreate(TestFlavor):
             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 @@ class TestFlavorCreate(TestFlavor):
             ('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 @@ class TestFlavorCreate(TestFlavor):
         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,19 +389,16 @@ class TestFlavorCreate(TestFlavor):
         ]
         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):
     flavors = compute_fakes.create_flavors(count=2)
 
     def setUp(self):
-        super(TestFlavorDelete, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.delete_flavor.return_value = None
 
@@ -513,7 +508,7 @@ class TestFlavorList(TestFlavor):
     )
 
     def setUp(self):
-        super(TestFlavorList, self).setUp()
+        super().setUp()
 
         self.api_mock = mock.Mock()
         self.api_mock.side_effect = [
@@ -756,7 +751,7 @@ class TestFlavorSet(TestFlavor):
     project = identity_fakes.FakeProject.create_one_project()
 
     def setUp(self):
-        super(TestFlavorSet, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.find_flavor.return_value = self.flavor
         # Return a project
@@ -887,7 +882,9 @@ class TestFlavorSet(TestFlavor):
         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 @@ class TestFlavorSet(TestFlavor):
         ]
         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 @@ class TestFlavorSet(TestFlavor):
         ]
         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 @@ class TestFlavorSet(TestFlavor):
         ]
         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 @@ class TestFlavorSet(TestFlavor):
         ]
         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):
@@ -1006,7 +997,7 @@ class TestFlavorShow(TestFlavor):
     )
 
     def setUp(self):
-        super(TestFlavorShow, self).setUp()
+        super().setUp()
 
         # Return value of _find_resource()
         self.compute_sdk_client.find_flavor.return_value = self.flavor
@@ -1093,7 +1084,7 @@ class TestFlavorUnset(TestFlavor):
     project = identity_fakes.FakeProject.create_one_project()
 
     def setUp(self):
-        super(TestFlavorUnset, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.find_flavor.return_value = self.flavor
         # Return a project