python-openstackclient 7.4.0__py3-none-any.whl → 8.0.0__py3-none-any.whl

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

@@ -86,7 +86,7 @@ class TestFlavorCreate(TestFlavor):
 
         # Return a project
         self.projects_mock.get.return_value = self.project
-        self.compute_sdk_client.create_flavor.return_value = self.flavor
+        self.compute_client.create_flavor.return_value = self.flavor
         self.cmd = flavor.CreateFlavor(self.app, None)
 
     def test_flavor_create_default_options(self):
@@ -109,7 +109,7 @@ class TestFlavorCreate(TestFlavor):
         }
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_flavor.assert_called_once_with(
+        self.compute_client.create_flavor.assert_called_once_with(
             **default_args
         )
 
@@ -180,17 +180,17 @@ class TestFlavorCreate(TestFlavor):
         # convert expected data tuple to list to be able to modify it
         cmp_data = list(self.data)
         cmp_data[7] = format_columns.DictColumn(props)
-        self.compute_sdk_client.create_flavor.return_value = create_flavor
-        self.compute_sdk_client.create_flavor_extra_specs.return_value = (
+        self.compute_client.create_flavor.return_value = create_flavor
+        self.compute_client.create_flavor_extra_specs.return_value = (
             expected_flavor
         )
 
         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(
+        self.compute_client.create_flavor.assert_called_once_with(**args)
+        self.compute_client.create_flavor_extra_specs.assert_called_once_with(
             create_flavor, props
         )
-        self.compute_sdk_client.get_flavor_access.assert_not_called()
+        self.compute_client.get_flavor_access.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(tuple(cmp_data), data)
@@ -265,19 +265,19 @@ class TestFlavorCreate(TestFlavor):
         # convert expected data tuple to list to be able to modify it
         cmp_data = list(self.data_private)
         cmp_data[7] = format_columns.DictColumn(props)
-        self.compute_sdk_client.create_flavor.return_value = create_flavor
-        self.compute_sdk_client.create_flavor_extra_specs.return_value = (
+        self.compute_client.create_flavor.return_value = create_flavor
+        self.compute_client.create_flavor_extra_specs.return_value = (
             expected_flavor
         )
 
         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.compute_client.create_flavor.assert_called_once_with(**args)
+        self.compute_client.flavor_add_tenant_access.assert_called_with(
             self.flavor.id,
             self.project.id,
         )
-        self.compute_sdk_client.create_flavor_extra_specs.assert_called_with(
+        self.compute_client.create_flavor_extra_specs.assert_called_with(
             create_flavor, props
         )
         self.assertEqual(self.columns, columns)
@@ -362,7 +362,7 @@ class TestFlavorCreate(TestFlavor):
             'description': 'fake description',
         }
 
-        self.compute_sdk_client.create_flavor.assert_called_once_with(**args)
+        self.compute_client.create_flavor.assert_called_once_with(**args)
 
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data_private, data)
@@ -400,7 +400,7 @@ class TestFlavorDelete(TestFlavor):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.delete_flavor.return_value = None
+        self.compute_client.delete_flavor.return_value = None
 
         self.cmd = flavor.DeleteFlavor(self.app, None)
 
@@ -411,14 +411,14 @@ class TestFlavorDelete(TestFlavor):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.compute_sdk_client.find_flavor.return_value = self.flavors[0]
+        self.compute_client.find_flavor.return_value = self.flavors[0]
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_flavor.assert_called_with(
+        self.compute_client.find_flavor.assert_called_with(
             self.flavors[0].id, ignore_missing=False
         )
-        self.compute_sdk_client.delete_flavor.assert_called_with(
+        self.compute_client.delete_flavor.assert_called_with(
             self.flavors[0].id
         )
         self.assertIsNone(result)
@@ -433,7 +433,7 @@ class TestFlavorDelete(TestFlavor):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.compute_sdk_client.find_flavor.side_effect = self.flavors
+        self.compute_client.find_flavor.side_effect = self.flavors
 
         result = self.cmd.take_action(parsed_args)
 
@@ -441,8 +441,8 @@ class TestFlavorDelete(TestFlavor):
             mock.call(i.id, ignore_missing=False) for i in self.flavors
         ]
         delete_calls = [mock.call(i.id) for i in self.flavors]
-        self.compute_sdk_client.find_flavor.assert_has_calls(find_calls)
-        self.compute_sdk_client.delete_flavor.assert_has_calls(delete_calls)
+        self.compute_client.find_flavor.assert_has_calls(find_calls)
+        self.compute_client.delete_flavor.assert_has_calls(delete_calls)
         self.assertIsNone(result)
 
     def test_multi_flavors_delete_with_exception(self):
@@ -453,7 +453,7 @@ class TestFlavorDelete(TestFlavor):
         verifylist = [('flavor', [self.flavors[0].id, 'unexist_flavor'])]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.compute_sdk_client.find_flavor.side_effect = [
+        self.compute_client.find_flavor.side_effect = [
             self.flavors[0],
             sdk_exceptions.ResourceNotFound,
         ]
@@ -469,8 +469,8 @@ class TestFlavorDelete(TestFlavor):
             mock.call('unexist_flavor', ignore_missing=False),
         ]
         delete_calls = [mock.call(self.flavors[0].id)]
-        self.compute_sdk_client.find_flavor.assert_has_calls(find_calls)
-        self.compute_sdk_client.delete_flavor.assert_has_calls(delete_calls)
+        self.compute_client.find_flavor.assert_has_calls(find_calls)
+        self.compute_client.delete_flavor.assert_has_calls(delete_calls)
 
 
 class TestFlavorList(TestFlavor):
@@ -516,7 +516,7 @@ class TestFlavorList(TestFlavor):
             [],
         ]
 
-        self.compute_sdk_client.flavors = self.api_mock
+        self.compute_client.flavors = self.api_mock
 
         # Get the command object to test
         self.cmd = flavor.ListFlavor(self.app, None)
@@ -541,8 +541,8 @@ class TestFlavorList(TestFlavor):
             'is_public': True,
         }
 
-        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
-        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_client.flavors.assert_called_with(**kwargs)
+        self.compute_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -567,8 +567,8 @@ class TestFlavorList(TestFlavor):
             'is_public': None,
         }
 
-        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
-        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_client.flavors.assert_called_with(**kwargs)
+        self.compute_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -593,8 +593,8 @@ class TestFlavorList(TestFlavor):
             'is_public': False,
         }
 
