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 dd2ccd12ad
)
This commit is contained in:
parent
03eed8cd34
commit
509d37c84f
@ -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)
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user