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

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

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

@@ -11,9 +11,8 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
-from unittest import mock
+import uuid
 
 from openstackclient.compute.v2 import host
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
@@ -21,19 +20,51 @@ from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.host_list')
+def _generate_fake_host():
+    return {
+        'service_id': 1,
+        'host': 'host1',
+        'uuid': 'host-id-' + uuid.uuid4().hex,
+        'vcpus': 10,
+        'memory_mb': 100,
+        'local_gb': 100,
+        'vcpus_used': 5,
+        'memory_mb_used': 50,
+        'local_gb_used': 10,
+        'hypervisor_type': 'xen',
+        'hypervisor_version': 1,
+        'hypervisor_hostname': 'devstack1',
+        'free_ram_mb': 50,
+        'free_disk_gb': 50,
+        'current_workload': 10,
+        'running_vms': 1,
+        'cpu_info': '',
+        'disk_available_least': 1,
+        'host_ip': '10.10.10.10',
+        'supported_instances': '',
+        'metrics': '',
+        'pci_stats': '',
+        'extra_resources': '',
+        'stats': '',
+        'numa_topology': '',
+        'ram_allocation_ratio': 1.0,
+        'cpu_allocation_ratio': 1.0,
+        'zone': 'zone-' + uuid.uuid4().hex,
+        'host_name': 'name-' + uuid.uuid4().hex,
+        'service': 'service-' + uuid.uuid4().hex,
+        'cpu': 4,
+        'disk_gb': 100,
+        'project': 'project-' + uuid.uuid4().hex,
+    }
+
+
 class TestHostList(compute_fakes.TestComputev2):
-    _host = compute_fakes.create_one_host()
 
     def setUp(self):
-        super(TestHostList, self).setUp()
-
-        self.compute_sdk_client.get.return_value = fakes.FakeResponse(
-            data={'hosts': [self._host]}
-        )
+        super().setUp()
 
+        self._host = _generate_fake_host()
         self.columns = ('Host Name', 'Service', 'Zone')
-
         self.data = [
             (
                 self._host['host_name'],
@@ -42,10 +73,12 @@ class TestHostList(compute_fakes.TestComputev2):
             )
         ]
 
+        self.compute_sdk_client.get.return_value = fakes.FakeResponse(
+            data={'hosts': [self._host]}
+        )
         self.cmd = host.ListHost(self.app, None)
 
-    def test_host_list_no_option(self, h_mock):
-        h_mock.return_value = [self._host]
+    def test_host_list_no_option(self):
         arglist = []
         verifylist = []
 
@@ -59,8 +92,7 @@ class TestHostList(compute_fakes.TestComputev2):
         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]
