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)

diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py
index 637dbe3d7eabc04379933d9b7ca480a3aa3867a2..37031e27e8f2b19874d964b3380f66ba5fb820fa 100644 (file)
--- a/neutron/extensions/securitygroup.py
+++ b/neutron/extensions/securitygroup.py
@@ -164,7 +164,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)