[openstack-neutron/f20] netaddr<=0.7.10 raises ValueError instead of AddrFormatError

[Ihar Hrachyshka]

commit 815d403188384fee961ef5e260e1797335662fb8
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date:   Mon May 19 17:39:19 2014 +0200

    netaddr<=0.7.10 raises ValueError instead of AddrFormatError

 ....10-raises-ValueError-instead-of-AddrForm.patch |   30 ++++++++++++++++++++
 openstack-neutron.spec                             |    7 ++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/0004-netaddr-0.7.10-raises-ValueError-instead-of-AddrForm.patch b/0004-netaddr-0.7.10-raises-ValueError-instead-of-AddrForm.patch
new file mode 100644
index 0000000..dfd60ee
--- /dev/null
+++ b/0004-netaddr-0.7.10-raises-ValueError-instead-of-AddrForm.patch
@@ -0,0 +1,30 @@
+From 9849b1bfae641249f4439a277981808904555ec5 Mon Sep 17 00:00:00 2001
+From: Aaron Rosen <aaronorosen at gmail.com>
+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)
+(cherry picked from commit 509d37c84f397a97ca8896309f916c47afe873e6)
+---
+ 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 3d10b5a..027504f 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)
+ 
+ 
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 3dff750..19c39dd 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2013.2.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.4.b3
 Summary:	OpenStack Networking Service
@@ -39,6 +39,7 @@ Source30:	neutron-dist.conf
 Patch0001: 0001-Sync-service-and-systemd-modules-from-oslo-incubator.patch
 Patch0002: 0002-Removed-signing_dir-from-neutron.conf.patch
 Patch0003: 0003-Validate-CIDR-given-as-ip-prefix-in-security-group-r.patch
+Patch0004: 0004-netaddr-0.7.10-raises-ValueError-instead-of-AddrForm.patch
 
 BuildArch:	noarch
 
@@ -397,6 +398,7 @@ IPSec.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
 # Ensure SOURCES.txt ends in a newline and if any patches have added files, append them to SOURCES.txt
@@ -924,6 +926,9 @@ fi
 
 
 %changelog
+* Mon May 19 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.3-7
+- netaddr<=0.7.10 raises ValueError instead of AddrFormatError, bz#1090137
+
 * Mon May 19 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.3-6
 - Validate CIDR given as ip-prefix in security-group-rule-create, bz#1090137