@@ -1596,16 +1596,69 @@ def testNextNetworkWithBadPrefix(self):
15961596 self .assertRaises (ValueError , self .ipv6_network .next_network , 150 )
15971597
15981598 def testNextNetworkOutOfAddressSpace (self ):
1599+ error = r"out of address space, cannot make another /{} network"
15991600 ipv4 = ipaddress .IPv4Network ('255.255.255.0/24' )
1600- self .assertRaisesRegex (
1601- ValueError ,
1602- 'out of address space, cannot make another /24 network' ,
1603- ipv4 .next_network )
1601+ with self .assertRaisesRegex (ValueError , error . format ( 24 )):
1602+ ipv4 . next_network ()
1603+ with self . assertRaisesRegex ( ValueError , error . format ( 25 )):
1604+ ipv4 .next_network ( 25 )
16041605 ipv6 = ipaddress .IPv6Network ('ffff:ffff:ffff:ffff:ffff:ffff:ffff:0/112' )
1605- self .assertRaisesRegex (
1606- ValueError ,
1607- 'out of address space, cannot make another /112 network' ,
1608- ipv6 .next_network )
1606+ with self .assertRaisesRegex (ValueError , error .format (112 )):
1607+ ipv6 .next_network ()
1608+ with self .assertRaisesRegex (ValueError , error .format (120 )):
1609+ ipv6 .next_network (120 )
1610+
1611+ def testPrevNetwork (self ):
1612+ ipv4 = ipaddress .IPv4Network ('1.2.3.0/24' )
1613+ self .assertEqual (
1614+ ipv4 .prev_network (),
1615+ ipaddress .IPv4Network ('1.2.2.0/24' ),
1616+ )
1617+ self .assertEqual (
1618+ ipv4 .prev_network (prev_prefix = 16 ),
1619+ ipaddress .IPv4Network ('1.1.0.0/16' ),
1620+ )
1621+ self .assertEqual (
1622+ ipv4 .prev_network (prev_prefix = 25 ),
1623+ ipaddress .IPv4Network ('1.2.2.128/25' ),
1624+ )
1625+ self .assertEqual (
1626+ ipv4 .prev_network (prev_prefix = 23 ),
1627+ ipaddress .IPv4Network ('1.2.0.0/23' ),
1628+ )
1629+
1630+ ipv6 = ipaddress .IPv6Network ('2001:dbb8:aaaa:aaaa::/64' )
1631+ self .assertEqual (
1632+ ipv6 .prev_network (),
1633+ ipaddress .IPv6Network ('2001:dbb8:aaaa:aaa9::/64' ),
1634+ )
1635+ self .assertEqual (
1636+ ipv6 .prev_network (prev_prefix = 48 ),
1637+ ipaddress .IPv6Network ('2001:dbb8:aaa9::/48' ),
1638+ )
1639+ self .assertEqual (
1640+ ipv6 .prev_network (prev_prefix = 88 ),
1641+ ipaddress .IPv6Network ('2001:dbb8:aaaa:aaa9:ffff:ff00::/88' ),
1642+ )
1643+
1644+ def testPrevNetworkWithBadPrefix (self ):
1645+ self .assertRaises (ValueError , self .ipv4_network .prev_network , 0 )
1646+ self .assertRaises (ValueError , self .ipv4_network .prev_network , 35 )
1647+ self .assertRaises (ValueError , self .ipv6_network .prev_network , 0 )
1648+ self .assertRaises (ValueError , self .ipv6_network .prev_network , 150 )
1649+
1650+ def testPrevNetworkOutOfAddressSpace (self ):
1651+ error = r"out of address space, cannot make another /{} network"
1652+ ipv4 = ipaddress .IPv4Network ('0.0.0.0/24' )
1653+ with self .assertRaisesRegex (ValueError , error .format (24 )):
1654+ ipv4 .prev_network ()
1655+ with self .assertRaisesRegex (ValueError , error .format (25 )):
1656+ ipv4 .prev_network (25 )
1657+ ipv6 = ipaddress .IPv6Network ('::/112' )
1658+ with self .assertRaisesRegex (ValueError , error .format (112 )):
1659+ ipv6 .prev_network ()
1660+ with self .assertRaisesRegex (ValueError , error .format (120 )):
1661+ ipv6 .prev_network (120 )
16091662
16101663 def testFancySubnetting (self ):
16111664 self .assertEqual (sorted (self .ipv4_network .subnets (prefixlen_diff = 3 )),
0 commit comments