Merge "Add drivers to the documentation"

This commit is contained in:
Jenkins 2015-06-12 21:10:53 +00:00 committed by Gerrit Code Review
commit 38558db420
8 changed files with 39 additions and 1 deletions

View File

@ -8,7 +8,11 @@ sys.path.insert(0, os.path.abspath('../..'))
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.autodoc', 'oslosphinx']
extensions = [
'sphinx.ext.autodoc',
'oslosphinx',
'stevedore.sphinxext',
]
# autodoc generation is a bit aggressive and a nuisance when doing heavy
# text edit cycles.

6
doc/source/drivers.rst Normal file
View File

@ -0,0 +1,6 @@
===================
Available Drivers
===================
.. list-plugins:: oslo.messaging.drivers
:detailed:

View File

@ -21,6 +21,7 @@ Contents
exceptions
opts
conffixture
drivers
AMQP1.0
zmq_driver
FAQ

View File

@ -154,6 +154,12 @@ class FakeExchangeManager(object):
class FakeDriver(base.BaseDriver):
"""Fake driver used for testing.
This driver passes messages in memory, and should only be used for
unit tests.
"""
def __init__(self, conf, url, default_exchange=None,
allowed_remote_exmods=None):

View File

@ -764,6 +764,9 @@ class Connection(object):
class QpidDriver(amqpdriver.AMQPDriverBase):
"""qpidd Driver
"""
def __init__(self, conf, url,
default_exchange=None, allowed_remote_exmods=None):

View File

@ -1129,6 +1129,15 @@ class Connection(object):
class RabbitDriver(amqpdriver.AMQPDriverBase):
"""RabbitMQ Driver
The ``rabbit`` driver is the default driver used in OpenStack's
integration tests.
The driver is aliased as ``kombu`` to support upgrading existing
installations with older settings.
"""
def __init__(self, conf, url,
default_exchange=None,

View File

@ -988,6 +988,11 @@ class ZmqClientPoolManager(object):
class ZmqDriver(base.BaseDriver):
"""ZeroMQ Driver
See :doc:`zmq_driver` for details.
"""
# FIXME(markmc): allow this driver to be used without eventlet

View File

@ -121,6 +121,10 @@ class ProtonListener(base.Listener):
class ProtonDriver(base.BaseDriver):
"""AMQP 1.0 Driver
See :doc:`AMQP1.0` for details.
"""
def __init__(self, conf, url,
default_exchange=None, allowed_remote_exmods=[]):