]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: add a 128-bit range blocklist test
authorGreg Farnum <gfarnum@redhat.com>
Wed, 20 Apr 2022 15:06:33 +0000 (15:06 +0000)
committerGreg Farnum <gfarnum@redhat.com>
Tue, 31 May 2022 23:18:17 +0000 (23:18 +0000)
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 138daff1dcb35510c7444f803be7a55c62532f67)

src/test/osd/TestOSDMap.cc

index 85c01e80e1c9bb584bb862edb8a29df74410d367..17905952bccc0df2352c09accfd5c6bf13f972fb 100644 (file)
@@ -2080,7 +2080,7 @@ TEST_P(OSDMapTest, BUG_51842) {
 }
 
 const string OSDMapTest::range_addrs[] = {"198.51.100.0/22", "10.2.5.102/32", "2001:db8::/48",
-  "3001:db8::/72", "4001:db8::/30", "5001:db8::/64"};
+  "3001:db8::/72", "4001:db8::/30", "5001:db8::/64", "6001:db8::/128", "7001:db8::/127"};
 const string OSDMapTest::ip_addrs[] = {"198.51.100.14", "198.51.100.0", "198.51.103.255",
   "10.2.5.102",
   "2001:db8:0:0:0:0:0:0", "2001:db8:0:0:0:0001:ffff:ffff",
@@ -2091,6 +2091,8 @@ const string OSDMapTest::ip_addrs[] = {"198.51.100.14", "198.51.100.0", "198.51.
   "4001:dbb:ffff:ffff:ffff:ffff:ffff:ffff",
   "5001:db8:0:0:0:0:0:0", "5001:db8:0:0:0:0:ffff:ffff",
   "5001:db8:0:0:ffff:ffff:ffff:ffff",
+  "6001:db8:0:0:0:0:0:0",
+  "7001:db8:0:0:0:0:0:0", "7001:db8:0:0:0:0:0:0001"
 };
 const string OSDMapTest::unblocked_ip_addrs[] = { "0.0.0.0", "1.1.1.1", "192.168.1.1",
   "198.51.99.255", "198.51.104.0",
@@ -2098,7 +2100,9 @@ const string OSDMapTest::unblocked_ip_addrs[] = { "0.0.0.0", "1.1.1.1", "192.168
   "2001:db7:ffff:ffff:ffff:ffff:ffff:ffff", "2001:db8:0001::",
   "3001:db7:ffff:ffff:ffff:ffff:ffff:ffff", "3001:db8:0:0:0100::",
   "4001:db7:ffff:ffff:ffff:ffff:ffff:ffff", "4001:dbc::",
-  "5001:db7:ffff:ffff:ffff:ffff:ffff:ffff", "5001:db8:0:0001:0:0:0:0"
+  "5001:db7:ffff:ffff:ffff:ffff:ffff:ffff", "5001:db8:0:0001:0:0:0:0", 
+  "6001:db8:0:0:0:0:0:0001",
+  "7001:db7:ffff:ffff:ffff:ffff:ffff:ffff", "7001:db8:0:0:0:0:0:0002"
 };
 
 TEST_F(OSDMapTest, blocklisting_ips) {