Merge lp:~stub/charm-helpers/bug-1191002-local-unit-relation-data into lp:charm-helpers

[Stuart Bishop]

Make hookenv.relations() return local relation information in addition to information stored by remote units.

[James Page (james-page)]

OK - I think this works just fine - approved.

review: Approve

=== modified file 'charmhelpers/core/hookenv.py'
--- charmhelpers/core/hookenv.py	2013-05-31 10:27:31 +0000
+++ charmhelpers/core/hookenv.py	2013-06-14 13:12:13 +0000
@@ -206,7 +206,7 @@
     for reltype in relation_types():
         relids = {}
         for relid in relation_ids(reltype):
-            units = {}
+            units = {local_unit(): relation_get(unit=local_unit(), rid=relid)}
             for unit in related_units(relid):
                 reldata = relation_get(unit=unit, rid=relid)
                 units[unit] = reldata
 
=== modified file 'tests/core/test_hookenv.py'
--- tests/core/test_hookenv.py	2013-05-31 10:27:31 +0000
+++ tests/core/test_hookenv.py	2013-06-14 13:12:13 +0000
@@ -386,12 +386,14 @@
             call(234),
         ])
 
+    @patch('charmhelpers.core.hookenv.local_unit')
     @patch('charmhelpers.core.hookenv.relation_types')
     @patch('charmhelpers.core.hookenv.relation_ids')
     @patch('charmhelpers.core.hookenv.related_units')
     @patch('charmhelpers.core.hookenv.relation_get')
     def test_gets_relations(self, relation_get, related_units,
-                            relation_ids, relation_types):
+                            relation_ids, relation_types, local_unit):
+        local_unit.return_value = 'u0'
         relation_types.return_value = ['t1','t2']
         relation_ids.return_value = ['i1']
         related_units.return_value = ['u1','u2']
@@ -402,12 +404,14 @@
         self.assertEqual(result, {
             't1': {
                 'i1': {
+                    'u0': {'key': 'val'},
                     'u1': {'key': 'val'},
                     'u2': {'key': 'val'},
                  },
             },
             't2': {
                 'i1': {
+                    'u0': {'key': 'val'},
                     'u1': {'key': 'val'},
                     'u2': {'key': 'val'},
                  },