From: Kefu Chai <kchai@redhat.com>
Date: Mon, 8 Feb 2021 08:27:44 +0000 (+0800)
Subject: cephadm: do not cast subnet to unicode
X-Git-Tag: v16.2.0~178^2~56
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee001fa5eafd87981ebfe39b907074616522cfbb;p=ceph.git

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 <kchai@redhat.com>
(cherry picked from commit b5851648771dcd93251114021005f44a66e602d5)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index a905650791f8..f5129390dd9e 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