From ff2eaa345ec8fe4f2828cf66c11fdbd9e89398f7 Mon Sep 17 00:00:00 2001
From: gordon chung <gord@live.ca>
Date: Mon, 16 Mar 2015 15:42:09 -0400
Subject: [PATCH] add ability to publish to multiple topics

allow the ability to publish to multiple topics so we can have
different consumers for different data. this is done by allowing
users to specify a topic for each publisher rather than using
the standard CONF option.

DocImpact
Closes-Bug: #1431922

Change-Id: Ib919cfa302e05653c788ea84a08eafbca4fe843c
---
 ceilometer/publisher/messaging.py               |  4 +++-
 .../tests/publisher/test_messaging_publisher.py | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ceilometer/publisher/messaging.py b/ceilometer/publisher/messaging.py
index 0ccbb69b1..4ef035668 100644
--- a/ceilometer/publisher/messaging.py
+++ b/ceilometer/publisher/messaging.py
@@ -200,8 +200,10 @@ class RPCPublisher(MessagingPublisher):
 
 
 class NotifierPublisher(MessagingPublisher):
-    def __init__(self, parsed_url, topic):
+    def __init__(self, parsed_url, default_topic):
         super(NotifierPublisher, self).__init__(parsed_url)
+        options = urlparse.parse_qs(parsed_url.query)
+        topic = options.get('topic', [default_topic])[-1]
         self.notifier = oslo.messaging.Notifier(
             messaging.get_transport(),
             driver=cfg.CONF.publisher_notifier.telemetry_driver,
diff --git a/ceilometer/tests/publisher/test_messaging_publisher.py b/ceilometer/tests/publisher/test_messaging_publisher.py
index 6f9ae5304..e0d7375f2 100644
--- a/ceilometer/tests/publisher/test_messaging_publisher.py
+++ b/ceilometer/tests/publisher/test_messaging_publisher.py
@@ -176,6 +176,23 @@ class RpcOnlyPublisherTest(BasePublisherTestCase):
             self.assertEqual(expected, prepare.mock_calls)
 
 
+class NotifierOnlyPublisherTest(BasePublisherTestCase):
+
+    @mock.patch('oslo.messaging.Notifier')
+    def test_publish_topic_override(self, notifier):
+        msg_publisher.SampleNotifierPublisher(
+            netutils.urlsplit('notifier://?topic=custom_topic'))
+        notifier.assert_called_with(mock.ANY, topic='custom_topic',
+                                    driver=mock.ANY, retry=mock.ANY,
+                                    publisher_id=mock.ANY)
+
+        msg_publisher.EventNotifierPublisher(
+            netutils.urlsplit('notifier://?topic=custom_event_topic'))
+        notifier.assert_called_with(mock.ANY, topic='custom_event_topic',
+                                    driver=mock.ANY, retry=mock.ANY,
+                                    publisher_id=mock.ANY)
+
+
 class TestPublisher(testscenarios.testcase.WithScenarios,
                     BasePublisherTestCase):
     scenarios = [