diff options
Diffstat (limited to 'google-appengine/lib/ipaddr/ipaddr/ipaddr_test.py')
| -rwxr-xr-x | google-appengine/lib/ipaddr/ipaddr/ipaddr_test.py | 923 |
1 files changed, 624 insertions, 299 deletions
diff --git a/google-appengine/lib/ipaddr/ipaddr/ipaddr_test.py b/google-appengine/lib/ipaddr/ipaddr/ipaddr_test.py index 3a85705..f2d98f1 100755 --- a/google-appengine/lib/ipaddr/ipaddr/ipaddr_test.py +++ b/google-appengine/lib/ipaddr/ipaddr/ipaddr_test.py @@ -19,6 +19,7 @@ import unittest +import time import google3 import ipaddr @@ -32,73 +33,135 @@ else: class IpaddrUnitTest(unittest.TestCase): def setUp(self): - self.ipv4 = ipaddr.IPv4('1.2.3.4/24') - self.ipv4_hostmask = ipaddr.IPv4('10.0.0.1/0.255.255.255') - self.ipv6 = ipaddr.IPv6('2001:658:22a:cafe:200:0:0:1/64') + self.ipv4 = ipaddr.IPv4Network('1.2.3.4/24') + self.ipv4_hostmask = ipaddr.IPv4Network('10.0.0.1/0.255.255.255') + self.ipv6 = ipaddr.IPv6Network('2001:658:22a:cafe:200:0:0:1/64') + + def tearDown(self): + del(self.ipv4) + del(self.ipv4_hostmask) + del(self.ipv6) + del(self) def testRepr(self): - self.assertEqual("IPv4('1.2.3.4/32')", repr(ipaddr.IPv4('1.2.3.4'))) - self.assertEqual("IPv6('::1/128')", repr(ipaddr.IPv6('::1'))) + self.assertEqual("IPv4Network('1.2.3.4/32')", + repr(ipaddr.IPv4Network('1.2.3.4'))) + self.assertEqual("IPv6Network('::1/128')", + repr(ipaddr.IPv6Network('::1'))) def testInvalidStrings(self): - self.assertRaises(ValueError, ipaddr.IP, '') - self.assertRaises(ValueError, ipaddr.IP, 'www.google.com') - self.assertRaises(ValueError, ipaddr.IP, '1.2.3') - self.assertRaises(ValueError, ipaddr.IP, '1.2.3.4.5') - self.assertRaises(ValueError, ipaddr.IP, '301.2.2.2') - self.assertRaises(ValueError, ipaddr.IP, '1:2:3:4:5:6:7') - self.assertRaises(ValueError, ipaddr.IP, '1:2:3:4:5:6:7:') - self.assertRaises(ValueError, ipaddr.IP, ':2:3:4:5:6:7:8') - self.assertRaises(ValueError, ipaddr.IP, '1:2:3:4:5:6:7:8:9') - self.assertRaises(ValueError, ipaddr.IP, '1:2:3:4:5:6:7:8:') - self.assertRaises(ValueError, ipaddr.IP, '1::3:4:5:6::8') - self.assertRaises(ValueError, ipaddr.IP, 'a:') - self.assertRaises(ValueError, ipaddr.IP, ':') - self.assertRaises(ValueError, ipaddr.IP, ':::') - self.assertRaises(ValueError, ipaddr.IP, '::a:') - self.assertRaises(ValueError, ipaddr.IP, '1ffff::') - self.assertRaises(ValueError, ipaddr.IP, '0xa::') - self.assertRaises(ValueError, ipaddr.IP, '1:2:3:4:5:6:1a.2.3.4') - self.assertRaises(ValueError, ipaddr.IP, '1:2:3:4:5:1.2.3.4:8') - self.assertRaises(ipaddr.IPv4IpValidationError, ipaddr.IPv4, '') - self.assertRaises(ipaddr.IPv4IpValidationError, ipaddr.IPv4, + self.assertRaises(ValueError, ipaddr.IPNetwork, '') + self.assertRaises(ValueError, ipaddr.IPNetwork, 'www.google.com') + self.assertRaises(ValueError, ipaddr.IPNetwork, '1.2.3') + self.assertRaises(ValueError, ipaddr.IPNetwork, '1.2.3.4.5') + self.assertRaises(ValueError, ipaddr.IPNetwork, '301.2.2.2') + self.assertRaises(ValueError, ipaddr.IPNetwork, '1:2:3:4:5:6:7') + self.assertRaises(ValueError, ipaddr.IPNetwork, '1:2:3:4:5:6:7:') + self.assertRaises(ValueError, ipaddr.IPNetwork, ':2:3:4:5:6:7:8') + self.assertRaises(ValueError, ipaddr.IPNetwork, '1:2:3:4:5:6:7:8:9') + self.assertRaises(ValueError, ipaddr.IPNetwork, '1:2:3:4:5:6:7:8:') + self.assertRaises(ValueError, ipaddr.IPNetwork, '1::3:4:5:6::8') + self.assertRaises(ValueError, ipaddr.IPNetwork, 'a:') + self.assertRaises(ValueError, ipaddr.IPNetwork, ':') + self.assertRaises(ValueError, ipaddr.IPNetwork, ':::') + self.assertRaises(ValueError, ipaddr.IPNetwork, '::a:') + self.assertRaises(ValueError, ipaddr.IPNetwork, '1ffff::') + self.assertRaises(ValueError, ipaddr.IPNetwork, '0xa::') + self.assertRaises(ValueError, ipaddr.IPNetwork, '1:2:3:4:5:6:1a.2.3.4') + self.assertRaises(ValueError, ipaddr.IPNetwork, '1:2:3:4:5:1.2.3.4:8') + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv4Network, '') + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv4Network, 'google.com') - self.assertRaises(ipaddr.IPv4IpValidationError, ipaddr.IPv4, + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv4Network, '::1.2.3.4') - self.assertRaises(ipaddr.IPv6IpValidationError, ipaddr.IPv6, '') - self.assertRaises(ipaddr.IPv6IpValidationError, ipaddr.IPv6, + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network, '') + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network, 'google.com') - self.assertRaises(ipaddr.IPv6IpValidationError, ipaddr.IPv6, + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network, '1.2.3.4') + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network, + 'cafe:cafe::/128/190') + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network, + '1234:axy::b') + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Address, + '1234:axy::b') + self.assertRaises(ipaddr.AddressValueError, + ipaddr.IPv4Address(1)._ip_int_from_string, + '1.a.2.3') + self.assertEqual(False, ipaddr.IPv4Network(1)._is_hostmask('1.a.2.3')) def testGetNetwork(self): - self.assertEqual(self.ipv4.network, 16909056) - self.assertEqual(self.ipv4.network_ext, '1.2.3.0') - self.assertEqual(self.ipv4_hostmask.network_ext, '10.0.0.0') + self.assertEqual(int(self.ipv4.network), 16909056) + self.assertEqual(str(self.ipv4.network), '1.2.3.0') + self.assertEqual(str(self.ipv4_hostmask.network), '10.0.0.0') - self.assertEqual(self.ipv6.network, + self.assertEqual(int(self.ipv6.network), 42540616829182469433403647294022090752) - self.assertEqual(self.ipv6.network_ext, + self.assertEqual(str(self.ipv6.network), '2001:658:22a:cafe::') - self.assertEqual(self.ipv6.hostmask_ext, + self.assertEqual(str(self.ipv6.hostmask), '::ffff:ffff:ffff:ffff') + def testBadVersionComparison(self): + # These should always raise TypeError + v4addr = ipaddr.IPAddress('1.1.1.1') + v4net = ipaddr.IPNetwork('1.1.1.1') + v6addr = ipaddr.IPAddress('::1') + v6net = ipaddr.IPAddress('::1') + + self.assertRaises(TypeError, v4addr.__lt__, v6addr) + self.assertRaises(TypeError, v4addr.__gt__, v6addr) + self.assertRaises(TypeError, v4net.__lt__, v6net) + self.assertRaises(TypeError, v4net.__gt__, v6net) + + self.assertRaises(TypeError, v6addr.__lt__, v4addr) + self.assertRaises(TypeError, v6addr.__gt__, v4addr) + self.assertRaises(TypeError, v6net.__lt__, v4net) + self.assertRaises(TypeError, v6net.__gt__, v4net) + + def testMixedTypeComparison(self): + v4addr = ipaddr.IPAddress('1.1.1.1') + v4net = ipaddr.IPNetwork('1.1.1.1/32') + v6addr = ipaddr.IPAddress('::1') + v6net = ipaddr.IPNetwork('::1/128') + + self.assertRaises(TypeError, lambda: v4addr < v4net) + self.assertRaises(TypeError, lambda: v4addr > v4net) + self.assertRaises(TypeError, lambda: v4net < v4addr) + self.assertRaises(TypeError, lambda: v4net > v4addr) + + self.assertRaises(TypeError, lambda: v6addr < v6net) + self.assertRaises(TypeError, lambda: v6addr > v6net) + self.assertRaises(TypeError, lambda: v6net < v6addr) + self.assertRaises(TypeError, lambda: v6net > v6addr) + + # with get_mixed_type_key, you can sort addresses and network. + self.assertEqual([v4addr, v4net], sorted([v4net, v4addr], + key=ipaddr.get_mixed_type_key)) + self.assertEqual([v6addr, v6net], sorted([v6net, v6addr], + key=ipaddr.get_mixed_type_key)) + def testIpFromInt(self): - self.assertEqual(self.ipv4.ip, ipaddr.IPv4(16909060).ip) - self.assertRaises(ipaddr.IPv4IpValidationError, - ipaddr.IPv4, 2**32) - self.assertRaises(ipaddr.IPv4IpValidationError, - ipaddr.IPv4, -1) - - self.assertEqual(self.ipv6.ip, - ipaddr.IPv6(42540616829182469433547762482097946625).ip) - self.assertRaises(ipaddr.IPv6IpValidationError, - ipaddr.IPv6, 2**128) - self.assertRaises(ipaddr.IPv6IpValidationError, - ipaddr.IPv6, -1) - - self.assertEqual(ipaddr.IP(self.ipv4.ip).version, 4) - self.assertEqual(ipaddr.IP(self.ipv6.ip).version, 6) + self.assertEqual(self.ipv4.ip, ipaddr.IPv4Network(16909060).ip) + self.assertRaises(ipaddr.AddressValueError, + ipaddr.IPv4Network, 2**32) + self.assertRaises(ipaddr.AddressValueError, + ipaddr.IPv4Network, -1) + + ipv4 = ipaddr.IPNetwork('1.2.3.4') + ipv6 = ipaddr.IPNetwork('2001:658:22a:cafe:200:0:0:1') + self.assertEqual(ipv4, ipaddr.IPNetwork(int(ipv4))) + self.assertEqual(ipv6, ipaddr.IPNetwork(int(ipv6))) + + v6_int = 42540616829182469433547762482097946625 + self.assertEqual(self.ipv6.ip, ipaddr.IPv6Network(v6_int).ip) + self.assertRaises(ipaddr.AddressValueError, + ipaddr.IPv6Network, 2**128) + self.assertRaises(ipaddr.AddressValueError, + ipaddr.IPv6Network, -1) + + self.assertEqual(ipaddr.IPNetwork(self.ipv4.ip).version, 4) + self.assertEqual(ipaddr.IPNetwork(self.ipv6.ip).version, 6) if ipaddr._compat_has_real_bytes: # on python3+ def testIpFromPacked(self): @@ -122,41 +185,39 @@ class IpaddrUnitTest(unittest.TestCase): self.assertRaises(ValueError, ip, _cb('\x00' * 17)) def testGetIp(self): - self.assertEqual(self.ipv4.ip, 16909060) - self.assertEqual(self.ipv4.ip_ext, '1.2.3.4') - self.assertEqual(self.ipv4.ip_ext_full, '1.2.3.4') - self.assertEqual(self.ipv4_hostmask.ip_ext, '10.0.0.1') + self.assertEqual(int(self.ipv4.ip), 16909060) + self.assertEqual(str(self.ipv4.ip), '1.2.3.4') + self.assertEqual(str(self.ipv4_hostmask.ip), '10.0.0.1') - self.assertEqual(self.ipv6.ip, 42540616829182469433547762482097946625) - self.assertEqual(self.ipv6.ip_ext, + self.assertEqual(int(self.ipv6.ip), + 42540616829182469433547762482097946625) + self.assertEqual(str(self.ipv6.ip), '2001:658:22a:cafe:200::1') - self.assertEqual(self.ipv6.ip_ext_full, - '2001:0658:022a:cafe:0200:0000:0000:0001') def testGetNetmask(self): - self.assertEqual(self.ipv4.netmask, 4294967040L) - self.assertEqual(self.ipv4.netmask_ext, '255.255.255.0') - self.assertEqual(self.ipv4_hostmask.netmask_ext, '255.0.0.0') - self.assertEqual(self.ipv6.netmask, + self.assertEqual(int(self.ipv4.netmask), 4294967040L) + self.assertEqual(str(self.ipv4.netmask), '255.255.255.0') + self.assertEqual(str(self.ipv4_hostmask.netmask), '255.0.0.0') + self.assertEqual(int(self.ipv6.netmask), 340282366920938463444927863358058659840) - self.assertEqual(self.ipv6.netmask_ext, 64) + self.assertEqual(self.ipv6.prefixlen, 64) def testZeroNetmask(self): - ipv4_zero_netmask = ipaddr.IPv4('1.2.3.4/0') - self.assertEqual(ipv4_zero_netmask.netmask, 0) + ipv4_zero_netmask = ipaddr.IPv4Network('1.2.3.4/0') + self.assertEqual(int(ipv4_zero_netmask.netmask), 0) self.assert_(ipv4_zero_netmask._is_valid_netmask(str(0))) - ipv6_zero_netmask = ipaddr.IPv6('::1/0') - self.assertEqual(ipv6_zero_netmask.netmask, 0) + ipv6_zero_netmask = ipaddr.IPv6Network('::1/0') + self.assertEqual(int(ipv6_zero_netmask.netmask), 0) self.assert_(ipv6_zero_netmask._is_valid_netmask(str(0))) def testGetBroadcast(self): - self.assertEqual(self.ipv4.broadcast, 16909311L) - self.assertEqual(self.ipv4.broadcast_ext, '1.2.3.255') + self.assertEqual(int(self.ipv4.broadcast), 16909311L) + self.assertEqual(str(self.ipv4.broadcast), '1.2.3.255') - self.assertEqual(self.ipv6.broadcast, + self.assertEqual(int(self.ipv6.broadcast), 42540616829182469451850391367731642367) - self.assertEqual(self.ipv6.broadcast_ext, + self.assertEqual(str(self.ipv6.broadcast), '2001:658:22a:cafe:ffff:ffff:ffff:ffff') def testGetPrefixlen(self): @@ -166,39 +227,69 @@ class IpaddrUnitTest(unittest.TestCase): def testGetSupernet(self): self.assertEqual(self.ipv4.supernet().prefixlen, 23) - self.assertEqual(self.ipv4.supernet().network_ext, '1.2.2.0') - self.assertEqual(ipaddr.IPv4('0.0.0.0/0').supernet(), - ipaddr.IPv4('0.0.0.0/0')) + self.assertEqual(str(self.ipv4.supernet().network), '1.2.2.0') + self.assertEqual(ipaddr.IPv4Network('0.0.0.0/0').supernet(), + ipaddr.IPv4Network('0.0.0.0/0')) self.assertEqual(self.ipv6.supernet().prefixlen, 63) - self.assertEqual(self.ipv6.supernet().network_ext, + self.assertEqual(str(self.ipv6.supernet().network), '2001:658:22a:cafe::') - self.assertEqual(ipaddr.IPv6('::0/0').supernet(), ipaddr.IPv6('::0/0')) + self.assertEqual(ipaddr.IPv6Network('::0/0').supernet(), + ipaddr.IPv6Network('::0/0')) def testGetSupernet3(self): self.assertEqual(self.ipv4.supernet(3).prefixlen, 21) - self.assertEqual(self.ipv4.supernet(3).network_ext, '1.2.0.0') + self.assertEqual(str(self.ipv4.supernet(3).network), '1.2.0.0') self.assertEqual(self.ipv6.supernet(3).prefixlen, 61) - self.assertEqual(self.ipv6.supernet(3).network_ext, + self.assertEqual(str(self.ipv6.supernet(3).network), '2001:658:22a:caf8::') + def testGetSupernet4(self): + self.assertRaises(ValueError, self.ipv4.supernet, prefixlen_diff=2, + new_prefix=1) + self.assertRaises(ValueError, self.ipv4.supernet, new_prefix=25) + self.assertEqual(self.ipv4.supernet(prefixlen_diff=2), + self.ipv4.supernet(new_prefix=22)) + + self.assertRaises(ValueError, self.ipv6.supernet, prefixlen_diff=2, + new_prefix=1) + self.assertRaises(ValueError, self.ipv6.supernet, new_prefix=65) + self.assertEqual(self.ipv6.supernet(prefixlen_diff=2), + self.ipv6.supernet(new_prefix=62)) + + def testIterSubnets(self): + self.assertEqual(self.ipv4.subnet(), list(self.ipv4.iter_subnets())) + self.assertEqual(self.ipv6.subnet(), list(self.ipv6.iter_subnets())) + + def testFancySubnetting(self): + self.assertEqual(sorted(self.ipv4.subnet(prefixlen_diff=3)), + sorted(self.ipv4.subnet(new_prefix=27))) + self.assertRaises(ValueError, self.ipv4.subnet, new_prefix=23) + self.assertRaises(ValueError, self.ipv4.subnet, + prefixlen_diff=3, new_prefix=27) + self.assertEqual(sorted(self.ipv6.subnet(prefixlen_diff=4)), + sorted(self.ipv6.subnet(new_prefix=68))) + self.assertRaises(ValueError, self.ipv6.subnet, new_prefix=63) + self.assertRaises(ValueError, self.ipv6.subnet, + prefixlen_diff=4, new_prefix=68) + def testGetSubnet(self): self.assertEqual(self.ipv4.subnet()[0].prefixlen, 25) - self.assertEqual(self.ipv4.subnet()[0].network_ext, '1.2.3.0') - self.assertEqual(self.ipv4.subnet()[1].network_ext, '1.2.3.128') + self.assertEqual(str(self.ipv4.subnet()[0].network), '1.2.3.0') + self.assertEqual(str(self.ipv4.subnet()[1].network), '1.2.3.128') self.assertEqual(self.ipv6.subnet()[0].prefixlen, 65) def testGetSubnetForSingle32(self): - ip = ipaddr.IPv4('1.2.3.4/32') + ip = ipaddr.IPv4Network('1.2.3.4/32') subnets1 = [str(x) for x in ip.subnet()] subnets2 = [str(x) for x in ip.subnet(2)] self.assertEqual(subnets1, ['1.2.3.4/32']) self.assertEqual(subnets1, subnets2) def testGetSubnetForSingle128(self): - ip = ipaddr.IPv6('::1/128') + ip = ipaddr.IPv6Network('::1/128') subnets1 = [str(x) for x in ip.subnet()] subnets2 = [str(x) for x in ip.subnet(2)] self.assertEqual(subnets1, ['::1/128']) @@ -219,21 +310,16 @@ class IpaddrUnitTest(unittest.TestCase): '2001:658:22a:cafe:c000::/66']) def testSubnetFailsForLargeCidrDiff(self): - self.assertRaises(ipaddr.PrefixlenDiffInvalidError, self.ipv4.subnet, 9) - self.assertRaises(ipaddr.PrefixlenDiffInvalidError, self.ipv6.subnet, - 65) + self.assertRaises(ValueError, self.ipv4.subnet, 9) + self.assertRaises(ValueError, self.ipv6.subnet, 65) def testSupernetFailsForLargeCidrDiff(self): - self.assertRaises(ipaddr.PrefixlenDiffInvalidError, self.ipv4.supernet, - 25) - self.assertRaises(ipaddr.PrefixlenDiffInvalidError, self.ipv6.supernet, - 65) + self.assertRaises(ValueError, self.ipv4.supernet, 25) + self.assertRaises(ValueError, self.ipv6.supernet, 65) def testSubnetFailsForNegativeCidrDiff(self): - self.assertRaises(ipaddr.PrefixlenDiffInvalidError, self.ipv4.subnet, - -1) - self.assertRaises(ipaddr.PrefixlenDiffInvalidError, self.ipv6.subnet, - -1) + self.assertRaises(ValueError, self.ipv4.subnet, -1) + self.assertRaises(ValueError, self.ipv6.subnet, -1) def testGetNumHosts(self): self.assertEqual(self.ipv4.numhosts, 256) @@ -245,135 +331,221 @@ class IpaddrUnitTest(unittest.TestCase): self.assertEqual(self.ipv6.supernet().numhosts, 36893488147419103232) def testContains(self): - self.assertTrue(ipaddr.IPv4('1.2.3.128/25') in self.ipv4) - self.assertFalse(ipaddr.IPv4('1.2.4.1/24') in self.ipv4) + self.assertTrue(ipaddr.IPv4Network('1.2.3.128/25') in self.ipv4) + self.assertFalse(ipaddr.IPv4Network('1.2.4.1/24') in self.ipv4) self.assertFalse(self.ipv4 in self.ipv6) self.assertFalse(self.ipv6 in self.ipv4) self.assertTrue(self.ipv4 in self.ipv4) self.assertTrue(self.ipv6 in self.ipv6) + # We can test addresses and string as well. + addr1 = ipaddr.IPv4Address('1.2.3.37') + self.assertTrue(addr1 in self.ipv4) def testBadAddress(self): - self.assertRaises(ipaddr.IPv4IpValidationError, ipaddr.IPv4, 'poop') - self.assertRaises(ipaddr.IPv4IpValidationError, - ipaddr.IPv4, '1.2.3.256') - - self.assertRaises(ipaddr.IPv6IpValidationError, ipaddr.IPv6, 'poopv6') - self.assertRaises(ipaddr.IPv4IpValidationError, - ipaddr.IPv4, '1.2.3.4/32/24') + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv4Network, + 'poop') + self.assertRaises(ipaddr.AddressValueError, + ipaddr.IPv4Network, '1.2.3.256') + + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network, + 'poopv6') + self.assertRaises(ipaddr.AddressValueError, + ipaddr.IPv4Network, '1.2.3.4/32/24') + self.assertRaises(ipaddr.AddressValueError, + ipaddr.IPv4Network, '10/8') + self.assertRaises(ipaddr.AddressValueError, + ipaddr.IPv6Network, '10/8') + def testBadNetMask(self): - self.assertRaises(ipaddr.IPv4NetmaskValidationError, - ipaddr.IPv4, '1.2.3.4/') - self.assertRaises(ipaddr.IPv4NetmaskValidationError, - ipaddr.IPv4, '1.2.3.4/33') - self.assertRaises(ipaddr.IPv4NetmaskValidationError, - ipaddr.IPv4, '1.2.3.4/254.254.255.256') - - self.assertRaises(ipaddr.IPv6NetmaskValidationError, - ipaddr.IPv6, '::1/') - self.assertRaises(ipaddr.IPv6NetmaskValidationError, - ipaddr.IPv6, '::1/129') + self.assertRaises(ipaddr.NetmaskValueError, + ipaddr.IPv4Network, '1.2.3.4/') + self.assertRaises(ipaddr.NetmaskValueError, + ipaddr.IPv4Network, '1.2.3.4/33') + self.assertRaises(ipaddr.NetmaskValueError, + ipaddr.IPv4Network, '1.2.3.4/254.254.255.256') + self.assertRaises(ipaddr.NetmaskValueError, + ipaddr.IPv4Network, '1.1.1.1/240.255.0.0') + self.assertRaises(ipaddr.NetmaskValueError, + ipaddr.IPv6Network, '::1/') + self.assertRaises(ipaddr.NetmaskValueError, + ipaddr.IPv6Network, '::1/129') def testNth(self): - self.assertEqual(self.ipv4[5], '1.2.3.5') + self.assertEqual(str(self.ipv4[5]), '1.2.3.5') self.assertRaises(IndexError, self.ipv4.__getitem__, 256) - self.assertEqual(self.ipv6[5], + self.assertEqual(str(self.ipv6[5]), '2001:658:22a:cafe::5') def testGetitem(self): # http://code.google.com/p/ipaddr-py/issues/detail?id=15 - addr = ipaddr.IPv4('172.31.255.128/255.255.255.240') + addr = ipaddr.IPv4Network('172.31.255.128/255.255.255.240') self.assertEqual(28, addr.prefixlen) addr_list = list(addr) - self.assertEqual('172.31.255.128', addr_list[0]) - self.assertEqual('172.31.255.128', addr[0]) - self.assertEqual('172.31.255.143', addr_list[-1]) - self.assertEqual('172.31.255.143', addr[-1]) + self.assertEqual('172.31.255.128', str(addr_list[0])) + self.assertEqual('172.31.255.128', str(addr[0])) + self.assertEqual('172.31.255.143', str(addr_list[-1])) + self.assertEqual('172.31.255.143', str(addr[-1])) self.assertEqual(addr_list[-1], addr[-1]) def testEquals(self): - self.assertTrue(self.ipv4 == ipaddr.IPv4('1.2.3.4/24')) - self.assertFalse(self.ipv4 == ipaddr.IPv4('1.2.3.4/23')) - self.assertFalse(self.ipv4 == ipaddr.IPv4('1.2.3.5/24')) - self.assertFalse(self.ipv4 == ipaddr.IPv6('::1.2.3.4/24')) + self.assertTrue(self.ipv4 == ipaddr.IPv4Network('1.2.3.4/24')) + self.assertFalse(self.ipv4 == ipaddr.IPv4Network('1.2.3.4/23')) + self.assertFalse(self.ipv4 == ipaddr.IPv6Network('::1.2.3.4/24')) self.assertFalse(self.ipv4 == '') self.assertFalse(self.ipv4 == []) self.assertFalse(self.ipv4 == 2) self.assertTrue(self.ipv6 == - ipaddr.IPv6('2001:658:22a:cafe:200::1/64')) + ipaddr.IPv6Network('2001:658:22a:cafe:200::1/64')) self.assertFalse(self.ipv6 == - ipaddr.IPv6('2001:658:22a:cafe:200::1/63')) - self.assertFalse(self.ipv6 == - ipaddr.IPv6('2001:658:22a:cafe:200::2/64')) - self.assertFalse(self.ipv6 == ipaddr.IPv4('1.2.3.4/23')) + ipaddr.IPv6Network('2001:658:22a:cafe:200::1/63')) + self.assertFalse(self.ipv6 == ipaddr.IPv4Network('1.2.3.4/23')) self.assertFalse(self.ipv6 == '') self.assertFalse(self.ipv6 == []) self.assertFalse(self.ipv6 == 2) def testNotEquals(self): - self.assertFalse(self.ipv4 != ipaddr.IPv4('1.2.3.4/24')) - self.assertTrue(self.ipv4 != ipaddr.IPv4('1.2.3.4/23')) - self.assertTrue(self.ipv4 != ipaddr.IPv4('1.2.3.5/24')) - self.assertTrue(self.ipv4 != ipaddr.IPv6('::1.2.3.4/24')) + self.assertFalse(self.ipv4 != ipaddr.IPv4Network('1.2.3.4/24')) + self.assertTrue(self.ipv4 != ipaddr.IPv4Network('1.2.3.4/23')) + self.assertTrue(self.ipv4 != ipaddr.IPv6Network('::1.2.3.4/24')) self.assertTrue(self.ipv4 != '') self.assertTrue(self.ipv4 != []) self.assertTrue(self.ipv4 != 2) self.assertFalse(self.ipv6 != - ipaddr.IPv6('2001:658:22a:cafe:200::1/64')) - self.assertTrue(self.ipv6 != - ipaddr.IPv6('2001:658:22a:cafe:200::1/63')) + ipaddr.IPv6Network('2001:658:22a:cafe:200::1/64')) self.assertTrue(self.ipv6 != - ipaddr.IPv6('2001:658:22a:cafe:200::2/64')) - self.assertTrue(self.ipv6 != ipaddr.IPv4('1.2.3.4/23')) + ipaddr.IPv6Network('2001:658:22a:cafe:200::1/63')) + self.assertTrue(self.ipv6 != ipaddr.IPv4Network('1.2.3.4/23')) self.assertTrue(self.ipv6 != '') self.assertTrue(self.ipv6 != []) self.assertTrue(self.ipv6 != 2) def testSlash32Constructor(self): - self.assertEquals(str(ipaddr.IPv4('1.2.3.4/255.255.255.255')), + self.assertEquals(str(ipaddr.IPv4Network('1.2.3.4/255.255.255.255')), '1.2.3.4/32') def testSlash128Constructor(self): - self.assertEquals(str(ipaddr.IPv6('::1/128')), + self.assertEquals(str(ipaddr.IPv6Network('::1/128')), '::1/128') def testSlash0Constructor(self): - self.assertEquals(str(ipaddr.IPv4('1.2.3.4/0.0.0.0')), '1.2.3.4/0') + self.assertEquals(str(ipaddr.IPv4Network('1.2.3.4/0.0.0.0')), + '1.2.3.4/0') def testCollapsing(self): - ip1 = ipaddr.IPv4('1.1.0.0/24') - ip2 = ipaddr.IPv4('1.1.1.0/24') - ip3 = ipaddr.IPv4('1.1.2.0/24') - ip4 = ipaddr.IPv4('1.1.3.0/24') - ip5 = ipaddr.IPv4('1.1.4.0/24') + # test only IP addresses including some duplicates + ip1 = ipaddr.IPv4Address('1.1.1.0') + ip2 = ipaddr.IPv4Address('1.1.1.1') + ip3 = ipaddr.IPv4Address('1.1.1.2') + ip4 = ipaddr.IPv4Address('1.1.1.3') + ip5 = ipaddr.IPv4Address('1.1.1.4') + ip6 = ipaddr.IPv4Address('1.1.1.0') + # check that addreses are subsumed properly. + collapsed = ipaddr.collapse_address_list([ip1, ip2, ip3, ip4, ip5, ip6]) + self.assertEqual(collapsed, [ipaddr.IPv4Network('1.1.1.0/30'), + ipaddr.IPv4Network('1.1.1.4/32')]) + + # test a mix of IP addresses and networks including some duplicates + ip1 = ipaddr.IPv4Address('1.1.1.0') + ip2 = ipaddr.IPv4Address('1.1.1.1') + ip3 = ipaddr.IPv4Address('1.1.1.2') + ip4 = ipaddr.IPv4Address('1.1.1.3') + ip5 = ipaddr.IPv4Network('1.1.1.4/30') + ip6 = ipaddr.IPv4Network('1.1.1.4/30') + # check that addreses are subsumed properly. + collapsed = ipaddr.collapse_address_list([ip5, ip1, ip2, ip3, ip4, ip6]) + self.assertEqual(collapsed, [ipaddr.IPv4Network('1.1.1.0/29')]) + + # test only IP networks + ip1 = ipaddr.IPv4Network('1.1.0.0/24') + ip2 = ipaddr.IPv4Network('1.1.1.0/24') + ip3 = ipaddr.IPv4Network('1.1.2.0/24') + ip4 = ipaddr.IPv4Network('1.1.3.0/24') + ip5 = ipaddr.IPv4Network('1.1.4.0/24') # stored in no particular order b/c we want CollapseAddr to call [].sort - ip6 = ipaddr.IPv4('1.1.0.0/22') - # check that addreses are subsumed properlly. + ip6 = ipaddr.IPv4Network('1.1.0.0/22') + # check that addreses are subsumed properly. collapsed = ipaddr.collapse_address_list([ip1, ip2, ip3, ip4, ip5, ip6]) - self.assertEqual(collapsed, [ipaddr.IPv4('1.1.0.0/22'), - ipaddr.IPv4('1.1.4.0/24')]) - # test that two addresses are supernet'ed properlly + self.assertEqual(collapsed, [ipaddr.IPv4Network('1.1.0.0/22'), + ipaddr.IPv4Network('1.1.4.0/24')]) + + # test that two addresses are supernet'ed properly collapsed = ipaddr.collapse_address_list([ip1, ip2]) - self.assertEqual(collapsed, [ipaddr.IPv4('1.1.0.0/23')]) + self.assertEqual(collapsed, [ipaddr.IPv4Network('1.1.0.0/23')]) - ip_same1 = ip_same2 = ipaddr.IPv4('1.1.1.1/32') + # test same IP networks + ip_same1 = ip_same2 = ipaddr.IPv4Network('1.1.1.1/32') self.assertEqual(ipaddr.collapse_address_list([ip_same1, ip_same2]), [ip_same1]) - ip1 = ipaddr.IPv6('::2001:1/100') - ip2 = ipaddr.IPv6('::2002:1/120') - ip3 = ipaddr.IPv6('::2001:1/96') + + # test same IP addresses + ip_same1 = ip_same2 = ipaddr.IPv4Address('1.1.1.1') + self.assertEqual(ipaddr.collapse_address_list([ip_same1, ip_same2]), + [ip_same1]) + ip1 = ipaddr.IPv6Network('::2001:1/100') + ip2 = ipaddr.IPv6Network('::2002:1/120') + ip3 = ipaddr.IPv6Network('::2001:1/96') # test that ipv6 addresses are subsumed properly. collapsed = ipaddr.collapse_address_list([ip1, ip2, ip3]) self.assertEqual(collapsed, [ip3]) + # the toejam test + ip1 = ipaddr.IPAddress('1.1.1.1') + ip2 = ipaddr.IPAddress('::1') + self.assertRaises(TypeError, ipaddr.collapse_address_list, + [ip1, ip2]) + + def testSummarizing(self): + #ip = ipaddr.IPAddress + #ipnet = ipaddr.IPNetwork + summarize = ipaddr.summarize_address_range + ip1 = ipaddr.IPAddress('1.1.1.0') + ip2 = ipaddr.IPAddress('1.1.1.255') + # test a /24 is sumamrized properly + self.assertEqual(summarize(ip1, ip2)[0], ipaddr.IPNetwork('1.1.1.0/24')) + # test an IPv4 range that isn't on a network byte boundary + ip2 = ipaddr.IPAddress('1.1.1.8') + self.assertEqual(summarize(ip1, ip2), [ipaddr.IPNetwork('1.1.1.0/29'), + ipaddr.IPNetwork('1.1.1.8')]) + + ip1 = ipaddr.IPAddress('1::') + ip2 = ipaddr.IPAddress('1:ffff:ffff:ffff:ffff:ffff:ffff:ffff') + # test a IPv6 is sumamrized properly + self.assertEqual(summarize(ip1, ip2)[0], ipaddr.IPNetwork('1::/16')) + # test an IPv6 range that isn't on a network byte boundary + ip2 = ipaddr.IPAddress('2::') + self.assertEqual(summarize(ip1, ip2), [ipaddr.IPNetwork('1::/16'), + ipaddr.IPNetwork('2::/128')]) + + # test exception raised when first is greater than last + self.assertRaises(ValueError, summarize, ipaddr.IPAddress('1.1.1.0'), + ipaddr.IPAddress('1.1.0.0')) + # test exception raised when first and last aren't IP addresses + self.assertRaises(TypeError, summarize, + ipaddr.IPNetwork('1.1.1.0'), + ipaddr.IPNetwork('1.1.0.0')) + self.assertRaises(TypeError, summarize, + ipaddr.IPNetwork('1.1.1.0'), ipaddr.IPNetwork('1.1.0.0')) + # test exception raised when first and last are not same version + self.assertRaises(TypeError, summarize, ipaddr.IPAddress('::'), + ipaddr.IPNetwork('1.1.0.0')) + + def testAddressComparison(self): + self.assertTrue(ipaddr.IPAddress('1.1.1.1') <= + ipaddr.IPAddress('1.1.1.1')) + self.assertTrue(ipaddr.IPAddress('1.1.1.1') <= + ipaddr.IPAddress('1.1.1.2')) + self.assertTrue(ipaddr.IPAddress('::1') <= ipaddr.IPAddress('::1')) + self.assertTrue(ipaddr.IPAddress('::1') <= ipaddr.IPAddress('::2')) + def testNetworkComparison(self): # ip1 and ip2 have the same network address - ip1 = ipaddr.IPv4('1.1.1.0/24') - ip2 = ipaddr.IPv4('1.1.1.1/24') - ip3 = ipaddr.IPv4('1.1.2.0/24') + ip1 = ipaddr.IPv4Network('1.1.1.0/24') + ip2 = ipaddr.IPv4Network('1.1.1.1/24') + ip3 = ipaddr.IPv4Network('1.1.2.0/24') self.assertTrue(ip1 < ip3) self.assertTrue(ip3 > ip2) @@ -383,9 +555,9 @@ class IpaddrUnitTest(unittest.TestCase): self.assertEquals(ip1.compare_networks(ip3), -1) self.assertTrue(ip1._get_networks_key() < ip3._get_networks_key()) - ip1 = ipaddr.IPv6('2001::2000/96') - ip2 = ipaddr.IPv6('2001::2001/96') - ip3 = ipaddr.IPv6('2001:ffff::2000/96') + ip1 = ipaddr.IPv6Network('2001::2000/96') + ip2 = ipaddr.IPv6Network('2001::2001/96') + ip3 = ipaddr.IPv6Network('2001:ffff::2000/96') self.assertTrue(ip1 < ip3) self.assertTrue(ip3 > ip2) @@ -394,35 +566,62 @@ class IpaddrUnitTest(unittest.TestCase): self.assertEquals(ip1.compare_networks(ip3), -1) self.assertTrue(ip1._get_networks_key() < ip3._get_networks_key()) - # Test comparing different protocols - ipv6 = ipaddr.IPv6('::/0') - ipv4 = ipaddr.IPv4('0.0.0.0/0') - self.assertTrue(ipv6 > ipv4) - self.assertTrue(ipv4 < ipv6) + # Test comparing different protocols. + # Should always raise a TypeError. + ipv6 = ipaddr.IPv6Network('::/0') + ipv4 = ipaddr.IPv4Network('0.0.0.0/0') + self.assertRaises(TypeError, ipv4.__lt__, ipv6) + self.assertRaises(TypeError, ipv4.__gt__, ipv6) + self.assertRaises(TypeError, ipv6.__lt__, ipv4) + self.assertRaises(TypeError, ipv6.__gt__, ipv4) # Regression test for issue 19. - ip1 = ipaddr.IP('10.1.2.128/25') + ip1 = ipaddr.IPNetwork('10.1.2.128/25') self.assertFalse(ip1 < ip1) self.assertFalse(ip1 > ip1) - ip2 = ipaddr.IP('10.1.3.0/24') + ip2 = ipaddr.IPNetwork('10.1.3.0/24') self.assertTrue(ip1 < ip2) self.assertFalse(ip2 < ip1) self.assertFalse(ip1 > ip2) self.assertTrue(ip2 > ip1) - ip3 = ipaddr.IP('10.1.3.0/25') + ip3 = ipaddr.IPNetwork('10.1.3.0/25') self.assertTrue(ip2 < ip3) self.assertFalse(ip3 < ip2) self.assertFalse(ip2 > ip3) self.assertTrue(ip3 > ip2) + # <=, >= + self.assertTrue(ipaddr.IPNetwork('1.1.1.1') <= + ipaddr.IPNetwork('1.1.1.1')) + self.assertTrue(ipaddr.IPNetwork('1.1.1.1') <= + ipaddr.IPNetwork('1.1.1.2')) + self.assertFalse(ipaddr.IPNetwork('1.1.1.2') <= + ipaddr.IPNetwork('1.1.1.1')) + self.assertTrue(ipaddr.IPNetwork('::1') <= ipaddr.IPNetwork('::1')) + self.assertTrue(ipaddr.IPNetwork('::1') <= ipaddr.IPNetwork('::2')) + self.assertFalse(ipaddr.IPNetwork('::2') <= ipaddr.IPNetwork('::1')) + + def testStrictNetworks(self): + self.assertRaises(ValueError, ipaddr.IPNetwork, '192.168.1.1/24', + strict=True) + self.assertRaises(ValueError, ipaddr.IPNetwork, '::1/120', strict=True) + + def testOverlaps(self): + other = ipaddr.IPv4Network('1.2.3.0/30') + other2 = ipaddr.IPv4Network('1.2.2.0/24') + other3 = ipaddr.IPv4Network('1.2.2.64/26') + self.assertTrue(self.ipv4.overlaps(other)) + self.assertFalse(self.ipv4.overlaps(other2)) + self.assertTrue(other2.overlaps(other3)) + def testEmbeddedIpv4(self): ipv4_string = '192.168.0.1' - ipv4 = ipaddr.IPv4(ipv4_string) - v4compat_ipv6 = ipaddr.IPv6('::%s' % ipv4_string) - self.assertEquals(v4compat_ipv6.ip, ipv4.ip) - v4mapped_ipv6 = ipaddr.IPv6('::ffff:%s' % ipv4_string) + ipv4 = ipaddr.IPv4Network(ipv4_string) + v4compat_ipv6 = ipaddr.IPv6Network('::%s' % ipv4_string) + self.assertEquals(int(v4compat_ipv6.ip), int(ipv4.ip)) + v4mapped_ipv6 = ipaddr.IPv6Network('::ffff:%s' % ipv4_string) self.assertNotEquals(v4mapped_ipv6.ip, ipv4.ip) - self.assertRaises(ipaddr.IPv6IpValidationError, ipaddr.IPv6, + self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network, '2001:1.1.1.1:1.1.1.1') def testIPVersion(self): @@ -432,127 +631,186 @@ class IpaddrUnitTest(unittest.TestCase): def testPacked(self): self.assertEqual(self.ipv4.packed, _cb('\x01\x02\x03\x04')) - self.assertEqual(ipaddr.IPv4('255.254.253.252').packed, + self.assertEqual(ipaddr.IPv4Network('255.254.253.252').packed, _cb('\xff\xfe\xfd\xfc')) self.assertEqual(self.ipv6.packed, _cb('\x20\x01\x06\x58\x02\x2a\xca\xfe' '\x02\x00\x00\x00\x00\x00\x00\x01')) - self.assertEqual(ipaddr.IPv6('ffff:2:3:4:ffff::').packed, + self.assertEqual(ipaddr.IPv6Network('ffff:2:3:4:ffff::').packed, _cb('\xff\xff\x00\x02\x00\x03\x00\x04\xff\xff' + '\x00' * 6)) - self.assertEqual(ipaddr.IPv6('::1:0:0:0:0').packed, + self.assertEqual(ipaddr.IPv6Network('::1:0:0:0:0').packed, _cb('\x00' * 6 + '\x00\x01' + '\x00' * 8)) def testIpStrFromPrefixlen(self): - ipv4 = ipaddr.IPv4('1.2.3.4/24') + ipv4 = ipaddr.IPv4Network('1.2.3.4/24') self.assertEquals(ipv4._ip_string_from_prefix(), '255.255.255.0') self.assertEquals(ipv4._ip_string_from_prefix(28), '255.255.255.240') def testIpType(self): - ipv4 = ipaddr.IP('1.2.3.4') - ipv6 = ipaddr.IP('::1.2.3.4') - self.assertEquals(ipaddr.IPv4, type(ipv4)) - self.assertEquals(ipaddr.IPv6, type(ipv6)) + ipv4net = ipaddr.IPNetwork('1.2.3.4') + ipv4addr = ipaddr.IPAddress('1.2.3.4') + ipv6net = ipaddr.IPNetwork('::1.2.3.4') + ipv6addr = ipaddr.IPAddress('::1.2.3.4') + self.assertEquals(ipaddr.IPv4Network, type(ipv4net)) + self.assertEquals(ipaddr.IPv4Address, type(ipv4addr)) + self.assertEquals(ipaddr.IPv6Network, type(ipv6net)) + self.assertEquals(ipaddr.IPv6Address, type(ipv6addr)) def testReservedIpv4(self): - self.assertEquals(True, ipaddr.IP('224.1.1.1/31').is_multicast) - self.assertEquals(False, ipaddr.IP('240.0.0.0').is_multicast) - - self.assertEquals(True, ipaddr.IP('192.168.1.1/17').is_private) - self.assertEquals(False, ipaddr.IP('192.169.0.0').is_private) - self.assertEquals(True, ipaddr.IP('10.255.255.255').is_private) - self.assertEquals(False, ipaddr.IP('11.0.0.0').is_private) - self.assertEquals(True, ipaddr.IP('172.31.255.255').is_private) - self.assertEquals(False, ipaddr.IP('172.32.0.0').is_private) - - self.assertEquals(True, ipaddr.IP('169.254.100.200/24').is_link_local) - self.assertEquals(False, ipaddr.IP('169.255.100.200/24').is_link_local) - - self.assertEquals(True, ipaddr.IP('127.100.200.254/32').is_loopback) - self.assertEquals(True, ipaddr.IP('127.42.0.0/16').is_loopback) - self.assertEquals(False, ipaddr.IP('128.0.0.0').is_loopback) + # test networks + self.assertEquals(True, ipaddr.IPNetwork('224.1.1.1/31').is_multicast) + self.assertEquals(False, ipaddr.IPNetwork('240.0.0.0').is_multicast) + + self.assertEquals(True, ipaddr.IPNetwork('192.168.1.1/17').is_private) + self.assertEquals(False, ipaddr.IPNetwork('192.169.0.0').is_private) + self.assertEquals(True, ipaddr.IPNetwork('10.255.255.255').is_private) + self.assertEquals(False, ipaddr.IPNetwork('11.0.0.0').is_private) + self.assertEquals(True, ipaddr.IPNetwork('172.31.255.255').is_private) + self.assertEquals(False, ipaddr.IPNetwork('172.32.0.0').is_private) + + self.assertEquals(True, + ipaddr.IPNetwork('169.254.100.200/24').is_link_local) + self.assertEquals(False, + ipaddr.IPNetwork('169.255.100.200/24').is_link_local) + + self.assertEquals(True, + ipaddr.IPNetwork('127.100.200.254/32').is_loopback) + self.assertEquals(True, ipaddr.IPNetwork('127.42.0.0/16').is_loopback) + self.assertEquals(False, ipaddr.IPNetwork('128.0.0.0').is_loopback) + + # test addresses + self.assertEquals(True, ipaddr.IPAddress('224.1.1.1').is_multicast) + self.assertEquals(False, ipaddr.IPAddress('240.0.0.0').is_multicast) + + self.assertEquals(True, ipaddr.IPAddress('192.168.1.1').is_private) + self.assertEquals(False, ipaddr.IPAddress('192.169.0.0').is_private) + self.assertEquals(True, ipaddr.IPAddress('10.255.255.255').is_private) + self.assertEquals(False, ipaddr.IPAddress('11.0.0.0').is_private) + self.assertEquals(True, ipaddr.IPAddress('172.31.255.255').is_private) + self.assertEquals(False, ipaddr.IPAddress('172.32.0.0').is_private) + + self.assertEquals(True, + ipaddr.IPAddress('169.254.100.200').is_link_local) + self.assertEquals(False, + ipaddr.IPAddress('169.255.100.200').is_link_local) + + self.assertEquals(True, + ipaddr.IPAddress('127.100.200.254').is_loopback) + self.assertEquals(True, ipaddr.IPAddress('127.42.0.0').is_loopback) + self.assertEquals(False, ipaddr.IPAddress('128.0.0.0').is_loopback) + self.assertEquals(True, ipaddr.IPNetwork('0.0.0.0').is_unspecified) def testReservedIpv6(self): - ip = ipaddr.IP - - self.assertEquals(True, ip('ffff::').is_multicast) - self.assertEquals(True, ip(2**128-1).is_multicast) - self.assertEquals(True, ip('ff00::').is_multicast) - self.assertEquals(False, ip('fdff::').is_multicast) - - self.assertEquals(True, ip('fecf::').is_site_local) - self.assertEquals(True, ip('feff:ffff:ffff:ffff::').is_site_local) - self.assertEquals(False, ip('fbf:ffff::').is_site_local) - self.assertEquals(False, ip('ff00::').is_site_local) - - self.assertEquals(True, ip('fc00::').is_private) - self.assertEquals(True, ip('fc00:ffff:ffff:ffff::').is_private) - self.assertEquals(False, ip('fbff:ffff::').is_private) - self.assertEquals(False, ip('fe00::').is_private) - self.assertEquals(True, ip('fea0::').is_link_local) - self.assertEquals(True, ip('febf:ffff::').is_link_local) - self.assertEquals(False, ip('fe7f:ffff::').is_link_local) - self.assertEquals(False, ip('fec0::').is_link_local) - - self.assertEquals(True, ip('0:0::0:01').is_loopback) - self.assertEquals(False, ip('::1/127').is_loopback) - self.assertEquals(False, ip('::').is_loopback) - self.assertEquals(False, ip('::2').is_loopback) - - self.assertEquals(True, ip('0::0').is_unspecified) - self.assertEquals(False, ip('::1').is_unspecified) - self.assertEquals(False, ip('::/127').is_unspecified) + self.assertEquals(True, ipaddr.IPNetwork('ffff::').is_multicast) + self.assertEquals(True, ipaddr.IPNetwork(2**128-1).is_multicast) + self.assertEquals(True, ipaddr.IPNetwork('ff00::').is_multicast) + self.assertEquals(False, ipaddr.IPNetwork('fdff::').is_multicast) + + self.assertEquals(True, ipaddr.IPNetwork('fecf::').is_site_local) + self.assertEquals(True, ipaddr.IPNetwork( + 'feff:ffff:ffff:ffff::').is_site_local) + self.assertEquals(False, ipaddr.IPNetwork('fbf:ffff::').is_site_local) + self.assertEquals(False, ipaddr.IPNetwork('ff00::').is_site_local) + + self.assertEquals(True, ipaddr.IPNetwork('fc00::').is_private) + self.assertEquals(True, ipaddr.IPNetwork( + 'fc00:ffff:ffff:ffff::').is_private) + self.assertEquals(False, ipaddr.IPNetwork('fbff:ffff::').is_private) + self.assertEquals(False, ipaddr.IPNetwork('fe00::').is_private) + + self.assertEquals(True, ipaddr.IPNetwork('fea0::').is_link_local) + self.assertEquals(True, ipaddr.IPNetwork('febf:ffff::').is_link_local) + self.assertEquals(False, ipaddr.IPNetwork('fe7f:ffff::').is_link_local) + self.assertEquals(False, ipaddr.IPNetwork('fec0::').is_link_local) + + self.assertEquals(True, ipaddr.IPNetwork('0:0::0:01').is_loopback) + self.assertEquals(False, ipaddr.IPNetwork('::1/127').is_loopback) + self.assertEquals(False, ipaddr.IPNetwork('::').is_loopback) + self.assertEquals(False, ipaddr.IPNetwork('::2').is_loopback) + + self.assertEquals(True, ipaddr.IPNetwork('0::0').is_unspecified) + self.assertEquals(False, ipaddr.IPNetwork('::1').is_unspecified) + self.assertEquals(False, ipaddr.IPNetwork('::/127').is_unspecified) + + # test addresses + self.assertEquals(True, ipaddr.IPAddress('ffff::').is_multicast) + self.assertEquals(True, ipaddr.IPAddress(2**128-1).is_multicast) + self.assertEquals(True, ipaddr.IPAddress('ff00::').is_multicast) + self.assertEquals(False, ipaddr.IPAddress('fdff::').is_multicast) + + self.assertEquals(True, ipaddr.IPAddress('fecf::').is_site_local) + self.assertEquals(True, ipaddr.IPAddress( + 'feff:ffff:ffff:ffff::').is_site_local) + self.assertEquals(False, ipaddr.IPAddress('fbf:ffff::').is_site_local) + self.assertEquals(False, ipaddr.IPAddress('ff00::').is_site_local) + + self.assertEquals(True, ipaddr.IPAddress('fc00::').is_private) + self.assertEquals(True, ipaddr.IPAddress( + 'fc00:ffff:ffff:ffff::').is_private) + self.assertEquals(False, ipaddr.IPAddress('fbff:ffff::').is_private) + self.assertEquals(False, ipaddr.IPAddress('fe00::').is_private) + + self.assertEquals(True, ipaddr.IPAddress('fea0::').is_link_local) + self.assertEquals(True, ipaddr.IPAddress('febf:ffff::').is_link_local) + self.assertEquals(False, ipaddr.IPAddress('fe7f:ffff::').is_link_local) + self.assertEquals(False, ipaddr.IPAddress('fec0::').is_link_local) + + self.assertEquals(True, ipaddr.IPAddress('0:0::0:01').is_loopback) + self.assertEquals(True, ipaddr.IPAddress('::1').is_loopback) + self.assertEquals(False, ipaddr.IPAddress('::2').is_loopback) + + self.assertEquals(True, ipaddr.IPAddress('0::0').is_unspecified) + self.assertEquals(False, ipaddr.IPAddress('::1').is_unspecified) + + # some generic IETF reserved addresses + self.assertEquals(True, ipaddr.IPAddress('100::').is_reserved) + self.assertEquals(True, ipaddr.IPNetwork('4000::1/128').is_reserved) + + def testIpv4Mapped(self): + self.assertEqual(ipaddr.IPAddress('::ffff:192.168.1.1').ipv4_mapped, + ipaddr.IPAddress('192.168.1.1')) + self.assertEqual(ipaddr.IPAddress('::c0a8:101').ipv4_mapped, None) + self.assertEqual(ipaddr.IPAddress('::ffff:c0a8:101').ipv4_mapped, + ipaddr.IPAddress('192.168.1.1')) def testAddrExclude(self): - addr1 = ipaddr.IP('10.1.1.0/24') - addr2 = ipaddr.IP('10.1.1.0/26') - addr3 = ipaddr.IP('10.2.1.0/24') + addr1 = ipaddr.IPNetwork('10.1.1.0/24') + addr2 = ipaddr.IPNetwork('10.1.1.0/26') + addr3 = ipaddr.IPNetwork('10.2.1.0/24') self.assertEqual(addr1.address_exclude(addr2), - [ipaddr.IP('10.1.1.64/26'), - ipaddr.IP('10.1.1.128/25')]) + [ipaddr.IPNetwork('10.1.1.64/26'), + ipaddr.IPNetwork('10.1.1.128/25')]) self.assertRaises(ValueError, addr1.address_exclude, addr3) def testHash(self): - self.assertEquals(hash(ipaddr.IP('10.1.1.0/24')), - hash(ipaddr.IP('10.1.1.0/24'))) + self.assertEquals(hash(ipaddr.IPNetwork('10.1.1.0/24')), + hash(ipaddr.IPNetwork('10.1.1.0/24'))) + self.assertEquals(hash(ipaddr.IPAddress('10.1.1.0')), + hash(ipaddr.IPAddress('10.1.1.0'))) + ip1 = ipaddr.IPAddress('10.1.1.0') + ip2 = ipaddr.IPAddress('1::') dummy = {} dummy[self.ipv4] = None dummy[self.ipv6] = None + dummy[ip1] = None + dummy[ip2] = None self.assertTrue(self.ipv4 in dummy) - - def testIPv4PrefixFromInt(self): - addr1 = ipaddr.IP('10.1.1.0/24') - addr2 = ipaddr.IPv4(addr1.ip) # clone prefix - addr2.set_prefix(addr1.prefixlen) - addr3 = ipaddr.IP(123456) - - self.assertEqual(123456, addr3.ip) - self.assertRaises(ipaddr.IPv4NetmaskValidationError, - addr2.set_prefix, -1L) - self.assertEqual(addr1, addr2) - self.assertEqual(str(addr1), str(addr2)) - - def testIPv6PrefixFromInt(self): - addr1 = ipaddr.IP('2001:0658:022a:cafe:0200::1/64') - addr2 = ipaddr.IPv6(addr1.ip) # clone prefix - addr2.set_prefix(addr1.prefixlen) - addr3 = ipaddr.IP(123456) - - self.assertEqual(123456, addr3.ip) - self.assertRaises(ipaddr.IPv6NetmaskValidationError, - addr2.set_prefix, -1L) - self.assertEqual(addr1, addr2) - self.assertEqual(str(addr1), str(addr2)) + self.assertTrue(ip2 in dummy) def testCopyConstructor(self): - addr1 = ipaddr.IP('10.1.1.0/24') - addr2 = ipaddr.IP(addr1) - addr3 = ipaddr.IP('2001:658:22a:cafe:200::1/64') - addr4 = ipaddr.IP(addr3) + addr1 = ipaddr.IPNetwork('10.1.1.0/24') + addr2 = ipaddr.IPNetwork(addr1) + addr3 = ipaddr.IPNetwork('2001:658:22a:cafe:200::1/64') + addr4 = ipaddr.IPNetwork(addr3) + addr5 = ipaddr.IPv4Address('1.1.1.1') + addr6 = ipaddr.IPv6Address('2001:658:22a:cafe:200::1') self.assertEqual(addr1, addr2) self.assertEqual(addr3, addr4) + self.assertEqual(addr5, ipaddr.IPv4Address(addr5)) + self.assertEqual(addr6, ipaddr.IPv6Address(addr6)) def testCompressIPv6Address(self): test_addresses = { @@ -572,57 +830,124 @@ class IpaddrUnitTest(unittest.TestCase): '2001:658:22a:cafe::/66', } for uncompressed, compressed in test_addresses.items(): - self.assertEquals(compressed, str(ipaddr.IPv6(uncompressed))) + self.assertEquals(compressed, str(ipaddr.IPv6Network(uncompressed))) def testExplodeShortHandIpStr(self): - addr1 = ipaddr.IPv6('2001::1') + addr1 = ipaddr.IPv6Network('2001::1') self.assertEqual('2001:0000:0000:0000:0000:0000:0000:0001', - addr1._explode_shorthand_ip_string(addr1.ip_ext)) + addr1._explode_shorthand_ip_string(str(addr1.ip))) + self.assertEqual('0000:0000:0000:0000:0000:0000:0000:0001', + ipaddr.IPv6Network('::1/128').exploded) def testIntRepresentation(self): self.assertEqual(16909060, int(self.ipv4)) self.assertEqual(42540616829182469433547762482097946625, int(self.ipv6)) def testHexRepresentation(self): - self.assertEqual(hex(0x1020304), hex(self.ipv4)) + self.assertEqual(hex(0x1020304), + hex(self.ipv4)) self.assertEqual(hex(0x20010658022ACAFE0200000000000001), hex(self.ipv6)) # backwards compatibility def testBackwardsCompability(self): - ip = ipaddr.IP - self.assertEqual(ipaddr.CollapseAddrList( - [ip('1.1.0.0/24'), ip('1.1.1.0/24')]), - [ip('1.1.0.0/23')]) - - self.assertEqual(ip('::42:0/112').AddressExclude(ip('::42:8000/113')), - [ip('::42:0/113')]) - - self.assertTrue(ip('1::/8').CompareNetworks(ip('2::/9')) < 0) - - self.assertEqual(ip('1::/16').Contains(ip('2::/16')), False) - - i4 = ip('1.2.3.1/12') - i4.set_prefix(0) - self.assertEqual(i4.get_prefix(), 0) - - i6 = ip('::1/2') - i6.set_prefix(0) - self.assertEqual(i6.get_prefix(), 0) - - self.assertEqual(ip('0.0.0.0/0').Subnet(), - [ip('0.0.0.0/1'), ip('128.0.0.0/1')]) - self.assertEqual(ip('::/127').Subnet(), [ip('::/128'), ip('::1/128')]) - - self.assertEqual(ip('1.0.0.0/32').Supernet(), ip('1.0.0.0/31')) - self.assertEqual(ip('::/121').Supernet(), ip('::/120')) - - self.assertEqual(ip('10.0.0.02').IsRFC1918(), True) - self.assertEqual(ip('10.0.0.0').IsMulticast(), False) - self.assertEqual(ip('127.255.255.255').IsLoopback(), True) - self.assertEqual(ip('169.255.255.255').IsLinkLocal(), False) + [ipaddr.IPNetwork('1.1.0.0/24'), ipaddr.IPNetwork('1.1.1.0/24')]), + [ipaddr.IPNetwork('1.1.0.0/23')]) + + self.assertEqual(ipaddr.IPNetwork('::42:0/112').AddressExclude( + ipaddr.IPNetwork('::42:8000/113')), + [ipaddr.IPNetwork('::42:0/113')]) + + self.assertTrue(ipaddr.IPNetwork('1::/8').CompareNetworks( + ipaddr.IPNetwork('2::/9')) < 0) + + self.assertEqual(ipaddr.IPNetwork('1::/16').Contains( + ipaddr.IPNetwork('2::/16')), False) + + self.assertEqual(ipaddr.IPNetwork('0.0.0.0/0').Subnet(), + [ipaddr.IPNetwork('0.0.0.0/1'), + ipaddr.IPNetwork('128.0.0.0/1')]) + self.assertEqual(ipaddr.IPNetwork('::/127').Subnet(), + [ipaddr.IPNetwork('::/128'), + ipaddr.IPNetwork('::1/128')]) + + self.assertEqual(ipaddr.IPNetwork('1.0.0.0/32').Supernet(), + ipaddr.IPNetwork('1.0.0.0/31')) + self.assertEqual(ipaddr.IPNetwork('::/121').Supernet(), + ipaddr.IPNetwork('::/120')) + + self.assertEqual(ipaddr.IPNetwork('10.0.0.02').IsRFC1918(), True) + self.assertEqual(ipaddr.IPNetwork('10.0.0.0').IsMulticast(), False) + self.assertEqual(ipaddr.IPNetwork('127.255.255.255').IsLoopback(), True) + self.assertEqual(ipaddr.IPNetwork('169.255.255.255').IsLinkLocal(), + False) + + def testForceVersion(self): + self.assertEqual(ipaddr.IPNetwork(1).version, 4) + self.assertEqual(ipaddr.IPNetwork(1, version=6).version, 6) + + def testWithStar(self): + self.assertEqual(str(self.ipv4.with_prefixlen), "1.2.3.4/24") + self.assertEqual(str(self.ipv4.with_netmask), "1.2.3.4/255.255.255.0") + self.assertEqual(str(self.ipv4.with_hostmask), "1.2.3.4/0.0.0.255") + + self.assertEqual(str(self.ipv6.with_prefixlen), + '2001:658:22a:cafe:200::1/64') + # these two probably don't make much sense, but they're included for + # compatability with ipv4 + self.assertEqual(str(self.ipv6.with_netmask), + '2001:658:22a:cafe:200::1/ffff:ffff:ffff:ffff::') + self.assertEqual(str(self.ipv6.with_hostmask), + '2001:658:22a:cafe:200::1/::ffff:ffff:ffff:ffff') + + def testNetworkElementCaching(self): + # V4 - make sure we're empty + self.assertFalse(self.ipv4._cache.has_key('network')) + self.assertFalse(self.ipv4._cache.has_key('broadcast')) + self.assertFalse(self.ipv4._cache.has_key('hostmask')) + + # V4 - populate and test + self.assertEqual(self.ipv4.network, ipaddr.IPv4Address('1.2.3.0')) + self.assertEqual(self.ipv4.broadcast, ipaddr.IPv4Address('1.2.3.255')) + self.assertEqual(self.ipv4.hostmask, ipaddr.IPv4Address('0.0.0.255')) + + # V4 - check we're cached + self.assertTrue(self.ipv4._cache.has_key('network')) + self.assertTrue(self.ipv4._cache.has_key('broadcast')) + self.assertTrue(self.ipv4._cache.has_key('hostmask')) + + # V6 - make sure we're empty + self.assertFalse(self.ipv6._cache.has_key('network')) + self.assertFalse(self.ipv6._cache.has_key('broadcast')) + self.assertFalse(self.ipv6._cache.has_key('hostmask')) + + # V6 - populate and test + self.assertEqual(self.ipv6.network, + ipaddr.IPv6Address('2001:658:22a:cafe::')) + self.assertEqual(self.ipv6.broadcast, ipaddr.IPv6Address( + '2001:658:22a:cafe:ffff:ffff:ffff:ffff')) + self.assertEqual(self.ipv6.hostmask, + ipaddr.IPv6Address('::ffff:ffff:ffff:ffff')) + + # V6 - check we're cached + self.assertTrue(self.ipv6._cache.has_key('network')) + self.assertTrue(self.ipv6._cache.has_key('broadcast')) + self.assertTrue(self.ipv6._cache.has_key('hostmask')) + + def testIsValidIp(self): + ip = ipaddr.IPv6Address('::') + self.assertTrue(ip._is_valid_ip('2001:658:22a:cafe:200::1')) + self.assertTrue(ip._is_valid_ip('::ffff:10.10.0.0')) + self.assertTrue(ip._is_valid_ip('::ffff:192.168.0.0')) + self.assertFalse(ip._is_valid_ip('2001:658:22a::::1')) + self.assertFalse(ip._is_valid_ip(':658:22a:cafe:200::1')) + self.assertFalse(ip._is_valid_ip('2001:658:22a:cafe:200:')) + self.assertFalse(ip._is_valid_ip('2001:658:22a:cafe:200:127.0.0.1::1')) + self.assertFalse(ip._is_valid_ip('2001:658:22a:cafe:200::127.0.1')) + self.assertFalse(ip._is_valid_ip('2001:658:22a:zzzz:200::1')) + self.assertFalse(ip._is_valid_ip('2001:658:22a:cafe1:200::1')) if __name__ == '__main__': unittest.main() |