diff options
author | ChangBo Guo(gcb) <eric.guo@easystack.cn> | 2014-12-23 16:56:20 +0800 |
---|---|---|
committer | ChangBo Guo(gcb) <eric.guo@easystack.cn> | 2014-12-23 21:32:04 +0800 |
commit | 72b871e176c4ec493c555e8fd28a3ad49ea799dd (patch) | |
tree | 8033d6faaa85b831c1c8e90e7fac8a910e21edb7 /ironic/dhcp | |
parent | 98d4bfd3ec214f941d2f99bc8b5279bd0a9545ee (diff) | |
download | ironic-72b871e176c4ec493c555e8fd28a3ad49ea799dd.tar.gz |
Reuse methods from netutils
Replace usages of is_valid_ipv4, is_valid_ipv6 from Ironic,
by usages of this methods from oslo.utils and remove these
methods from Ironic code.
Change-Id: I5f2b50718f2d6ae2258a14055ddd77fc40d8a344
Diffstat (limited to 'ironic/dhcp')
-rw-r--r-- | ironic/dhcp/neutron.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index 4c0012b95..3dd8099f3 100644 --- a/ironic/dhcp/neutron.py +++ b/ironic/dhcp/neutron.py @@ -19,6 +19,7 @@ import time from neutronclient.common import exceptions as neutron_client_exc from neutronclient.v2_0 import client as clientv20 from oslo.config import cfg +from oslo.utils import netutils from ironic.common import exception from ironic.common.i18n import _ @@ -26,7 +27,6 @@ from ironic.common.i18n import _LE from ironic.common.i18n import _LW from ironic.common import keystone from ironic.common import network -from ironic.common import utils from ironic.dhcp import base from ironic.drivers.modules import ssh from ironic.openstack.common import log as logging @@ -210,7 +210,7 @@ class NeutronDHCPApi(base.BaseDHCP): ip_address = fixed_ips[0].get('ip_address', None) if ip_address: - if utils.is_valid_ipv4(ip_address): + if netutils.is_valid_ipv4(ip_address): return ip_address else: LOG.error(_LE("Neutron returned invalid IPv4 address %s."), |