From: Ian Jackson Date: Fri, 18 Oct 2019 18:22:36 +0000 (+0100) Subject: ipaddrset-test: Fix network with host bits X-Git-Tag: v0.5.0~81 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cfabda7e2a17f5d09454c184cd496aeb93c703af;p=secnet.git ipaddrset-test: Fix network with host bits 2001:23:24:: has 3x16 bits set, ie /48. This was always wrong. We need to fix this now because we are going to switch to ipaddress from ipaddr, which actually checks this. Signed-off-by: Ian Jackson --- diff --git a/ipaddrset-test.expected b/ipaddrset-test.expected index 12d49e8..103050d 100644 --- a/ipaddrset-test.expected +++ b/ipaddrset-test.expected @@ -1,5 +1,5 @@ s = - -2001:23:24::/40,172.18.45.0/24 +2001:23:24::/48,172.18.45.0/24 t = 172.18.45.192/28,172.31.80.8/32 False False @@ -19,5 +19,5 @@ True 172.18.45.192/28 172.18.45.192/28 u -2001:23:24::/40,172.18.45.0/24,172.31.80.8/32 -2001:23:24::/40,172.18.45.0/24,172.31.80.8/32 +2001:23:24::/48,172.18.45.0/24,172.31.80.8/32 +2001:23:24::/48,172.18.45.0/24,172.31.80.8/32 diff --git a/ipaddrset-test.py b/ipaddrset-test.py index 82059f0..a60a5e8 100755 --- a/ipaddrset-test.py +++ b/ipaddrset-test.py @@ -40,7 +40,7 @@ v4a=IPAddress('172.18.45.6') s=IPAddressSet() print 's =', s s.append([IPNetwork('172.18.45.0/24')]) -s.append([IPNetwork('2001:23:24::/40')]) +s.append([IPNetwork('2001:23:24::/48')]) print s t=IPAddressSet(map(IPNetwork,['172.31.80.8/32','172.18.45.192/28']))