Merge "tests: Replace keystoneclient with keystoneauth1"

nova/tests/unit/compute/test_compute.py

@@ -28,7 +28,7 @@ from castellan import key_manager
 from cinderclient import exceptions as cinder_exception
 import ddt
 import futurist
-from keystoneclient import exceptions as keystone_exception
+from keystoneauth1 import exceptions as keystone_exception
 from neutronclient.common import exceptions as neutron_exceptions
 from oslo_log import log as logging
 import oslo_messaging as messaging

nova/tests/unit/scheduler/test_manager.py

@@ -1767,7 +1767,7 @@ class SchedulerManagerTestCase(test.NoDBTestCase):
     @mock.patch('nova.rpc.get_notifier')
     def test_init_lazy_placement_client_failures(self, mock_rpc, mock_sg,
                                                  mock_hm, mock_report):
-        # Certain keystoneclient exceptions are fatal
+        # Certain keystoneauth1 exceptions are fatal
         mock_report.side_effect = ks_exc.Unauthorized
         self.assertRaises(ks_exc.Unauthorized, manager.SchedulerManager)
 

nova/tests/unit/volume/test_cinder.py

@@ -18,9 +18,9 @@ from unittest import mock
 from cinderclient import api_versions as cinder_api_versions
 from cinderclient import exceptions as cinder_exception
 from cinderclient.v3 import limits as cinder_limits
+from keystoneauth1 import exceptions as keystone_exception
 from keystoneauth1 import loading as ks_loading
 from keystoneauth1 import session
-from keystoneclient import exceptions as keystone_exception
 from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils