Use get_notification_transport for notifications

oslo messaging's get_transport is not intended for
notifications, we should be using get_notification_transport
instead. This patch set adds that change.

If settings in manila.conf oslo_messaging_notifications are not
set, this will fallback to default configs.

Change-Id: Ic65f043086f38d930973ee52ca9ff210e27ece99
Closes-Bug: #1694776
This commit is contained in:
Victoria Martinez de la Cruz 2017-05-31 16:19:06 -03:00
parent 5b0a5b877e
commit 8abc71039d

View File

@ -35,6 +35,7 @@ import manila.exception
CONF = cfg.CONF
TRANSPORT = None
NOTIFICATION_TRANSPORT = None
NOTIFIER = None
ALLOWED_EXMODS = [
@ -44,13 +45,17 @@ EXTRA_EXMODS = []
def init(conf):
global TRANSPORT, NOTIFIER
global TRANSPORT, NOTIFICATION_TRANSPORT, NOTIFIER
exmods = get_allowed_exmods()
TRANSPORT = messaging.get_transport(conf,
allowed_remote_exmods=exmods)
NOTIFICATION_TRANSPORT = messaging.get_notification_transport(
conf,
allowed_remote_exmods=exmods)
serializer = RequestContextSerializer(JsonPayloadSerializer())
NOTIFIER = messaging.Notifier(TRANSPORT, serializer=serializer)
NOTIFIER = messaging.Notifier(NOTIFICATION_TRANSPORT,
serializer=serializer)
def initialized():
@ -58,11 +63,13 @@ def initialized():
def cleanup():
global TRANSPORT, NOTIFIER
global TRANSPORT, NOTIFICATION_TRANSPORT, NOTIFIER
assert TRANSPORT is not None
assert NOTIFICATION_TRANSPORT is not None
assert NOTIFIER is not None
TRANSPORT.cleanup()
TRANSPORT = NOTIFIER = None
NOTIFICATION_TRANSPORT.cleanup()
TRANSPORT = NOTIFIER = NOTIFICATION_TRANSPORT = None
def set_defaults(control_exchange):