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

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

@@ -66,10 +66,8 @@ class TestAggregateAddHost(TestAggregate):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
-        self.compute_sdk_client.add_host_to_aggregate.return_value = (
-            self.fake_ag
-        )
+        self.compute_client.find_aggregate.return_value = self.fake_ag
+        self.compute_client.add_host_to_aggregate.return_value = self.fake_ag
         self.cmd = aggregate.AddAggregateHost(self.app, None)
 
     def test_aggregate_add_host(self):
@@ -83,10 +81,10 @@ class TestAggregateAddHost(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
-        self.compute_sdk_client.add_host_to_aggregate.assert_called_once_with(
+        self.compute_client.add_host_to_aggregate.assert_called_once_with(
             self.fake_ag.id, parsed_args.host
         )
         self.assertEqual(self.columns, columns)
@@ -97,10 +95,8 @@ class TestAggregateCreate(TestAggregate):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.create_aggregate.return_value = self.fake_ag
-        self.compute_sdk_client.set_aggregate_metadata.return_value = (
-            self.fake_ag
-        )
+        self.compute_client.create_aggregate.return_value = self.fake_ag
+        self.compute_client.set_aggregate_metadata.return_value = self.fake_ag
         self.cmd = aggregate.CreateAggregate(self.app, None)
 
     def test_aggregate_create(self):
@@ -112,7 +108,7 @@ class TestAggregateCreate(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_aggregate.assert_called_once_with(
+        self.compute_client.create_aggregate.assert_called_once_with(
             name=parsed_args.name
         )
         self.assertEqual(self.columns, columns)
@@ -131,7 +127,7 @@ class TestAggregateCreate(TestAggregate):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_aggregate.assert_called_once_with(
+        self.compute_client.create_aggregate.assert_called_once_with(
             name=parsed_args.name, availability_zone=parsed_args.zone
         )
         self.assertEqual(self.columns, columns)
@@ -151,10 +147,10 @@ class TestAggregateCreate(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_aggregate.assert_called_once_with(
+        self.compute_client.create_aggregate.assert_called_once_with(
             name=parsed_args.name
         )
-        self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
+        self.compute_client.set_aggregate_metadata.assert_called_once_with(
             self.fake_ag.id, parsed_args.properties
         )
         self.assertEqual(self.columns, columns)
@@ -169,7 +165,7 @@ class TestAggregateDelete(TestAggregate):
             sdk_fakes.generate_fake_resources(_aggregate.Aggregate, 2)
         )
 
-        self.compute_sdk_client.find_aggregate = mock.Mock(
+        self.compute_client.find_aggregate = mock.Mock(
             side_effect=[self.fake_ags[0], self.fake_ags[1]]
         )
         self.cmd = aggregate.DeleteAggregate(self.app, None)
@@ -181,10 +177,10 @@ class TestAggregateDelete(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             self.fake_ags[0].id, ignore_missing=False
         )
-        self.compute_sdk_client.delete_aggregate.assert_called_once_with(
+        self.compute_client.delete_aggregate.assert_called_once_with(
             self.fake_ags[0].id, ignore_missing=False
         )
 
@@ -202,8 +198,8 @@ class TestAggregateDelete(TestAggregate):
         calls = []
         for a in self.fake_ags:
             calls.append(call(a.id, ignore_missing=False))
-        self.compute_sdk_client.find_aggregate.assert_has_calls(calls)
-        self.compute_sdk_client.delete_aggregate.assert_has_calls(calls)
+        self.compute_client.find_aggregate.assert_has_calls(calls)
+        self.compute_client.delete_aggregate.assert_has_calls(calls)
 
     def test_delete_multiple_agggregates_with_exception(self):
         arglist = [
@@ -216,7 +212,7 @@ class TestAggregateDelete(TestAggregate):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.compute_sdk_client.find_aggregate.side_effect = [
+        self.compute_client.find_aggregate.side_effect = [
             self.fake_ags[0],
             sdk_exceptions.NotFoundException,
         ]
@@ -229,8 +225,8 @@ class TestAggregateDelete(TestAggregate):
         calls = []
         for a in arglist:
             calls.append(call(a, ignore_missing=False))
-        self.compute_sdk_client.find_aggregate.assert_has_calls(calls)
-        self.compute_sdk_client.delete_aggregate.assert_called_with(
+        self.compute_client.find_aggregate.assert_has_calls(calls)
+        self.compute_client.delete_aggregate.assert_called_with(
             self.fake_ags[0].id, ignore_missing=False
         )
 
@@ -239,7 +235,7 @@ class TestAggregateList(TestAggregate):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.aggregates.return_value = [self.fake_ag]
+        self.compute_client.aggregates.return_value = [self.fake_ag]
         self.cmd = aggregate.ListAggregate(self.app, None)
 
     def test_aggregate_list(self):
@@ -333,8 +329,8 @@ class TestAggregateRemoveHost(TestAggregate):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
-        self.compute_sdk_client.remove_host_from_aggregate.return_value = (
+        self.compute_client.find_aggregate.return_value = self.fake_ag
+        self.compute_client.remove_host_from_aggregate.return_value = (
             self.fake_ag
         )
         self.cmd = aggregate.RemoveAggregateHost(self.app, None)
@@ -350,10 +346,10 @@ class TestAggregateRemoveHost(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
-        self.compute_sdk_client.remove_host_from_aggregate.assert_called_once_with(
+        self.compute_client.remove_host_from_aggregate.assert_called_once_with(
             self.fake_ag.id, parsed_args.host
         )
         self.assertEqual(self.columns, columns)
@@ -364,7 +360,7 @@ class TestAggregateSet(TestAggregate):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
+        self.compute_client.find_aggregate.return_value = self.fake_ag
         self.cmd = aggregate.SetAggregate(self.app, None)
 
     def test_aggregate_set_no_option(self):
@@ -377,11 +373,11 @@ class TestAggregateSet(TestAggregate):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
-        self.assertNotCalled(self.compute_sdk_client.update_aggregate)
-        self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata)
+        self.assertNotCalled(self.compute_client.update_aggregate)
+        self.assertNotCalled(self.compute_client.set_aggregate_metadata)
         self.assertIsNone(result)
 
     def test_aggregate_set_with_name(self):
@@ -397,13 +393,13 @@ class TestAggregateSet(TestAggregate):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
-        self.compute_sdk_client.update_aggregate.assert_called_once_with(
+        self.compute_client.update_aggregate.assert_called_once_with(
             self.fake_ag.id, name=parsed_args.name
         )
-        self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata)
+        self.assertNotCalled(self.compute_client.set_aggregate_metadata)
         self.assertIsNone(result)
 
     def test_aggregate_set_with_zone(self):
@@ -419,13 +415,13 @@ class TestAggregateSet(TestAggregate):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
-        self.compute_sdk_client.update_aggregate.assert_called_once_with(
+        self.compute_client.update_aggregate.assert_called_once_with(
             self.fake_ag.id, availability_zone=parsed_args.zone
         )
-        self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata)
+        self.assertNotCalled(self.compute_client.set_aggregate_metadata)
         self.assertIsNone(result)
 
     def test_aggregate_set_with_property(self):
@@ -443,11 +439,11 @@ class TestAggregateSet(TestAggregate):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
-        self.assertNotCalled(self.compute_sdk_client.update_aggregate)
-        self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
+        self.assertNotCalled(self.compute_client.update_aggregate)
+        self.compute_client.set_aggregate_metadata.assert_called_once_with(
             self.fake_ag.id, parsed_args.properties
         )
         self.assertIsNone(result)
@@ -466,11 +462,11 @@ class TestAggregateSet(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
-        self.assertNotCalled(self.compute_sdk_client.update_aggregate)
-        self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
+        self.assertNotCalled(self.compute_client.update_aggregate)
+        self.compute_client.set_aggregate_metadata.assert_called_once_with(
             self.fake_ag.id, {'key1': None, 'key2': 'value2'}
         )
         self.assertIsNone(result)
@@ -486,11 +482,11 @@ class TestAggregateSet(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
-        self.assertNotCalled(self.compute_sdk_client.update_aggregate)
-        self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
+        self.assertNotCalled(self.compute_client.update_aggregate)
+        self.compute_client.set_aggregate_metadata.assert_called_once_with(
             self.fake_ag.id, {'key1': None}
         )
         self.assertIsNone(result)
@@ -509,13 +505,13 @@ class TestAggregateSet(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
-        self.compute_sdk_client.update_aggregate.assert_called_once_with(
+        self.compute_client.update_aggregate.assert_called_once_with(
             self.fake_ag.id, availability_zone=parsed_args.zone
         )
-        self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
+        self.compute_client.set_aggregate_metadata.assert_called_once_with(
             self.fake_ag.id, {'key1': None}
         )
         self.assertIsNone(result)
@@ -538,7 +534,7 @@ class TestAggregateShow(TestAggregate):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
+        self.compute_client.find_aggregate.return_value = self.fake_ag
         self.cmd = aggregate.ShowAggregate(self.app, None)
 
         self.data = (
@@ -563,7 +559,7 @@ class TestAggregateShow(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
 
@@ -575,7 +571,7 @@ class TestAggregateUnset(TestAggregate):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
+        self.compute_client.find_aggregate.return_value = self.fake_ag
         self.cmd = aggregate.UnsetAggregate(self.app, None)
 
     def test_aggregate_unset(self):
@@ -591,7 +587,7 @@ class TestAggregateUnset(TestAggregate):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
+        self.compute_client.set_aggregate_metadata.assert_called_once_with(
             self.fake_ag.id, {'unset_key': None}
         )
         self.assertIsNone(result)
@@ -611,7 +607,7 @@ class TestAggregateUnset(TestAggregate):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
+        self.compute_client.set_aggregate_metadata.assert_called_once_with(
             self.fake_ag.id, {'unset_key1': None, 'unset_key2': None}
         )
         self.assertIsNone(result)
@@ -626,7 +622,7 @@ class TestAggregateUnset(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata)
+        self.assertNotCalled(self.compute_client.set_aggregate_metadata)
         self.assertIsNone(result)
 
 
@@ -636,7 +632,7 @@ class TestAggregateCacheImage(TestAggregate):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
+        self.compute_client.find_aggregate.return_value = self.fake_ag
         self.find_image_mock = mock.Mock(side_effect=self.images)
         self.app.client_manager.sdk_connection.image.find_image = (
             self.find_image_mock
@@ -667,10 +663,10 @@ class TestAggregateCacheImage(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
-        self.compute_sdk_client.aggregate_precache_images.assert_called_once_with(
+        self.compute_client.aggregate_precache_images.assert_called_once_with(
             self.fake_ag.id, [self.images[0].id]
         )
 
@@ -688,9 +684,9 @@ class TestAggregateCacheImage(TestAggregate):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_aggregate.assert_called_once_with(
+        self.compute_client.find_aggregate.assert_called_once_with(
             parsed_args.aggregate, ignore_missing=False
         )
-        self.compute_sdk_client.aggregate_precache_images.assert_called_once_with(
+        self.compute_client.aggregate_precache_images.assert_called_once_with(
             self.fake_ag.id, [self.images[0].id, self.images[1].id]
         )

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

@@ -28,7 +28,7 @@ class TestConsoleLog(compute_fakes.TestComputev2):
         super().setUp()
 
         self._server = sdk_fakes.generate_fake_resource(_server.Server)
-        self.compute_sdk_client.find_server.return_value = self._server
+        self.compute_client.find_server.return_value = self._server
 
         self.cmd = console.ShowConsoleLog(self.app, None)
 
@@ -49,13 +49,13 @@ class TestConsoleLog(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         output = {'output': '1st line\n2nd line\n'}
-        self.compute_sdk_client.get_server_console_output.return_value = output
+        self.compute_client.get_server_console_output.return_value = output
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             name_or_id='fake_server', ignore_missing=False
         )
-        self.compute_sdk_client.get_server_console_output.assert_called_with(
+        self.compute_client.get_server_console_output.assert_called_with(
             self._server.id, length=None
         )
         stdout = self.app.stdout.content
@@ -67,13 +67,13 @@ class TestConsoleLog(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         output = {'output': '1st line\n2nd line'}
-        self.compute_sdk_client.get_server_console_output.return_value = output
+        self.compute_client.get_server_console_output.return_value = output
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             name_or_id='fake_server', ignore_missing=False
         )
-        self.compute_sdk_client.get_server_console_output.assert_called_with(
+        self.compute_client.get_server_console_output.assert_called_with(
             self._server.id, length=15
         )
 
@@ -83,14 +83,14 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2):
         super().setUp()
 
         self._server = sdk_fakes.generate_fake_resource(_server.Server)
-        self.compute_sdk_client.find_server.return_value = self._server
+        self.compute_client.find_server.return_value = self._server
 
         fake_console_data = {
             'url': 'http://localhost',
             'protocol': 'fake_protocol',
             'type': 'fake_type',
         }
-        self.compute_sdk_client.create_console = mock.Mock(
+        self.compute_client.create_console = mock.Mock(
             return_value=fake_console_data
         )
 
@@ -117,7 +117,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_console.assert_called_once_with(
+        self.compute_client.create_console.assert_called_once_with(
             self._server.id, console_type='novnc'
         )
         self.assertEqual(self.columns, columns)
@@ -134,7 +134,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_console.assert_called_once_with(
+        self.compute_client.create_console.assert_called_once_with(
             self._server.id, console_type='novnc'
         )
         self.assertEqual(self.columns, columns)
@@ -151,7 +151,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_console.assert_called_once_with(
+        self.compute_client.create_console.assert_called_once_with(
             self._server.id, console_type='xvpvnc'
         )
         self.assertEqual(self.columns, columns)
@@ -168,7 +168,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_console.assert_called_once_with(
+        self.compute_client.create_console.assert_called_once_with(
             self._server.id, console_type='spice-html5'
         )
         self.assertEqual(self.columns, columns)
@@ -185,7 +185,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_console.assert_called_once_with(
+        self.compute_client.create_console.assert_called_once_with(
             self._server.id, console_type='rdp-html5'
         )
         self.assertEqual(self.columns, columns)
@@ -202,7 +202,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_console.assert_called_once_with(
+        self.compute_client.create_console.assert_called_once_with(
             self._server.id, console_type='serial'
         )
         self.assertEqual(self.columns, columns)
@@ -219,7 +219,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_console.assert_called_once_with(
+        self.compute_client.create_console.assert_called_once_with(
             self._server.id, console_type='webmks'
         )
         self.assertEqual(self.columns, columns)