openstack/ironic
Code Issues Proposed changes

Merge "Remove unused is_valid_cidr method"

Browse Source
This commit is contained in:
Jenkins 2016-05-24 22:29:57 +00:00 committed by Gerrit Code Review
commit 28314faae7
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ironic/common/utils.py
View File

@ -301,29 +301,6 @@ def get_shortened_ipv6_cidr(address):
return str(net.cidr) return str(net.cidr)
def is_valid_cidr(address):
"""Check if the provided ipv4 or ipv6 address is a valid CIDR address."""
try:
# Validate the correct CIDR Address
netaddr.IPNetwork(address)
except netaddr.core.AddrFormatError:
return False
except UnboundLocalError:
# NOTE(MotoKen): work around bug in netaddr 0.7.5 (see detail in
# https://github.com/drkjam/netaddr/issues/2)
return False
# Prior validation partially verify /xx part
# Verify it here
ip_segment = address.split('/')
if (len(ip_segment) <= 1 or
ip_segment[1] == ''):
return False
return True
def get_ip_version(network): def get_ip_version(network):
"""Returns the IP version of a network (IPv4 or IPv6). """Returns the IP version of a network (IPv4 or IPv6).