test: add 32-bit ipv4 and 64-bit ipv6 blocklist testing

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 6a997da13dd40d512a903036a487c8e0c4c59148)

diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc
index 66e45c007975ef7f92499d41ccaae0c25b1dce93..2cbafd5e39e68898f0a9ddb810347b5f7ec0a364 100644 (file)
--- a/src/test/osd/TestOSDMap.cc
+++ b/src/test/osd/TestOSDMap.cc
@@ -2093,21 +2093,26 @@ TEST_P(OSDMapTest, BUG_51842) {
     }
 }
 
-const string OSDMapTest::range_addrs[] = {"198.51.100.0/22", "2001:db8::/48",
-  "3001:db8::/72", "4001:db8::/30"};
+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"};
 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",
   "2001:db8:0:ffff:ffff:ffff:ffff:ffff",
   "3001:db8:0:0:0:0:0:0", "3001:db8:0:0:0:0001:ffff:ffff",
   "3001:db8:0:0:00ff:ffff:ffff:ffff",
   "4001:db8::", "4001:db8:0:0:0:0001:ffff:ffff",
-  "4001:dbb:ffff:ffff:ffff:ffff:ffff:ffff"
+  "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",
 };
 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",
+  "10.2.5.101", "10.2.5.103",
   "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::"
+  "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"
 };
 
 TEST_F(OSDMapTest, blocklisting_ips) {