Merge lp:~james-page/charm-helpers/is-ip-ipv6 into lp:charm-helpers

[James Page]

Ensure is_ip detects both IPv4 and IPv6 addresses.

[Liam Young (gnuoy)]

LGTM

review: Approve

=== modified file 'charmhelpers/contrib/network/ip.py'
--- charmhelpers/contrib/network/ip.py	2016-05-16 10:00:56 +0000
+++ charmhelpers/contrib/network/ip.py	2016-05-27 09:23:36 +0000
@@ -405,10 +405,10 @@
     Returns True if address is a valid IP address.
     """
     try:
-        # Test to see if already an IPv4 address
-        socket.inet_aton(address)
+        # Test to see if already an IPv4/IPv6 address
+        address = netaddr.IPAddress(address)
         return True
-    except socket.error:
+    except netaddr.AddrFormatError:
         return False
 
 

=== modified file 'tests/contrib/network/test_ip.py'
--- tests/contrib/network/test_ip.py	2016-05-13 17:30:00 +0000
+++ tests/contrib/network/test_ip.py	2016-05-27 09:23:36 +0000
@@ -590,6 +590,7 @@
 
     def test_is_ip(self):
         self.assertTrue(net_ip.is_ip('10.0.0.1'))
+        self.assertTrue(net_ip.is_ip('2001:db8:1:0:2918:3444:852:5b8a'))
         self.assertFalse(net_ip.is_ip('www.ubuntu.com'))
 
     @patch('charmhelpers.contrib.network.ip.apt_install')