From 9c5df8400b621141db93a259900efe3702eb6241 Mon Sep 17 00:00:00 2001 From: liusheng Date: Thu, 2 Jun 2016 12:51:31 +0800 Subject: [PATCH] Catch DriverLoadFailure for get_transport optional new oslo.messaging 5.2.0 release will raise oslo_messaging.transport.DriverLoadFailure if no existent transport driver, hence breaks our code and unit test as well. This patch fixes it by adding DriverLoadFailure to catch list. Change-Id: I318d4b93beac9d1816fe4b5f9eb9de98e4debc04 Closes-Bug: #1588151 --- aodh/messaging.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aodh/messaging.py b/aodh/messaging.py index 53dfc108b..9287ada75 100644 --- a/aodh/messaging.py +++ b/aodh/messaging.py @@ -33,8 +33,9 @@ def get_transport(conf, url=None, optional=False, cache=True): if not transport or not cache: try: transport = oslo_messaging.get_transport(conf, url) - except oslo_messaging.InvalidTransportURL as e: - if not optional or e.url: + except (oslo_messaging.InvalidTransportURL, + oslo_messaging.DriverLoadFailure): + if not optional or url: # NOTE(sileht): oslo_messaging is configured but unloadable # so reraise the exception raise