Merge "netaddr<=0.7.10 raises ValueError instead of AddrFormatError"

8 years ago · 564502af74
1 changed files with 1 additions and 1 deletions
--- a/neutron/extensions/securitygroup.py
+++ b/neutron/extensions/securitygroup.py
@ -167,7 +167,7 @@ def convert_ip_prefix_to_cidr(ip_prefix):
    try:
        cidr = netaddr.IPNetwork(ip_prefix)
        return str(cidr)
-    except (TypeError, netaddr.AddrFormatError):
+    except (ValueError, TypeError, netaddr.AddrFormatError):
        raise qexception.InvalidCIDR(input=ip_prefix)