openstack/neutron-lib
Code Issues Proposed changes

[netaddr>=1.0.0] Do not use netaddr.core.ZEROFILL flag with IPv6

Browse Source 
The flag "netaddr.core.ZEROFILL" cannot be used with IPv6 addresses
with netaddr>=1.0.0

Change-Id: I116ea2abbee13a73302ebca9c65707f427a7d9d0
Closes-Bug: #2055173
This commit is contained in:
Rodolfo Alonso Hernandez
2024-02-23 14:23:58 +00:00
committed by Rodolfo Alonso
parent f0724e9cf1
commit 3a9e39b9ef
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
neutron_lib/api/validators/__init__.py
View File

@@ -443,10 +443,15 @@ def validate_ip_address(data, valid_values=None):
msg = None
msg_data = data
try:
# netaddr.core.ZEROFILL is only applicable to IPv4.
# it will remove leading zeros from IPv4 address octets.
ip = netaddr.IPAddress(validate_no_whitespace(data),
flags=netaddr.core.ZEROFILL)
try:
# netaddr.core.ZEROFILL is only applicable to IPv4.
# it will remove leading zeros from IPv4 address octets.
ip = netaddr.IPAddress(validate_no_whitespace(data),
flags=netaddr.core.ZEROFILL)
except ValueError:
# It could be an IPv6 address and netaddr.core.ZEROFILL flag
# cannot be used in netaddr>=1.0.0
ip = netaddr.IPAddress(validate_no_whitespace(data))
# The followings are quick checks for IPv6 (has ':') and
# IPv4. (has 3 periods like 'xx.xx.xx.xx')
# NOTE(yamamoto): netaddr uses libraries provided by the underlying