Merge lp:~gnuoy/charm-helpers/neutron-refactor-again into lp:charm-helpers

[Liam Young]

[lp:~gnuoy/charm-helpers/neutron-refactor-again]

172. By Liam Young on 2014-06-24

Add unit tests for changes

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2014-06-23 13:50:12 +0000
+++ charmhelpers/contrib/openstack/context.py	2014-06-24 12:58:41 +0000
@@ -243,23 +243,31 @@
 
 
 class AMQPContext(OSContextGenerator):
-    interfaces = ['amqp']
 
-    def __init__(self, ssl_dir=None):
+    def __init__(self, rel_name='amqp', relation_prefix=None, ssl_dir=None):
         self.ssl_dir = ssl_dir
+        self.rel_name = rel_name
+        self.relation_prefix = relation_prefix
+        self.interfaces = [rel_name]
 
     def __call__(self):
         log('Generating template context for amqp')
         conf = config()
+        user_setting = 'rabbit-user'
+        vhost_setting = 'rabbit-vhost'
+        if self.relation_prefix:
+            user_setting = self.relation_prefix + '-rabbit-user'
+            vhost_setting = self.relation_prefix + '-rabbit-vhost'
+
         try:
-            username = conf['rabbit-user']
-            vhost = conf['rabbit-vhost']
+            username = conf[user_setting]
+            vhost = conf[vhost_setting]
         except KeyError as e:
             log('Could not generate shared_db context. '
                 'Missing required charm config options: %s.' % e)
             raise OSContextError
         ctxt = {}
-        for rid in relation_ids('amqp'):
+        for rid in relation_ids(self.rel_name):
             ha_vip_only = False
             for unit in related_units(rid):
                 if relation_get('clustered', rid=rid, unit=unit):

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2014-06-23 13:50:12 +0000
+++ charmhelpers/contrib/openstack/utils.py	2014-06-24 12:58:41 +0000
@@ -84,6 +84,8 @@
     '''Derive OpenStack release codename from a given installation source.'''
     ubuntu_rel = lsb_release()['DISTRIB_CODENAME']
     rel = ''
+    if src is None:
+        return rel
     if src in ['distro', 'distro-proposed']:
         try:
             rel = UBUNTU_OPENSTACK_RELEASE[ubuntu_rel]

=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
--- tests/contrib/openstack/test_openstack_utils.py	2014-04-22 17:19:02 +0000
+++ tests/contrib/openstack/test_openstack_utils.py	2014-06-24 12:58:41 +0000
@@ -169,6 +169,8 @@
                'precise-havana main')
         self.assertEquals(openstack.get_os_codename_install_source(src),
                           'havana')
+        self.assertEquals(openstack.get_os_codename_install_source(None),
+                          '')
 
     @patch.object(openstack, 'get_os_version_codename')
     @patch.object(openstack, 'get_os_codename_install_source')

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2014-06-23 09:58:48 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2014-06-24 12:58:41 +0000
@@ -176,6 +176,11 @@
     'rabbit-vhost': 'foo',
 }
 
+AMQP_NOVA_CONFIG = {
+    'nova-rabbit-user': 'adam',
+    'nova-rabbit-vhost': 'foo',
+}
+
 CEPH_RELATION = {
     'ceph:0': {
         'ceph/0': {
@@ -495,6 +500,21 @@
         }
         self.assertEquals(result, expected)
 
+    def test_amqp_context_with_data_altname(self):
+        '''Test amqp context with alternative relation name'''
+        relation = FakeRelation(relation_data=AMQP_RELATION)
+        self.relation_get.side_effect = relation.get
+        self.config.return_value = AMQP_NOVA_CONFIG
+        amqp = context.AMQPContext(rel_name='amqp-nova', relation_prefix='nova')
+        result = amqp()
+        expected = {
+            'rabbitmq_host': 'rabbithost',
+            'rabbitmq_password': 'foobar',
+            'rabbitmq_user': 'adam',
+            'rabbitmq_virtual_host': 'foo'
+        }
+        self.assertEquals(result, expected)
+
     @patch('__builtin__.open')
     def test_amqp_context_with_data_ssl(self, _open):
         '''Test amqp context with all required data and ssl'''