cloud-init-dev team mailing list archive

[Andreas Karis <akaris@xxxxxxxxxx>]

Andreas Karis has proposed merging ~akaris/cloud-init:bug1684349 into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~akaris/cloud-init/+git/cloud-init/+merge/322992
-- 
Your team cloud init development team is requested to review the proposed merge of ~akaris/cloud-init:bug1684349 into cloud-init:master.

diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py
index db3c357..9e9c05a 100644
--- a/cloudinit/net/network_state.py
+++ b/cloudinit/net/network_state.py
@@ -734,9 +734,9 @@ def ipv6mask2cidr(mask):
 
 
 def mask2cidr(mask):
-    if ':' in mask:
+    if ':' in str(mask):
         return ipv6mask2cidr(mask)
-    elif '.' in mask:
+    elif '.' in str(mask):
         return ipv4mask2cidr(mask)
     else:
         return mask