summaryrefslogtreecommitdiff
path: root/oslo_messaging/opts.py
diff options
context:
space:
mode:
authorKenneth Giusti <kgiusti@gmail.com>2016-05-09 12:56:02 -0400
committerKenneth Giusti <kgiusti@gmail.com>2016-05-13 14:04:37 -0400
commite72a8d5bc4dcbd6542658ea9617ed04ea44673eb (patch)
tree56ebd9f7b02da619fa26759867cc1ecb751a456e /oslo_messaging/opts.py
parent197bf4b5db6e51fd762d07eb364e0ccfdee8eb04 (diff)
downloadoslo-messaging-e72a8d5bc4dcbd6542658ea9617ed04ea44673eb.tar.gz
Reorganize the AMQP 1.0 driver source files
This patch simply moves the existing AMQP 1.0 driver files into a directory layout that is consistent with the other drivers. The driver unit tests are also moved to the proper test directory. There are no changes in driver functionality or API. Change-Id: I83a5d5433be8c3b317597100af69192ec5be81f1 Closes-Bug: #1579823
Diffstat (limited to 'oslo_messaging/opts.py')
-rw-r--r--oslo_messaging/opts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/oslo_messaging/opts.py b/oslo_messaging/opts.py
index 0687743..b04768a 100644
--- a/oslo_messaging/opts.py
+++ b/oslo_messaging/opts.py
@@ -21,12 +21,12 @@ import copy
import itertools
from oslo_messaging._drivers import amqp
+from oslo_messaging._drivers.amqp1_driver import opts as amqp_opts
from oslo_messaging._drivers import base as drivers_base
from oslo_messaging._drivers import impl_pika
from oslo_messaging._drivers import impl_rabbit
from oslo_messaging._drivers import impl_zmq
from oslo_messaging._drivers.pika_driver import pika_connection_factory
-from oslo_messaging._drivers.protocols.amqp import opts as amqp_opts
from oslo_messaging._drivers.zmq_driver.matchmaker import matchmaker_redis
from oslo_messaging.notify import notifier
from oslo_messaging.rpc import client