From fecd775e8a5187abb226e558b0421eeb7f73234f Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Tue, 15 Jul 2014 16:44:30 +0100
Subject: [PATCH] Resync helpers, tidy lint

---
 hooks/charmhelpers/contrib/openstack/context.py | 13 +++++++++----
 hooks/glance_contexts.py                        |  1 +
 hooks/glance_relations.py                       | 14 +++++++-------
 unit_tests/test_glance_relations.py             |  2 +-
 unit_tests/test_utils.py                        |  6 +++---
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/hooks/charmhelpers/contrib/openstack/context.py b/hooks/charmhelpers/contrib/openstack/context.py
index 1e8cfc72..92c41b23 100644
--- a/hooks/charmhelpers/contrib/openstack/context.py
+++ b/hooks/charmhelpers/contrib/openstack/context.py
@@ -25,6 +25,7 @@ from charmhelpers.core.hookenv import (
     unit_get,
     unit_private_ip,
     ERROR,
+    INFO
 )
 
 from charmhelpers.contrib.hahelpers.cluster import (
@@ -714,7 +715,7 @@ class SubordinateConfigContext(OSContextGenerator):
         self.interface = interface
 
     def __call__(self):
-        ctxt = {}
+        ctxt = {'sections': {}}
         for rid in relation_ids(self.interface):
             for unit in related_units(rid):
                 sub_config = relation_get('subordinate_configuration',
@@ -740,10 +741,14 @@ class SubordinateConfigContext(OSContextGenerator):
 
                     sub_config = sub_config[self.config_file]
                     for k, v in sub_config.iteritems():
-                        ctxt[k] = v
+                        if k == 'sections':
+                            for section, config_dict in v.iteritems():
+                                log("adding section '%s'" % (section))
+                                ctxt[k][section] = config_dict
+                        else:
+                            ctxt[k] = v
 
-        if not ctxt:
-            ctxt['sections'] = {}
+        log("%d section(s) found" % (len(ctxt['sections'])), level=INFO)
 
         return ctxt
 
diff --git a/hooks/glance_contexts.py b/hooks/glance_contexts.py
index 80fb79a8..01d73e45 100644
--- a/hooks/glance_contexts.py
+++ b/hooks/glance_contexts.py
@@ -78,5 +78,6 @@ class ApacheSSLContext(SSLContext):
 
 
 class LoggingConfigContext(OSContextGenerator):
+
     def __call__(self):
         return {'debug': config('debug'), 'verbose': config('verbose')}
diff --git a/hooks/glance_relations.py b/hooks/glance_relations.py
index 9566004a..f6aa424c 100755
--- a/hooks/glance_relations.py
+++ b/hooks/glance_relations.py
@@ -81,7 +81,7 @@ def install_hook():
     execd_preinstall()
     src = config('openstack-origin')
     if (lsb_release()['DISTRIB_CODENAME'] == 'precise' and
-       src == 'distro'):
+            src == 'distro'):
         src = 'cloud:precise-folsom'
 
     configure_installation_source(src)
@@ -243,7 +243,7 @@ def keystone_joined(relation_id=None):
         'public_url': public_url,
         'admin_url': admin_url,
         'internal_url': internal_url, }
-    
+
     relation_set(relation_id=relation_id, **relation_data)
 
 
@@ -313,7 +313,7 @@ def upgrade_charm():
 @hooks.hook('ha-relation-joined')
 def ha_relation_joined():
     config = get_hacluster_config()
-    
+
     resources = {
         'res_glance_haproxy': 'lsb:haproxy'
     }
@@ -329,10 +329,10 @@ def ha_relation_joined():
             vip_key = 'res_glance_{}_vip'.format(iface)
             resources[vip_key] = 'ocf:heartbeat:IPaddr2'
             resource_params[vip_key] = (
-                 'params ip="{vip}" cidr_netmask="{netmask}"'
-                 ' nic="{iface}"'.format(vip=vip,
-                                         iface=iface,
-                                         netmask=get_netmask_for_address(vip))
+                'params ip="{vip}" cidr_netmask="{netmask}"'
+                ' nic="{iface}"'.format(vip=vip,
+                                        iface=iface,
+                                        netmask=get_netmask_for_address(vip))
             )
             vip_group.append(vip_key)
 
diff --git a/unit_tests/test_glance_relations.py b/unit_tests/test_glance_relations.py
index 8e25ae3b..2b677923 100644
--- a/unit_tests/test_glance_relations.py
+++ b/unit_tests/test_glance_relations.py
@@ -454,7 +454,7 @@ class GlanceRelationTests(CharmTestCase):
                           'res_glance_haproxy': 'lsb:haproxy'},
             'resource_params': {
                 'res_glance_eth1_vip': 'params ip="10.10.10.10"'
-                                  ' cidr_netmask="255.255.0.0" nic="eth1"',
+                ' cidr_netmask="255.255.0.0" nic="eth1"',
                 'res_glance_haproxy': 'op monitor interval="5s"'},
             'clones': {'cl_glance_haproxy': 'res_glance_haproxy'}
         }
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index e1e346b1..526a61f7 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -80,9 +80,9 @@ class TestConfig(object):
         return self.config
 
     def set(self, attr, value):
-            if attr not in self.config:
-                raise KeyError
-            self.config[attr] = value
+        if attr not in self.config:
+            raise KeyError
+        self.config[attr] = value
 
 
 class TestRelation(object):