-        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
-        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_client.flavors.assert_called_with(**kwargs)
+        self.compute_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -619,8 +619,8 @@ class TestFlavorList(TestFlavor):
             'is_public': True,
         }
 
-        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
-        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_client.flavors.assert_called_with(**kwargs)
+        self.compute_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -645,8 +645,8 @@ class TestFlavorList(TestFlavor):
             'is_public': True,
         }
 
-        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
-        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_client.flavors.assert_called_with(**kwargs)
+        self.compute_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns_long, columns)
         self.assertCountEqual(self.data_long, tuple(data))
@@ -678,8 +678,8 @@ class TestFlavorList(TestFlavor):
             [],
         ]
 
-        self.compute_sdk_client.flavors = self.api_mock
-        self.compute_sdk_client.fetch_flavor_extra_specs = mock.Mock(
+        self.compute_client.flavors = self.api_mock
+        self.compute_client.fetch_flavor_extra_specs = mock.Mock(
             return_value=None
         )
 
@@ -702,8 +702,8 @@ class TestFlavorList(TestFlavor):
             'is_public': True,
         }
 
-        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
-        self.compute_sdk_client.fetch_flavor_extra_specs.assert_called_once_with(
+        self.compute_client.flavors.assert_called_with(**kwargs)
+        self.compute_client.fetch_flavor_extra_specs.assert_called_once_with(
             flavor
         )
 
@@ -736,15 +736,15 @@ class TestFlavorList(TestFlavor):
             'min_ram': 2048,
         }
 
-        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
-        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_client.flavors.assert_called_with(**kwargs)
+        self.compute_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(tuple(self.data), tuple(data))
 
 
 class TestFlavorSet(TestFlavor):
-    # Return value of self.compute_sdk_client.find_flavor().
+    # Return value of self.compute_client.find_flavor().
     flavor = compute_fakes.create_one_flavor(
         attrs={'os-flavor-access:is_public': False}
     )
@@ -753,7 +753,7 @@ class TestFlavorSet(TestFlavor):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_flavor.return_value = self.flavor
+        self.compute_client.find_flavor.return_value = self.flavor
         # Return a project
         self.projects_mock.get.return_value = self.project
         self.cmd = flavor.SetFlavor(self.app, None)
