summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMehdi Abaakouk <sileht@redhat.com>2017-04-27 12:21:28 +0200
committerMehdi Abaakouk <sileht@redhat.com>2017-04-27 12:22:52 +0200
commit7a6474662dc7b3e990a81ad2cb31aac969d56922 (patch)
treea5e5eff525b0607aa526fc7864788444481d2b34
parent83e738c2fdc3ea1102da699457e56f1e6f3f18c8 (diff)
downloadoslo-messaging-7a6474662dc7b3e990a81ad2cb31aac969d56922.tar.gz
Fix aliases deprecation
We log deprecation message even if application doesn't use it. And we missing the parse method. This change fixes that. Change-Id: I476816cb14ac8218feb74e8459cfa5f18fdb6c61
-rw-r--r--oslo_messaging/transport.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/oslo_messaging/transport.py b/oslo_messaging/transport.py
index b343954..c42ffa7 100644
--- a/oslo_messaging/transport.py
+++ b/oslo_messaging/transport.py
@@ -365,6 +365,8 @@ class TransportURL(object):
return url
+ @removals.removed_kwarg('aliases',
+ 'Parameter aliases is deprecated for removal.')
@classmethod
def parse(cls, conf, url=None, aliases=None):
"""Parse an url.
@@ -404,7 +406,7 @@ class TransportURL(object):
conf.register_opts(_transport_opts)
url = url or conf.transport_url
if not url:
- return cls(conf, aliases=aliases)
+ return cls(conf) if aliases is None else cls(conf, aliases=aliases)
if not isinstance(url, six.string_types):
raise InvalidTransportURL(url, 'Wrong URL type')
@@ -488,4 +490,7 @@ class TransportURL(object):
{'hosts_with_credentials': hosts_with_credentials,
'hosts_without_credentials':
hosts_without_credentials})
- return cls(conf, transport, virtual_host, hosts, aliases, query)
+ if aliases is None:
+ return cls(conf, transport, virtual_host, hosts, query=query)
+ else:
+ return cls(conf, transport, virtual_host, hosts, aliases, query)