python-openstackclient 6.3.0__py3-none-any.whl → 6.5.0__py3-none-any.whl

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

@@ -25,23 +25,13 @@ from openstackclient.compute.v2 import hypervisor
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestHypervisor(compute_fakes.TestComputev2):
-    def setUp(self):
-        super().setUp()
-
-        # Create and get a shortcut to the compute client mock
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-        self.sdk_client.reset_mock()
-
-
-class TestHypervisorList(TestHypervisor):
+class TestHypervisorList(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
         # Fake hypervisors to be listed up
         self.hypervisors = compute_fakes.create_hypervisors()
-        self.sdk_client.hypervisors.return_value = self.hypervisors
+        self.compute_sdk_client.hypervisors.return_value = self.hypervisors
 
         self.columns = (
             "ID",
@@ -115,7 +105,7 @@ class TestHypervisorList(TestHypervisor):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.hypervisors.assert_called_with(details=True)
+        self.compute_sdk_client.hypervisors.assert_called_with(details=True)
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
 
@@ -130,7 +120,9 @@ class TestHypervisorList(TestHypervisor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         # Fake the return value of search()
-        self.sdk_client.hypervisors.return_value = [self.hypervisors[0]]
+        self.compute_sdk_client.hypervisors.return_value = [
+            self.hypervisors[0]
+        ]
 
         self.data = (
             (
@@ -147,7 +139,7 @@ class TestHypervisorList(TestHypervisor):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.hypervisors.assert_called_with(
+        self.compute_sdk_client.hypervisors.assert_called_with(
             hypervisor_hostname_pattern=self.hypervisors[0].name, details=True
         )
         self.assertEqual(self.columns, columns)
@@ -164,7 +156,9 @@ class TestHypervisorList(TestHypervisor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         # Fake exception raised from search()
-        self.sdk_client.hypervisors.side_effect = exceptions.NotFound(None)
+        self.compute_sdk_client.hypervisors.side_effect = exceptions.NotFound(
+            None
+        )
 
         self.assertRaises(
             exceptions.NotFound, self.cmd.take_action, parsed_args
@@ -212,7 +206,7 @@ class TestHypervisorList(TestHypervisor):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.hypervisors.assert_called_with(details=True)
+        self.compute_sdk_client.hypervisors.assert_called_with(details=True)
         self.assertEqual(self.columns_long, columns)
         self.assertEqual(self.data_long, tuple(data))
 
@@ -229,7 +223,9 @@ class TestHypervisorList(TestHypervisor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.hypervisors.assert_called_with(limit=1, details=True)
+        self.compute_sdk_client.hypervisors.assert_called_with(
+            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):
@@ -263,7 +259,7 @@ class TestHypervisorList(TestHypervisor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.hypervisors.assert_called_with(
+        self.compute_sdk_client.hypervisors.assert_called_with(
             marker='test_hyp', details=True
         )
 
@@ -287,7 +283,7 @@ class TestHypervisorList(TestHypervisor):
         )
 
 
-class TestHypervisorShow(TestHypervisor):
+class TestHypervisorShow(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
@@ -304,10 +300,10 @@ class TestHypervisorShow(TestHypervisor):
         )
 
         # Return value of compute_client.find_hypervisor
-        self.sdk_client.find_hypervisor.return_value = self.hypervisor
+        self.compute_sdk_client.find_hypervisor.return_value = self.hypervisor
 
         # Return value of compute_client.aggregates()
-        self.sdk_client.aggregates.return_value = []
+        self.compute_sdk_client.aggregates.return_value = []
 
         # Return value of compute_client.get_hypervisor_uptime()
         uptime_info = {
@@ -317,7 +313,9 @@ class TestHypervisorShow(TestHypervisor):
             'hypervisor_hostname': self.hypervisor.name,
             'uptime': uptime_string,
         }
-        self.sdk_client.get_hypervisor_uptime.return_value = uptime_info
+        self.compute_sdk_client.get_hypervisor_uptime.return_value = (
+            uptime_info
+        )
 
         self.columns_v288 = (
             'aggregates',
@@ -458,7 +456,7 @@ class TestHypervisorShow(TestHypervisor):
         # before microversion 2.28, nova returned a stringified version of this
         # field
         self.hypervisor.cpu_info = json.dumps(self.hypervisor.cpu_info)
-        self.sdk_client.find_hypervisor.return_value = self.hypervisor
+        self.compute_sdk_client.find_hypervisor.return_value = self.hypervisor
 
         arglist = [
             self.hypervisor.name,
@@ -488,7 +486,7 @@ class TestHypervisorShow(TestHypervisor):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.sdk_client.get_hypervisor_uptime.side_effect = (
+        self.compute_sdk_client.get_hypervisor_uptime.side_effect = (
             nova_exceptions.HTTPNotImplemented(501)
         )
 

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

@@ -23,11 +23,7 @@ class TestHypervisorStats(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestHypervisorStats, self).setUp()
 
-        # Get a shortcut to the compute client hypervisors mock
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-        self.sdk_client.get = mock.Mock()
+        self.compute_sdk_client.get = mock.Mock()
 
 
 # Not in fakes.py because hypervisor stats has been deprecated
@@ -71,7 +67,7 @@ class TestHypervisorStatsShow(TestHypervisorStats):
     def setUp(self):
         super(TestHypervisorStatsShow, self).setUp()
 
-        self.sdk_client.get.return_value = fakes.FakeResponse(
+        self.compute_sdk_client.get.return_value = fakes.FakeResponse(
             data={'hypervisor_statistics': self._stats}
         )
 

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

@@ -11,14 +11,12 @@
 #   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 copy
 from unittest import mock
 from unittest.mock import call
 import uuid
 
-from novaclient import api_versions
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 
@@ -42,14 +40,6 @@ class TestKeypair(compute_fakes.TestComputev2):
             loaded=True,
         )
 
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-        self.sdk_client.keypairs = mock.Mock()
-        self.sdk_client.create_keypair = mock.Mock()
-        self.sdk_client.delete_keypair = mock.Mock()
-        self.sdk_client.find_keypair = mock.Mock()
-
 
 class TestKeypairCreate(TestKeypair):
     def setUp(self):
@@ -79,7 +69,7 @@ class TestKeypairCreate(TestKeypair):
         # Get the command object to test
         self.cmd = keypair.CreateKeypair(self.app, None)
 
-        self.sdk_client.create_keypair.return_value = self.keypair
+        self.compute_sdk_client.create_keypair.return_value = self.keypair
 
     @mock.patch.object(
         keypair,
@@ -97,7 +87,7 @@ class TestKeypairCreate(TestKeypair):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_keypair.assert_called_with(
+        self.compute_sdk_client.create_keypair.assert_called_with(
             name=self.keypair.name,
             public_key=mock_generate.return_value.public_key,
         )
@@ -135,7 +125,7 @@ class TestKeypairCreate(TestKeypair):
 
             columns, data = self.cmd.take_action(parsed_args)
 
-            self.sdk_client.create_keypair.assert_called_with(
+            self.compute_sdk_client.create_keypair.assert_called_with(
                 name=self.keypair.name,
                 public_key=self.keypair.public_key,
             )
@@ -168,7 +158,7 @@ class TestKeypairCreate(TestKeypair):
 
             columns, data = self.cmd.take_action(parsed_args)
 
-            self.sdk_client.create_keypair.assert_called_with(
+            self.compute_sdk_client.create_keypair.assert_called_with(
                 name=self.keypair.name,
                 public_key=mock_generate.return_value.public_key,
             )
@@ -184,7 +174,7 @@ class TestKeypairCreate(TestKeypair):
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
     def test_keypair_create_with_key_type(self, sm_mock):
         for key_type in ['x509', 'ssh']:
-            self.sdk_client.create_keypair.return_value = self.keypair
+            self.compute_sdk_client.create_keypair.return_value = self.keypair
 
             self.data = (
                 self.keypair.created_at,
@@ -215,7 +205,7 @@ class TestKeypairCreate(TestKeypair):
                 m_file.read.return_value = 'dummy'
                 columns, data = self.cmd.take_action(parsed_args)
 
-            self.sdk_client.create_keypair.assert_called_with(
+            self.compute_sdk_client.create_keypair.assert_called_with(
                 name=self.keypair.name,
                 public_key=self.keypair.public_key,
                 key_type=key_type,
@@ -274,7 +264,7 @@ class TestKeypairCreate(TestKeypair):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_keypair.assert_called_with(
+        self.compute_sdk_client.create_keypair.assert_called_with(
             name=self.keypair.name,
             user_id=identity_fakes.user_id,
             public_key=mock_generate.return_value.public_key,
@@ -323,7 +313,7 @@ class TestKeypairDelete(TestKeypair):
         ret = self.cmd.take_action(parsed_args)
 
         self.assertIsNone(ret)
-        self.sdk_client.delete_keypair.assert_called_with(
+        self.compute_sdk_client.delete_keypair.assert_called_with(
             self.keypairs[0].name, ignore_missing=False
         )
 
@@ -341,7 +331,7 @@ class TestKeypairDelete(TestKeypair):
         calls = []
         for k in self.keypairs:
             calls.append(call(k.name, ignore_missing=False))
-        self.sdk_client.delete_keypair.assert_has_calls(calls)
+        self.compute_sdk_client.delete_keypair.assert_has_calls(calls)
         self.assertIsNone(result)
 
     def test_delete_multiple_keypairs_with_exception(self):
@@ -355,7 +345,7 @@ class TestKeypairDelete(TestKeypair):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.sdk_client.delete_keypair.side_effect = [
+        self.compute_sdk_client.delete_keypair.side_effect = [
             None,
             exceptions.CommandError,
         ]
@@ -368,7 +358,7 @@ class TestKeypairDelete(TestKeypair):
         calls = []
         for k in arglist:
             calls.append(call(k, ignore_missing=False))
-        self.sdk_client.delete_keypair.assert_has_calls(calls)
+        self.compute_sdk_client.delete_keypair.assert_has_calls(calls)
 
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
     def test_keypair_delete_with_user(self, sm_mock):
@@ -382,7 +372,7 @@ class TestKeypairDelete(TestKeypair):
         ret = self.cmd.take_action(parsed_args)
 
         self.assertIsNone(ret)
-        self.sdk_client.delete_keypair.assert_called_with(
+        self.compute_sdk_client.delete_keypair.assert_called_with(
             self.keypairs[0].name,
             user_id=identity_fakes.user_id,
             ignore_missing=False,
@@ -390,10 +380,6 @@ class TestKeypairDelete(TestKeypair):
 
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
     def test_keypair_delete_with_user_pre_v210(self, sm_mock):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.9'
-        )
-
         arglist = ['--user', identity_fakes.user_name, self.keypairs[0].name]
         verifylist = [
             ('user', identity_fakes.user_name),
@@ -410,13 +396,13 @@ class TestKeypairDelete(TestKeypair):
 
 
 class TestKeypairList(TestKeypair):
-    # Return value of self.sdk_client.keypairs().
+    # Return value of self.compute_sdk_client.keypairs().
     keypairs = compute_fakes.create_keypairs(count=1)
 
     def setUp(self):
         super().setUp()
 
-        self.sdk_client.keypairs.return_value = self.keypairs
+        self.compute_sdk_client.keypairs.return_value = self.keypairs
 
         # Get the command object to test
         self.cmd = keypair.ListKeypair(self.app, None)
@@ -435,7 +421,7 @@ class TestKeypairList(TestKeypair):
 
         # Set expected values
 
-        self.sdk_client.keypairs.assert_called_with()
+        self.compute_sdk_client.keypairs.assert_called_with()
 
         self.assertEqual(('Name', 'Fingerprint'), columns)
         self.assertEqual(
@@ -457,7 +443,7 @@ class TestKeypairList(TestKeypair):
 
         # Set expected values
 
-        self.sdk_client.keypairs.assert_called_with()
+        self.compute_sdk_client.keypairs.assert_called_with()
 
         self.assertEqual(('Name', 'Fingerprint', 'Type'), columns)
         self.assertEqual(
@@ -493,7 +479,7 @@ class TestKeypairList(TestKeypair):
         columns, data = self.cmd.take_action(parsed_args)
 
         users_mock.get.assert_called_with(identity_fakes.user_name)
-        self.sdk_client.keypairs.assert_called_with(
+        self.compute_sdk_client.keypairs.assert_called_with(
             user_id=identity_fakes.user_id,
         )
 
@@ -555,7 +541,7 @@ class TestKeypairList(TestKeypair):
 
         projects_mock.get.assert_called_with(identity_fakes.project_name)
         users_mock.list.assert_called_with(tenant_id=identity_fakes.project_id)
-        self.sdk_client.keypairs.assert_called_with(
+        self.compute_sdk_client.keypairs.assert_called_with(
             user_id=identity_fakes.user_id,
         )
 
@@ -615,7 +601,7 @@ class TestKeypairList(TestKeypair):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.keypairs.assert_called_with(limit=1)
+        self.compute_sdk_client.keypairs.assert_called_with(limit=1)
 
     @mock.patch.object(
         sdk_utils, 'supports_microversion', new=mock.Mock(return_value=False)
@@ -653,7 +639,7 @@ class TestKeypairList(TestKeypair):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.keypairs.assert_called_with(marker='test_kp')
+        self.compute_sdk_client.keypairs.assert_called_with(marker='test_kp')
 
     @mock.patch.object(
         sdk_utils, 'supports_microversion', new=mock.Mock(return_value=False)
@@ -709,7 +695,7 @@ class TestKeypairShow(TestKeypair):
 
     def test_keypair_show(self):
         self.keypair = compute_fakes.create_one_keypair()
-        self.sdk_client.find_keypair.return_value = self.keypair
+        self.compute_sdk_client.find_keypair.return_value = self.keypair
 
         self.data = (
             self.keypair.created_at,
@@ -728,7 +714,7 @@ class TestKeypairShow(TestKeypair):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_keypair.assert_called_with(
+        self.compute_sdk_client.find_keypair.assert_called_with(
             self.keypair.name, ignore_missing=False
         )
 
@@ -737,7 +723,7 @@ class TestKeypairShow(TestKeypair):
 
     def test_keypair_show_public(self):
         self.keypair = compute_fakes.create_one_keypair()
-        self.sdk_client.find_keypair.return_value = self.keypair
+        self.compute_sdk_client.find_keypair.return_value = self.keypair
 
         arglist = ['--public-key', self.keypair.name]
         verifylist = [('public_key', True), ('name', self.keypair.name)]
@@ -752,7 +738,7 @@ class TestKeypairShow(TestKeypair):
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
     def test_keypair_show_with_user(self, sm_mock):
         self.keypair = compute_fakes.create_one_keypair()
-        self.sdk_client.find_keypair.return_value = self.keypair
+        self.compute_sdk_client.find_keypair.return_value = self.keypair
 
         self.data = (
             self.keypair.created_at,
@@ -779,7 +765,7 @@ class TestKeypairShow(TestKeypair):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.users_mock.get.assert_called_with(identity_fakes.user_name)
-        self.sdk_client.find_keypair.assert_called_with(
+        self.compute_sdk_client.find_keypair.assert_called_with(
             self.keypair.name,
             ignore_missing=False,
             user_id=identity_fakes.user_id,