From 28f38cb25eeb638465baae448d5db84e8e735c66 Mon Sep 17 00:00:00 2001 From: Hanxi Liu Date: Mon, 1 Aug 2016 23:29:14 +0800 Subject: [PATCH] Change keystoneclient to keystoneauth keystoneclient.auth is deprecated in favour of keystoneauth. This patch updates Ceilometer accordingly. Change-Id: I7c30c9ce8c46129ec9aa8b05706c79d757695db6 --- ceilometer/agent/manager.py | 7 ++----- ceilometer/tests/unit/agent/test_manager.py | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ceilometer/agent/manager.py b/ceilometer/agent/manager.py index 448fd31c..f1d40a04 100644 --- a/ceilometer/agent/manager.py +++ b/ceilometer/agent/manager.py @@ -21,7 +21,6 @@ import random from concurrent import futures from futurist import periodics from keystoneauth1 import exceptions as ka_exceptions -from keystoneclient import exceptions as ks_exceptions from oslo_config import cfg from oslo_log import log import oslo_messaging @@ -453,8 +452,7 @@ class AgentManager(service_base.PipelineBasedService): try: self._keystone = keystone_client.get_client() self._keystone_last_exception = None - except (ka_exceptions.ClientException, - ks_exceptions.ClientException) as e: + except ka_exceptions.ClientException as e: self._keystone = None self._keystone_last_exception = e if self._keystone is not None: @@ -504,8 +502,7 @@ class AgentManager(service_base.PipelineBasedService): resources.extend(partitioned) if discovery_cache is not None: discovery_cache[url] = partitioned - except (ka_exceptions.ClientException, - ks_exceptions.ClientException) as e: + except ka_exceptions.ClientException as e: LOG.error(_LE('Skipping %(name)s, keystone issue: ' '%(exc)s'), {'name': name, 'exc': e}) except Exception as err: diff --git a/ceilometer/tests/unit/agent/test_manager.py b/ceilometer/tests/unit/agent/test_manager.py index ec72ab40..d22e31b2 100644 --- a/ceilometer/tests/unit/agent/test_manager.py +++ b/ceilometer/tests/unit/agent/test_manager.py @@ -16,7 +16,7 @@ import shutil -from keystoneclient import exceptions as ks_exceptions +from keystoneauth1 import exceptions as ka_exceptions import mock from novaclient import client as novaclient from oslo_config import fixture as fixture_config @@ -303,7 +303,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase): """Test for bug 1316532.""" self.useFixture(mockpatch.Patch( 'keystoneclient.v2_0.client.Client', - side_effect=ks_exceptions.ClientException)) + side_effect=ka_exceptions.ClientException)) self.pipeline_cfg = { 'sources': [{ 'name': "test_keystone",