change rabbit mq config to url

Signed-off-by: Peng Xiao <[email protected]>

Author: xiaopeng163

etc/yabgp/yabgp.ini.sample

@@ -126,20 +126,8 @@
 
 [rabbit_mq]
 
-# The RabbitMQ broker address where a single node is used. (string value)
-# rabbit_host = localhost
-
-# The RabbitMQ broker port where a single node is used. (integer value)
-# rabbit_port = 5672
-
-# Connect over SSL for RabbitMQ. (boolean value)
-# rabbit_use_ssl = false
-
-# The RabbitMQ userid. (string value)
-# rabbit_userid = guest
-
-# The RabbitMQ password. (string value)
-# rabbit_password = guest
+# The RabbitMQ connection url
+# rabbit_url = amqp://guest:guest@localhost:5672/%2F
 
 [database]
 
@@ -175,4 +163,4 @@
 # write concern timeout (integer) Used in conjunction with w. Specify a value in milliseconds to
 # control how long to wait for write propagation to complete. If replication does not complete
 # in the given timeframe, a timeout exception is raised.
-# write_concern_timeout = 5000
+# write_concern_timeout = 5000

yabgp/agent/__init__.py

@@ -143,12 +143,7 @@ def prepare_twisted_service():
     # check running mode
     if not CONF.standalone:
         # rabbitmq factory
-        rabbit_mq_factory = PikaFactory(
-            host=CONF.rabbit_mq.rabbit_host,
-            port=CONF.rabbit_mq.rabbit_port,
-            userid=CONF.rabbit_mq.rabbit_userid,
-            password=CONF.rabbit_mq.rabbit_password
-        )
+        rabbit_mq_factory = PikaFactory(url=CONF.rabbit_mq.rabbit_url)
         rabbit_mq_factory.peer_list = CONF.bgp.running_config.keys()
         rabbit_mq_factory.connect()
         # mongodb connection

yabgp/channel/config.py

@@ -22,22 +22,9 @@
 CONF = cfg.CONF
 
 rabbit_mq = [
-    cfg.StrOpt('rabbit_host',
-               default='localhost',
-               help='The RabbitMQ broker address where a single node is used'),
-    cfg.IntOpt('rabbit_port',
-               default=5672,
-               help='The RabbitMQ broker port where a single node is used'),
-    cfg.BoolOpt('rabbit_use_ssl',
-                default=False,
-                help='Connect over SSL for RabbitMQ.'),
-    cfg.StrOpt('rabbit_userid',
-               default='guest',
-               help='The RabbitMQ userid.'),
-    cfg.StrOpt('rabbit_password',
-               default='guest',
-               help='The RabbitMQ password.',
-               secret=True),
+    cfg.StrOpt('rabbit_url',
+               default='amqp://guest:guest@localhost:5672/%2F',
+               help='The RabbitMQ connection url')
 ]
 
 channle_filter = [

yabgp/channel/factory.py

@@ -30,11 +30,8 @@
 
 class PikaFactory(protocol.ReconnectingClientFactory):
 
-    def __init__(self, host='localhost', port=5672, userid='guest', password='guest'):
-        self.parameters = pika.ConnectionParameters(
-            host=host, port=port,
-            credentials=pika.PlainCredentials(userid, password)
-        )
+    def __init__(self, url):
+        self.parameters = pika.URLParameters(url)
         self.client = None
         self.queued_messages = []
         self.peer_list = []