openstack/oslo.messaging
Code Issues Proposed changes

Merge "Make TransportURL.parse aware of transport_url"

Browse Source
This commit is contained in:
Jenkins 2016-05-18 10:08:22 +00:00 committed by Gerrit Code Review
commit 2c24d29fa9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oslo_messaging/transport.py
View File

@ -175,11 +175,7 @@ def get_transport(conf, url=None, allowed_remote_exmods=None, aliases=None):
conf.register_opts(_transport_opts) conf.register_opts(_transport_opts)
if not isinstance(url, TransportURL): if not isinstance(url, TransportURL):
url = url or conf.transport_url url = TransportURL.parse(conf, url, aliases)
parsed = TransportURL.parse(conf, url, aliases)
if not parsed.transport:
raise InvalidTransportURL(url, 'No scheme specified in "%s"' % url)
url = parsed
kwargs = dict(default_exchange=conf.control_exchange, kwargs = dict(default_exchange=conf.control_exchange,
allowed_remote_exmods=allowed_remote_exmods) allowed_remote_exmods=allowed_remote_exmods)
@ -335,7 +331,7 @@ class TransportURL(object):
return url return url
@classmethod @classmethod
def parse(cls, conf, url, aliases=None): def parse(cls, conf, url=None, aliases=None):
"""Parse an url. """Parse an url.
Assuming a URL takes the form of:: Assuming a URL takes the form of::
@ -357,6 +353,8 @@ class TransportURL(object):
{"host": "host2:port2"} {"host": "host2:port2"}
] ]
If the url is not provided conf.transport_url is parsed intead.
:param conf: a ConfigOpts instance :param conf: a ConfigOpts instance
:type conf: oslo.config.cfg.ConfigOpts :type conf: oslo.config.cfg.ConfigOpts
:param url: The URL to parse :param url: The URL to parse
@ -365,6 +363,8 @@ class TransportURL(object):
:type aliases: dict :type aliases: dict
:returns: A TransportURL :returns: A TransportURL
""" """
url = url or conf.transport_url
if not url: if not url:
return cls(conf, aliases=aliases) return cls(conf, aliases=aliases)
@ -373,6 +373,9 @@ class TransportURL(object):
url = parse.urlparse(url) url = parse.urlparse(url)
if not url.scheme:
raise InvalidTransportURL(url.geturl(), 'No scheme specified')
# Make sure there's not a query string; that could identify # Make sure there's not a query string; that could identify
# requirements we can't comply with (for example ssl), so reject it if # requirements we can't comply with (for example ssl), so reject it if
# it's present # it's present