Merge lp:~gnuoy/charm-helpers/bug1478061 into lp:charm-helpers

[Liam Young]

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-07-15 08:24:09 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-07-27 10:16:04 +0000
@@ -1053,11 +1053,17 @@
         """
         self.service = service
         self.config_file = config_file
-        self.interface = interface
+        if isinstance(interface, list):
+            self.interfaces = interface
+        else:
+            self.interfaces = [interface]
 
     def __call__(self):
         ctxt = {'sections': {}}
-        for rid in relation_ids(self.interface):
+        rids = []
+        for interface in self.interfaces:
+            rids.extend(relation_ids(interface))
+        for rid in rids:
             for unit in related_units(rid):
                 sub_config = relation_get('subordinate_configuration',
                                           rid=rid, unit=unit)
@@ -1085,13 +1091,15 @@
                     sub_config = sub_config[self.config_file]
                     for k, v in six.iteritems(sub_config):
                         if k == 'sections':
-                            for section, config_dict in six.iteritems(v):
+                            for section, config_list in six.iteritems(v):
                                 log("adding section '%s'" % (section),
                                     level=DEBUG)
-                                ctxt[k][section] = config_dict
+                                if ctxt[k].get(section):
+                                    ctxt[k][section].extend(config_list)
+                                else:
+                                    ctxt[k][section] = config_list
                         else:
                             ctxt[k] = v
-
         log("%d section(s) found" % (len(ctxt['sections'])), level=DEBUG)
         return ctxt
 

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-04-29 12:52:18 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-07-27 10:16:04 +0000
@@ -73,7 +73,11 @@
             return None
 
     def relation_ids(self, relation):
-        return self.relation_data.keys()
+        rids = []
+        for rid in self.relation_data.keys():
+            if relation + ':' in rid:
+                rids.append(rid)
+        return rids
 
     def relation_units(self, relation_id):
         if relation_id not in self.relation_data:
@@ -325,6 +329,25 @@
                 - [glance-key2, value2]
 """
 
+NOVA_SUB_CONFIG1 = """
+nova:
+    /etc/nova/nova.conf:
+        sections:
+            DEFAULT:
+                - [nova-key1, value1]
+                - [nova-key2, value2]
+"""
+
+
+NOVA_SUB_CONFIG2 = """
+nova:
+    /etc/nova/nova.conf:
+        sections:
+            DEFAULT:
+                - [nova-key3, value3]
+                - [nova-key4, value4]
+"""
+
 CINDER_SUB_CONFIG1 = """
 cinder:
     /etc/cinder/cinder.conf:
@@ -376,6 +399,21 @@
     },
 }
 
+SUB_CONFIG_RELATION2 = {
+    'nova-ceilometer:6': {
+        'ceilometer-agent/0': {
+            'private-address': 'nova_node1',
+            'subordinate_configuration': json.dumps(yaml.load(NOVA_SUB_CONFIG1)),
+        },
+    },
+    'neutron-plugin:3': {
+        'neutron-ovs-plugin/0': {
+            'private-address': 'nova_node1',
+            'subordinate_configuration': json.dumps(yaml.load(NOVA_SUB_CONFIG2)),
+        },
+    }
+}
+
 NONET_CONFIG = {
     'vip': 'cinderhost1vip',
     'os-internal-network': None,
@@ -2053,6 +2091,27 @@
         # subordinate supplies bad input
         self.assertEquals(foo_sub_ctxt(), {'sections': {}})
 
+    def test_os_subordinate_config_context_multiple(self):
+        relation = FakeRelation(relation_data=SUB_CONFIG_RELATION2)
+        self.relation_get.side_effect = relation.get
+        self.relation_ids.side_effect = relation.relation_ids
+        self.related_units.side_effect = relation.relation_units
+        nova_sub_ctxt = context.SubordinateConfigContext(
+            service='nova',
+            config_file='/etc/nova/nova.conf',
+            interface=['nova-ceilometer', 'neutron-plugin'],
+        )
+        self.assertEquals(
+            nova_sub_ctxt(),
+            {'sections': {
+                'DEFAULT': [
+                    ['nova-key1', 'value1'],
+                    ['nova-key2', 'value2'],
+                    ['nova-key3', 'value3'],
+                    ['nova-key4', 'value4']]
+            }}
+        )
+
     def test_syslog_context(self):
         self.config.side_effect = fake_config({'use-syslog': 'foo'})
         syslog = context.SyslogContext()