Merge pull request ceph#46163 from rkachach/fix_issue_55556

mgr/cephadm: fixing ipv6 handling during bootstrap

Reviewed-by: Adam King <[email protected]>
Reviewed-by: John Mulligan <[email protected]>
Reviewed-by: Michael Fritch <[email protected]>

Author: adk3798

src/cephadm/cephadm

@@ -4653,7 +4653,8 @@ def ip_in_subnets(ip_addr: str, subnets: str) -> bool:
     """Determine if the ip_addr belongs to any of the subnets list."""
     subnet_list = [x.strip() for x in subnets.split(',')]
     for subnet in subnet_list:
-        if ipaddress.ip_address(ip_addr) in ipaddress.ip_network(subnet):
+        ip_address = unwrap_ipv6(ip_addr) if is_ipv6(ip_addr) else ip_addr
+        if ipaddress.ip_address(ip_address) in ipaddress.ip_network(subnet):
             return True
     return False
 

src/cephadm/tests/test_cephadm.py

@@ -2309,6 +2309,10 @@ def test_ip_in_subnet(self):
         rc = cd.ip_in_subnets('fe80::5054:ff:fef4:873a', 'fe80::/64')
         assert rc is True
 
+        # valid wrapped ip and valid IPV6 network
+        rc = cd.ip_in_subnets('[fe80::5054:ff:fef4:873a]', 'fe80::/64')
+        assert rc is True
+
         # valid ip and that doesn't belong to IPV6 network
         rc = cd.ip_in_subnets('fe80::5054:ff:fef4:873a', '2001:db8:85a3::/64')
         assert rc is False