+    def test_host_list_with_option(self):
         arglist = [
             '--zone',
             self._host['zone'],
@@ -80,76 +112,60 @@ class TestHostList(compute_fakes.TestComputev2):
         self.assertEqual(self.data, list(data))
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.host_set')
 class TestHostSet(compute_fakes.TestComputev2):
     def setUp(self):
-        super(TestHostSet, self).setUp()
+        super().setUp()
 
-        self.host = compute_fakes.create_one_host()
+        self._host = _generate_fake_host()
+        self.compute_sdk_client.put.return_value = fakes.FakeResponse()
 
         self.cmd = host.SetHost(self.app, None)
 
-    def test_host_set_no_option(self, h_mock):
-        h_mock.return_value = self.host
-        h_mock.update.return_value = None
+    def test_host_set_no_option(self):
         arglist = [
-            self.host['host'],
+            self._host['host'],
         ]
         verifylist = [
-            ('host', self.host['host']),
+            ('host', self._host['host']),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
+        self.compute_sdk_client.put.assert_not_called()
 
-        h_mock.assert_called_with(self.host['host'])
-
-    def test_host_set(self, h_mock):
-        h_mock.return_value = self.host
-        h_mock.update.return_value = None
+    def test_host_set(self):
         arglist = [
             '--enable',
             '--disable-maintenance',
-            self.host['host'],
+            self._host['host'],
         ]
         verifylist = [
             ('enable', True),
             ('enable_maintenance', False),
-            ('host', self.host['host']),
+            ('host', self._host['host']),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
-
-        h_mock.assert_called_with(
-            self.host['host'], status='enable', maintenance_mode='disable'
+        self.compute_sdk_client.put.assert_called_with(
+            f'/os-hosts/{self._host["host"]}',
+            json={
+                'maintenance_mode': 'disable',
+                'status': 'enable',
+            },
+            microversion='2.1',
         )
 
 
-@mock.patch('openstackclient.api.compute_v2.APIv2.host_show')
 class TestHostShow(compute_fakes.TestComputev2):
-    _host = compute_fakes.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'],
-            }
-        }
+        super().setUp()
 
-        self.compute_sdk_client.get.return_value = fakes.FakeResponse(
-            data={'host': [output_data]}
-        )
+        self._host = _generate_fake_host()
 
         self.columns = (
             'Host',
@@ -158,7 +174,6 @@ class TestHostShow(compute_fakes.TestComputev2):
             'Memory MB',
             'Disk GB',
         )
-
         self.data = [
             (
                 self._host['host'],
@@ -169,10 +184,25 @@ class TestHostShow(compute_fakes.TestComputev2):
             )
         ]
 
+        self.compute_sdk_client.get.return_value = fakes.FakeResponse(
+            data={
+                'host': [
+                    {
+                        '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.cmd = host.ShowHost(self.app, None)
 
-    def test_host_show_no_option(self, h_mock):
-        h_mock.host_show.return_value = [self._host]
+    def test_host_show_no_option(self):
         arglist = []
         verifylist = []
 
@@ -185,8 +215,7 @@ class TestHostShow(compute_fakes.TestComputev2):
             verifylist,
         )
 
-    def test_host_show_with_option(self, h_mock):
-        h_mock.return_value = [self._host]
+    def test_host_show_with_option(self):
         arglist = [
             self._host['host_name'],
         ]

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

@@ -11,13 +11,10 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import json
-from unittest import mock
 
-from novaclient import exceptions as nova_exceptions
-from openstack import utils as sdk_utils
+from openstack import exceptions as sdk_exceptions
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
@@ -164,10 +161,7 @@ class TestHypervisorList(compute_fakes.TestComputev2):
             exceptions.NotFound, self.cmd.take_action, parsed_args
         )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
-    def test_hypervisor_list_with_matching_and_pagination_options(
-        self, sm_mock
-    ):
+    def test_hypervisor_list_with_matching_and_pagination_options(self):
         arglist = [
             '--matching',
             self.hypervisors[0].name,
@@ -191,8 +185,7 @@ class TestHypervisorList(compute_fakes.TestComputev2):
             '--matching is not compatible with --marker or --limit', str(ex)
         )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
-    def test_hypervisor_list_long_option(self, sm_mock):
+    def test_hypervisor_list_long_option(self):
         arglist = [
             '--long',
         ]
@@ -210,8 +203,9 @@ class TestHypervisorList(compute_fakes.TestComputev2):
         self.assertEqual(self.columns_long, columns)
         self.assertEqual(self.data_long, tuple(data))
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
-    def test_hypervisor_list_with_limit(self, sm_mock):
+    def test_hypervisor_list_with_limit(self):
+        self.set_compute_api_version('2.33')
+
         arglist = [
             '--limit',
             '1',
@@ -227,8 +221,9 @@ class TestHypervisorList(compute_fakes.TestComputev2):
             limit=1, details=True
         )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
-    def test_hypervisor_list_with_limit_pre_v233(self, sm_mock):
+    def test_hypervisor_list_with_limit_pre_v233(self):
+        self.set_compute_api_version('2.32')
+
         arglist = [
             '--limit',
             '1',
@@ -246,8 +241,9 @@ class TestHypervisorList(compute_fakes.TestComputev2):
             '--os-compute-api-version 2.33 or greater is required', str(ex)
         )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
-    def test_hypervisor_list_with_marker(self, sm_mock):
+    def test_hypervisor_list_with_marker(self):
+        self.set_compute_api_version('2.33')
+
         arglist = [
             '--marker',
             'test_hyp',
@@ -263,8 +259,9 @@ class TestHypervisorList(compute_fakes.TestComputev2):
             marker='test_hyp', details=True
         )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
-    def test_hypervisor_list_with_marker_pre_v233(self, sm_mock):
+    def test_hypervisor_list_with_marker_pre_v233(self):
+        self.set_compute_api_version('2.32')
+
         arglist = [
             '--marker',
             'test_hyp',
@@ -413,8 +410,9 @@ class TestHypervisorShow(compute_fakes.TestComputev2):
         # Get the command object to test
         self.cmd = hypervisor.ShowHypervisor(self.app, None)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
-    def test_hypervisor_show(self, sm_mock):
+    def test_hypervisor_show(self):
+        self.set_compute_api_version('2.88')
+
         arglist = [
             self.hypervisor.name,
         ]
@@ -431,10 +429,9 @@ class TestHypervisorShow(compute_fakes.TestComputev2):
         self.assertEqual(self.columns_v288, columns)
         self.assertCountEqual(self.data_v288, data)
 
-    @mock.patch.object(
-        sdk_utils, 'supports_microversion', side_effect=[False, True, False]
-    )
-    def test_hypervisor_show_pre_v288(self, sm_mock):
+    def test_hypervisor_show_pre_v288(self):
+        self.set_compute_api_version('2.87')
+
         arglist = [
             self.hypervisor.name,
         ]
@@ -451,8 +448,9 @@ class TestHypervisorShow(compute_fakes.TestComputev2):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
-    def test_hypervisor_show_pre_v228(self, sm_mock):
+    def test_hypervisor_show_pre_v228(self):
+        self.set_compute_api_version('2.27')
+
         # before microversion 2.28, nova returned a stringified version of this
         # field
         self.hypervisor.cpu_info = json.dumps(self.hypervisor.cpu_info)
@@ -474,10 +472,9 @@ class TestHypervisorShow(compute_fakes.TestComputev2):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
-    @mock.patch.object(
-        sdk_utils, 'supports_microversion', side_effect=[False, True, False]
-    )
-    def test_hypervisor_show_uptime_not_implemented(self, sm_mock):
+    def test_hypervisor_show_uptime_not_implemented(self):
+        self.set_compute_api_version('2.87')
+
         arglist = [
             self.hypervisor.name,
         ]
@@ -487,7 +484,7 @@ class TestHypervisorShow(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.compute_sdk_client.get_hypervisor_uptime.side_effect = (
-            nova_exceptions.HTTPNotImplemented(501)
+            sdk_exceptions.HttpException(http_status=501)
         )
 
         # In base command class ShowOne in cliff, abstract method take_action()

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

@@ -21,7 +21,7 @@ from openstackclient.tests.unit import fakes
 
 class TestHypervisorStats(compute_fakes.TestComputev2):
     def setUp(self):
-        super(TestHypervisorStats, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.get = mock.Mock()
 
@@ -65,7 +65,7 @@ class TestHypervisorStatsShow(TestHypervisorStats):
     _stats = create_one_hypervisor_stats()
 
     def setUp(self):
-        super(TestHypervisorStatsShow, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.get.return_value = fakes.FakeResponse(
             data={'hypervisor_statistics': self._stats}