From 185effbb189988e9943113adc30773439f366b66 Mon Sep 17 00:00:00 2001 From: Luong Anh Tuan Date: Tue, 22 Nov 2016 10:38:00 +0700 Subject: [PATCH] Use function is_valid_mac from oslo.utils Oslo.utils 3.17 provides same function, just use it. Change-Id: I16e3775a239b017c3431c425d86085380e28da4c --- ironic_inspector/plugins/standard.py | 3 ++- ironic_inspector/utils.py | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ironic_inspector/plugins/standard.py b/ironic_inspector/plugins/standard.py index 8cea00f1a..8c79ba06d 100644 --- a/ironic_inspector/plugins/standard.py +++ b/ironic_inspector/plugins/standard.py @@ -17,6 +17,7 @@ import sys import netaddr from oslo_config import cfg +from oslo_utils import netutils from oslo_utils import units import six @@ -177,7 +178,7 @@ class ValidateInterfacesHook(base.ProcessingHook): name, data=data) continue - if not utils.is_valid_mac(mac): + if not netutils.is_valid_mac(mac): LOG.warning(_LW('MAC %(mac)s for interface %(name)s is ' 'not valid, skipping'), {'mac': mac, 'name': name}, diff --git a/ironic_inspector/utils.py b/ironic_inspector/utils.py index 2dad8d681..154f70d03 100644 --- a/ironic_inspector/utils.py +++ b/ironic_inspector/utils.py @@ -13,7 +13,6 @@ import datetime import logging as pylog -import re import futurist from keystonemiddleware import auth_token @@ -21,7 +20,6 @@ from oslo_config import cfg from oslo_log import log from oslo_middleware import cors as cors_middleware import pytz -import six from ironic_inspector.common.i18n import _, _LE from ironic_inspector import conf # noqa @@ -189,13 +187,6 @@ def check_auth(request): raise Error(_('Access denied'), code=403) -def is_valid_mac(address): - """Return whether given value is a valid MAC.""" - m = "[0-9a-f]{2}(:[0-9a-f]{2}){5}$" - return (isinstance(address, six.string_types) - and re.match(m, address.lower())) - - def get_auth_strategy(): if CONF.authenticate is not None: return 'keystone' if CONF.authenticate else 'noauth'