make the DHCP agent use a unique queue name

fixes bug: 1084621

This generates a unique name, so that multiple agents can be active
within a deployment.

Change-Id: Ia2bdc27866e6aa4aebd0bd28d1dfd25c3167dd03

diff --git a/quantum/agent/rpc.py b/quantum/agent/rpc.py
index dc65175c8888e0e747e44fcade5b72cafd8713a6..e036822f26a32b9f65b6d4e746e43ff285f80570 100644 (file)
--- a/quantum/agent/rpc.py
+++ b/quantum/agent/rpc.py
@@ -24,6 +24,7 @@ from quantum.openstack.common.notifier import api
 from quantum.openstack.common.notifier import rpc_notifier
 from quantum.openstack.common import rpc
 from quantum.openstack.common.rpc import proxy
+from quantum.openstack.common import uuidutils
 
 
 LOG = logging.getLogger(__name__)
@@ -88,7 +89,9 @@ class NotificationDispatcher(object):
         self.connection = rpc.create_connection(new=True)
         topic = '%s.%s' % (rpc_notifier.CONF.notification_topics[0],
                            api.CONF.default_notification_level.lower())
+        queue_name = 'notification_listener_%s' % uuidutils.generate_uuid()
         self.connection.declare_topic_consumer(topic=topic,
+                                               queue_name=queue_name,
                                                callback=self._add_to_queue)
         self.connection.consume_in_thread()
 

diff --git a/quantum/tests/unit/test_agent_rpc.py b/quantum/tests/unit/test_agent_rpc.py
index a36ea0d89fbeed0ac36fa8d2cc54f9af1f1589b3..fedf20b384549dcbd30af59f0a99a0a6de5f268c 100644 (file)
--- a/quantum/tests/unit/test_agent_rpc.py
+++ b/quantum/tests/unit/test_agent_rpc.py
@@ -82,6 +82,7 @@ class AgentRPCNotificationDispatcher(unittest.TestCase):
         expected = [
             mock.call(new=True),
             mock.call().declare_topic_consumer(topic='notifications.info',
+                                               queue_name=mock.ANY,
                                                callback=nd._add_to_queue),
             mock.call().consume_in_thread()
         ]