@@ -767,10 +767,10 @@ class TestFlavorSet(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_flavor.assert_called_with(
+        self.compute_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
-        self.compute_sdk_client.create_flavor_extra_specs.assert_called_with(
+        self.compute_client.create_flavor_extra_specs.assert_called_with(
             self.flavor.id, {'FOO': '"B A R"'}
         )
         self.assertIsNone(result)
@@ -781,10 +781,10 @@ class TestFlavorSet(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_flavor.assert_called_with(
+        self.compute_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
-        self.compute_sdk_client.delete_flavor_extra_specs_property.assert_called_with(
+        self.compute_client.delete_flavor_extra_specs_property.assert_called_with(
             self.flavor.id, 'property'
         )
         self.assertIsNone(result)
@@ -803,14 +803,14 @@ class TestFlavorSet(TestFlavor):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_flavor.assert_called_with(
+        self.compute_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
-        self.compute_sdk_client.flavor_add_tenant_access.assert_called_with(
+        self.compute_client.flavor_add_tenant_access.assert_called_with(
             self.flavor.id,
             self.project.id,
         )
-        self.compute_sdk_client.create_flavor_extra_specs.assert_not_called()
+        self.compute_client.create_flavor_extra_specs.assert_not_called()
         self.assertIsNone(result)
 
     def test_flavor_set_no_project(self):
@@ -847,7 +847,7 @@ class TestFlavorSet(TestFlavor):
         )
 
     def test_flavor_set_with_unexist_flavor(self):
-        self.compute_sdk_client.find_flavor.side_effect = [
+        self.compute_client.find_flavor.side_effect = [
             sdk_exceptions.ResourceNotFound()
         ]
 
@@ -876,10 +876,10 @@ class TestFlavorSet(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_flavor.assert_called_with(
+        self.compute_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
-        self.compute_sdk_client.flavor_add_tenant_access.assert_not_called()
+        self.compute_client.flavor_add_tenant_access.assert_not_called()
         self.assertIsNone(result)
 
     def test_flavor_set_description(self):
@@ -897,7 +897,7 @@ class TestFlavorSet(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.update_flavor.assert_called_with(
+        self.compute_client.update_flavor.assert_called_with(
             flavor=self.flavor.id, description='description'
         )
         self.assertIsNone(result)
@@ -935,7 +935,7 @@ class TestFlavorSet(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.update_flavor.assert_called_with(
+        self.compute_client.update_flavor.assert_called_with(
             flavor=self.flavor.id, description='description'
         )
         self.assertIsNone(result)
@@ -960,7 +960,7 @@ class TestFlavorSet(TestFlavor):
 
 
 class TestFlavorShow(TestFlavor):
-    # Return value of self.compute_sdk_client.find_flavor().
+    # Return value of self.compute_client.find_flavor().
     flavor_access = compute_fakes.create_one_flavor_access()
     flavor = compute_fakes.create_one_flavor()
 
@@ -1000,8 +1000,8 @@ class TestFlavorShow(TestFlavor):
         super().setUp()
 
         # Return value of _find_resource()
-        self.compute_sdk_client.find_flavor.return_value = self.flavor
-        self.compute_sdk_client.get_flavor_access.return_value = [
+        self.compute_client.find_flavor.return_value = self.flavor
+        self.compute_client.get_flavor_access.return_value = [
             self.flavor_access
         ]
         self.cmd = flavor.ShowFlavor(self.app, None)
@@ -1040,7 +1040,7 @@ class TestFlavorShow(TestFlavor):
                 'os-flavor-access:is_public': False,
             }
         )
-        self.compute_sdk_client.find_flavor.return_value = private_flavor
+        self.compute_client.find_flavor.return_value = private_flavor
 
         arglist = [
             private_flavor.name,
@@ -1069,7 +1069,7 @@ class TestFlavorShow(TestFlavor):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.get_flavor_access.assert_called_with(
+        self.compute_client.get_flavor_access.assert_called_with(
             flavor=private_flavor.id
         )
         self.assertEqual(self.columns, columns)
@@ -1077,7 +1077,7 @@ class TestFlavorShow(TestFlavor):
 
 
 class TestFlavorUnset(TestFlavor):
-    # Return value of self.compute_sdk_client.find_flavor().
+    # Return value of self.compute_client.find_flavor().
     flavor = compute_fakes.create_one_flavor(
         attrs={'os-flavor-access:is_public': False}
     )
@@ -1086,13 +1086,13 @@ class TestFlavorUnset(TestFlavor):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_flavor.return_value = self.flavor
+        self.compute_client.find_flavor.return_value = self.flavor
         # Return a project
         self.projects_mock.get.return_value = self.project
         self.cmd = flavor.UnsetFlavor(self.app, None)
 
         self.mock_shortcut = (
-            self.compute_sdk_client.delete_flavor_extra_specs_property
+            self.compute_client.delete_flavor_extra_specs_property
         )
 
     def test_flavor_unset_property(self):
@@ -1104,11 +1104,11 @@ class TestFlavorUnset(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_flavor.assert_called_with(
+        self.compute_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
         self.mock_shortcut.assert_called_with(self.flavor.id, 'property')
-        self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called()
+        self.compute_client.flavor_remove_tenant_access.assert_not_called()
         self.assertIsNone(result)
 
     def test_flavor_unset_properties(self):
@@ -1126,7 +1126,7 @@ class TestFlavorUnset(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_flavor.assert_called_with(
+        self.compute_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
         calls = [
@@ -1141,7 +1141,7 @@ class TestFlavorUnset(TestFlavor):
             AssertionError, self.mock_shortcut.assert_has_calls, calls
         )
 
-        self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called()
+        self.compute_client.flavor_remove_tenant_access.assert_not_called()
 
     def test_flavor_unset_project(self):
         arglist = [
@@ -1158,14 +1158,14 @@ class TestFlavorUnset(TestFlavor):
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
 
-        self.compute_sdk_client.find_flavor.assert_called_with(
+        self.compute_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
-        self.compute_sdk_client.flavor_remove_tenant_access.assert_called_with(
+        self.compute_client.flavor_remove_tenant_access.assert_called_with(
             self.flavor.id,
             self.project.id,
         )
-        self.compute_sdk_client.delete_flavor_extra_specs_property.assert_not_called()
+        self.compute_client.delete_flavor_extra_specs_property.assert_not_called()
         self.assertIsNone(result)
 
     def test_flavor_unset_no_project(self):
@@ -1202,7 +1202,7 @@ class TestFlavorUnset(TestFlavor):
         )
 
     def test_flavor_unset_with_unexist_flavor(self):
-        self.compute_sdk_client.find_flavor.side_effect = [
+        self.compute_client.find_flavor.side_effect = [
             sdk_exceptions.ResourceNotFound
         ]
 
@@ -1232,4 +1232,4 @@ class TestFlavorUnset(TestFlavor):
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
 
-        self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called()
+        self.compute_client.flavor_remove_tenant_access.assert_not_called()

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

@@ -72,7 +72,7 @@ class TestHostList(compute_fakes.TestComputev2):
             )
         ]
 
-        self.compute_sdk_client.get.return_value = fakes.FakeResponse(
+        self.compute_client.get.return_value = fakes.FakeResponse(
             data={'hosts': [self._host]}
         )
         self.cmd = host.ListHost(self.app, None)
@@ -85,7 +85,7 @@ class TestHostList(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.get.assert_called_with(
+        self.compute_client.get.assert_called_with(
             '/os-hosts', microversion='2.1'
         )
         self.assertEqual(self.columns, columns)
@@ -104,7 +104,7 @@ class TestHostList(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.get.assert_called_with(
+        self.compute_client.get.assert_called_with(
             '/os-hosts', microversion='2.1'
         )
         self.assertEqual(self.columns, columns)
@@ -116,7 +116,7 @@ class TestHostSet(compute_fakes.TestComputev2):
         super().setUp()
 
         self._host = _generate_fake_host()
-        self.compute_sdk_client.put.return_value = fakes.FakeResponse()
+        self.compute_client.put.return_value = fakes.FakeResponse()
 
         self.cmd = host.SetHost(self.app, None)
 
@@ -132,7 +132,7 @@ class TestHostSet(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
-        self.compute_sdk_client.put.assert_not_called()
+        self.compute_client.put.assert_not_called()
 
     def test_host_set(self):
         arglist = [
@@ -150,7 +150,7 @@ class TestHostSet(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
-        self.compute_sdk_client.put.assert_called_with(
+        self.compute_client.put.assert_called_with(
             f'/os-hosts/{self._host["host"]}',
             json={
                 'maintenance_mode': 'disable',
@@ -183,7 +183,7 @@ class TestHostShow(compute_fakes.TestComputev2):
             )
         ]
 
-        self.compute_sdk_client.get.return_value = fakes.FakeResponse(
+        self.compute_client.get.return_value = fakes.FakeResponse(
             data={
                 'host': [
                     {
@@ -226,7 +226,7 @@ class TestHostShow(compute_fakes.TestComputev2):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.get.assert_called_with(
+        self.compute_client.get.assert_called_with(
             '/os-hosts/' + self._host['host_name'], microversion='2.1'
         )
         self.assertEqual(self.columns, columns)