Merge lp:~peter-sabaini/charm-helpers/charm-helpers-get_address_in_network into lp:charm-helpers

[Peter Sabaini]

 When searching for network, check all ipv4 addr for an iface

[Jorge Niedbalski (niedbalski)]

LGTM, I added an additional unit test to cover your change.

review: Approve

=== modified file 'charmhelpers/contrib/network/ip.py'
--- charmhelpers/contrib/network/ip.py	2017-03-24 16:50:31 +0000
+++ charmhelpers/contrib/network/ip.py	2017-03-31 13:26:40 +0000
@@ -111,11 +111,11 @@
         for iface in netifaces.interfaces():
             addresses = netifaces.ifaddresses(iface)
             if network.version == 4 and netifaces.AF_INET in addresses:
-                addr = addresses[netifaces.AF_INET][0]['addr']
-                netmask = addresses[netifaces.AF_INET][0]['netmask']
-                cidr = netaddr.IPNetwork("%s/%s" % (addr, netmask))
-                if cidr in network:
-                    return str(cidr.ip)
+                for addr in addresses[netifaces.AF_INET]:
+                    cidr = netaddr.IPNetwork("%s/%s" % (addr['addr'],
+                                                        addr['netmask']))
+                    if cidr in network:
+                        return str(cidr.ip)
 
             if network.version == 6 and netifaces.AF_INET6 in addresses:
                 for addr in addresses[netifaces.AF_INET6]: