Merge lp:~hopem/charm-helpers/lp1525845 into lp:charm-helpers

[Edward Hope-Morley]

[James Page (james-page)]

Some units tests would be nice :-)

review: Needs Fixing

=== modified file 'charmhelpers/contrib/network/ip.py'
--- charmhelpers/contrib/network/ip.py	2015-09-18 07:21:17 +0000
+++ charmhelpers/contrib/network/ip.py	2015-12-14 15:18:36 +0000
@@ -53,7 +53,7 @@
 
 
 def no_ip_found_error_out(network):
-    errmsg = ("No IP address found in network: %s" % network)
+    errmsg = ("No IP address found in network(s): %s" % network)
     raise ValueError(errmsg)
 
 
@@ -61,7 +61,7 @@
     """Get an IPv4 or IPv6 address within the network from the host.
 
     :param network (str): CIDR presentation format. For example,
-        '192.168.1.0/24'.
+        '192.168.1.0/24'. Supports multiple networks as a space-delimited list.
     :param fallback (str): If no address is found, return fallback.
     :param fatal (boolean): If no address is found, fallback is not
         set and fatal is True then exit(1).
@@ -75,24 +75,26 @@
         else:
             return None
 
-    _validate_cidr(network)
-    network = netaddr.IPNetwork(network)
-    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)
+    networks = network.split() or [network]
+    for network in networks:
+        _validate_cidr(network)
+        network = netaddr.IPNetwork(network)
+        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)
 
-        if network.version == 6 and netifaces.AF_INET6 in addresses:
-            for addr in addresses[netifaces.AF_INET6]:
-                if not addr['addr'].startswith('fe80'):
-                    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]:
+                    if not addr['addr'].startswith('fe80'):
+                        cidr = netaddr.IPNetwork("%s/%s" % (addr['addr'],
+                                                            addr['netmask']))
+                        if cidr in network:
+                            return str(cidr.ip)
 
     if fallback is not None:
         return fallback

=== modified file 'tests/contrib/network/test_ip.py'
--- tests/contrib/network/test_ip.py	2015-08-26 18:27:32 +0000
+++ tests/contrib/network/test_ip.py	2015-12-14 15:18:36 +0000
@@ -171,6 +171,17 @@
     def test_get_address_in_network_ipv4(self):
         self._test_get_address_in_network('192.168.1.55', '192.168.1.0/24')
 
+    def test_get_address_in_network_ipv4_multi(self):
+        # Assumes that there is an address configured on both but the first
+        # one is picked#
+        self._test_get_address_in_network('192.168.1.55',
+                                          '192.168.1.0/24 192.168.10.0/24')
+
+    def test_get_address_in_network_ipv4_multi2(self):
+        # Assumes that there is nothing configured on 192.168.11.0/24
+        self._test_get_address_in_network('192.168.10.58',
+                                          '192.168.11.0/24 192.168.10.0/24')
+
     def test_get_address_in_network_ipv6(self):
         self._test_get_address_in_network('2a01:348:2f4:0:685e:5748:ae62:209f',
                                           '2a01:348:2f4::/64')