openstack/placement
Code Issues Proposed changes

Merge "Reuse methods from netutils"

Browse Source
This commit is contained in:
Jenkins 2015-01-05 17:21:32 +00:00 committed by Gerrit Code Review
commit 3384940caf
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/db/sqlalchemy/types.py
View File

@ -15,6 +15,7 @@
"""Custom SQLAlchemy types.""" """Custom SQLAlchemy types."""
from oslo.utils import netutils
import netaddr import netaddr
from sqlalchemy.dialects import postgresql from sqlalchemy.dialects import postgresql
from sqlalchemy import types from sqlalchemy import types
@ -39,7 +40,7 @@ class IPAddress(types.TypeDecorator):
return value return value
# NOTE(maurosr): The purpose here is to convert ipv6 to the shortened # NOTE(maurosr): The purpose here is to convert ipv6 to the shortened
# form, not validate it. # form, not validate it.
elif utils.is_valid_ipv6(value): elif netutils.is_valid_ipv6(value):
return utils.get_shortened_ipv6(value) return utils.get_shortened_ipv6(value)
return value return value

19
nova/utils.py
View File

@ -492,25 +492,6 @@ def is_int_like(val):
return False return False
def is_valid_ipv4(address):
"""Verify that address represents a valid IPv4 address."""
try:
return netaddr.valid_ipv4(address)
except (ValueError, netaddr.AddrFormatError):
return False
def is_valid_ipv6(address):
try:
return netaddr.valid_ipv6(address)
except (ValueError, netaddr.AddrFormatError):
return False
def is_valid_ip_address(address):
return is_valid_ipv4(address) or is_valid_ipv6(address)
def is_valid_ipv6_cidr(address): def is_valid_ipv6_cidr(address):
try: try:
netaddr.IPNetwork(address, version=6).cidr netaddr.IPNetwork(address, version=6).cidr