Merge lp:~gnuoy/charm-helpers/add-peer_ips into lp:charm-helpers

[Liam Young]

[James Page (james-page)]

review: Needs Fixing

[lp:~gnuoy/charm-helpers/add-peer_ips]

185. By Liam Young on 2014-07-29

relation_list and relation_ids both return [] if none a represent so don't to guard against none. Allow the address key to be overridden

186. By Liam Young on 2014-07-29

Remove surplus round brackets

[James Page (james-page)]

review: Approve

=== modified file 'charmhelpers/contrib/hahelpers/cluster.py'
--- charmhelpers/contrib/hahelpers/cluster.py	2014-07-23 08:25:09 +0000
+++ charmhelpers/contrib/hahelpers/cluster.py	2014-07-29 11:12:10 +0000
@@ -62,6 +62,15 @@
     return peers
 
 
+def peer_ips(peer_relation='cluster', addr_key='private-address'):
+    '''Return a dict of peers and their private-address'''
+    peers = {}
+    for r_id in relation_ids(peer_relation):
+        for unit in relation_list(r_id):
+            peers[unit] = relation_get(addr_key, rid=r_id, unit=unit)
+    return peers
+
+
 def oldest_peer(peers):
     local_unit_no = int(os.getenv('JUJU_UNIT_NAME').split('/')[1])
     for peer in peers:
 
=== modified file 'tests/contrib/hahelpers/test_cluster_utils.py'
--- tests/contrib/hahelpers/test_cluster_utils.py	2014-07-23 08:25:09 +0000
+++ tests/contrib/hahelpers/test_cluster_utils.py	2014-07-29 11:12:10 +0000
@@ -69,6 +69,20 @@
         self.relation_list.return_value = peers
         self.assertEquals(peers, cluster_utils.peer_units())
 
+    def test_peer_ips(self):
+        '''Get a dict of peers and their ips'''
+        peers = {
+            'peer_node/1': '10.0.0.1',
+            'peer_node/2': '10.0.0.2',
+        }
+
+        def _relation_get(attr, rid, unit):
+            return peers[unit]
+        self.relation_ids.return_value = ['cluster:0']
+        self.relation_list.return_value = peers.keys()
+        self.relation_get.side_effect = _relation_get
+        self.assertEquals(peers, cluster_utils.peer_ips())
+
     @patch('os.getenv')
     def test_is_oldest_peer(self, getenv):
         '''It detects local unit is the oldest of all peers'''