From b5851648771dcd93251114021005f44a66e602d5 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 8 Feb 2021 16:27:44 +0800 Subject: [PATCH] cephadm: do not cast subnet to unicode this change addresses a regression introduced by fe4f4402fbcd87667613640f2808d5d0e07e749d, which was tested before abd9287db0e4f4f7873864119f5ce62519af1d48 got merged. and the former was merged after abd9287db0e4f4f7873864119f5ce62519af1d48. hence the regression. Signed-off-by: Kefu Chai --- src/cephadm/cephadm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 8d3ff661ac18..75675c9a9e85 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -3150,7 +3150,7 @@ def check_subnet(subnets:str) -> Tuple[int, List[int], str]: errors.append(f"{subnet} is not in CIDR format (address/netmask)") continue try: - v = ipaddress.ip_network(unicode(subnet)).version + v = ipaddress.ip_network(subnet).version versions.add(v) except ValueError as e: rc = 1 -- 2.47.3