From 509d37c84f397a97ca8896309f916c47afe873e6 Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Wed, 16 Apr 2014 11:31:25 -0700 Subject: [PATCH] netaddr<=0.7.10 raises ValueError instead of AddrFormatError This patch ensures that ValueError is also caught in addition to AddrFormatError as in netaddr>=0.7.11 AddrFormatError is raised and in netaddr<=0.7.10 ValueError is raised. Change-Id: I595c90e42129a2d365f3860e3042e826bd031365 Closes-bug: #1308675 (cherry picked from commit dd2ccd12adfb6c7d4aa500ba4120f767beeed35c) --- neutron/extensions/securitygroup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py index 3d10b5a4713..027504fb59a 100644 --- a/neutron/extensions/securitygroup.py +++ b/neutron/extensions/securitygroup.py @@ -163,7 +163,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)