Merge lp:~niedbalski/charm-helpers/fix-lp-1445025 into lp:charm-helpers

[Jorge Niedbalski]

Exposes the oslo-messaging-flags to AMQP context partially fixes #1445025

[Felipe Reyes (freyes)]

LGTM

review: Approve

[Edward Hope-Morley (hopem)]

One small nit (see inline) and this is good-to-go thanks Jorge!

review: Needs Fixing

[lp:~niedbalski/charm-helpers/fix-lp-1445025]

360. By Jorge Niedbalski on 2015-04-16

Addressed @dosaboy comments

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-04-13 07:40:54 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-04-16 20:27:54 +0000
@@ -459,6 +459,11 @@
 
                 ctxt['rabbitmq_hosts'] = ','.join(sorted(rabbitmq_hosts))
 
+        oslo_messaging_flags = conf.get('oslo-messaging-flags', None)
+        if oslo_messaging_flags:
+            ctxt['oslo_messaging_flags'] = config_flags_parser(
+                oslo_messaging_flags)
+
         if not context_complete(ctxt):
             return {}
 

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-04-13 07:40:54 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-04-16 20:27:54 +0000
@@ -212,6 +212,10 @@
     'rabbit-vhost': 'foo',
 }
 
+AMQP_OSLO_CONFIG = {
+    'oslo-messaging-flags': "rabbit_max_retries=1,rabbit_retry_backoff=1,rabbit_retry_interval=1"
+}
+
 AMQP_NOVA_CONFIG = {
     'nova-rabbit-user': 'adam',
     'nova-rabbit-vhost': 'foo',
@@ -950,6 +954,28 @@
         }
         self.assertEquals(result, expected)
 
+    def test_amqp_context_with_oslo_messaging(self):
+        """Test amqp context with oslo-messaging-flags option"""
+        relation = FakeRelation(relation_data=AMQP_RELATION)
+        self.relation_get.side_effect = relation.get
+        AMQP_OSLO_CONFIG.update(AMQP_CONFIG)
+        self.config.return_value = AMQP_OSLO_CONFIG
+        amqp = context.AMQPContext()
+        result = amqp()
+        expected = {
+            'rabbitmq_host': 'rabbithost',
+            'rabbitmq_password': 'foobar',
+            'rabbitmq_user': 'adam',
+            'rabbitmq_virtual_host': 'foo',
+            'oslo_messaging_flags': {
+                'rabbit_max_retries': '1',
+                'rabbit_retry_backoff': '1',
+                'rabbit_retry_interval': '1'
+            },
+        }
+
+        self.assertEquals(result, expected)
+
     def test_ceph_no_relids(self):
         '''Test empty ceph realtion'''
         relation = FakeRelation(relation_data={})