diff --git a/blazar/notification/notifier.py b/blazar/notification/notifier.py index 65ba033c..cae236f7 100644 --- a/blazar/notification/notifier.py +++ b/blazar/notification/notifier.py @@ -34,7 +34,7 @@ NOTIFIER = None def init(): global TRANSPORT, NOTIFIER - TRANSPORT = messaging.get_transport(CONF) + TRANSPORT = messaging.get_notification_transport(CONF) NOTIFIER = messaging.Notifier(TRANSPORT, publisher_id=CONF.notifications.publisher_id) diff --git a/blazar/tests/notification/test_notifier.py b/blazar/tests/notification/test_notifier.py index bbcecf52..ec78f489 100644 --- a/blazar/tests/notification/test_notifier.py +++ b/blazar/tests/notification/test_notifier.py @@ -37,8 +37,9 @@ class NotifierTestCase(tests.TestCase): # Fake Oslo notifier self.fake_notifier = self.patch(messaging, 'Notifier') self.fake_notifier.return_value = FakeNotifier() - self.fake_transport = self.patch(messaging, - 'get_transport').return_value + self.fake_transport = self.patch( + messaging, + 'get_notification_transport').return_value self.info_method = self.patch(FakeNotifier, 'info') diff --git a/blazar/utils/service.py b/blazar/utils/service.py index 2e6a963f..d338a767 100644 --- a/blazar/utils/service.py +++ b/blazar/utils/service.py @@ -33,7 +33,7 @@ class RPCClient(object): super(RPCClient, self).__init__() self._client = messaging.RPCClient( target=target, - transport=messaging.get_transport(cfg.CONF), + transport=messaging.get_rpc_transport(cfg.CONF), ) def cast(self, name, **kwargs): @@ -50,7 +50,7 @@ class RPCServer(service.Service): super(RPCServer, self).__init__() self._server = messaging.get_rpc_server( target=target, - transport=messaging.get_transport(cfg.CONF), + transport=messaging.get_rpc_transport(cfg.CONF), endpoints=[ContextEndpointHandler(self, target)], executor='eventlet', )