diff --git a/ironic/api/controllers/v1/types.py b/ironic/api/controllers/v1/types.py index 85a6c8373e..393ace333e 100644 --- a/ironic/api/controllers/v1/types.py +++ b/ironic/api/controllers/v1/types.py @@ -17,7 +17,7 @@ import json -from oslo.utils import strutils +from oslo_utils import strutils import six import wsme from wsme import types as wtypes diff --git a/ironic/common/glance_service/service_utils.py b/ironic/common/glance_service/service_utils.py index 828f01c8b2..cce31dcee6 100644 --- a/ironic/common/glance_service/service_utils.py +++ b/ironic/common/glance_service/service_utils.py @@ -19,9 +19,9 @@ import itertools import logging import random -from oslo.utils import timeutils from oslo_config import cfg from oslo_serialization import jsonutils +from oslo_utils import timeutils import six import six.moves.urllib.parse as urlparse diff --git a/ironic/common/image_service.py b/ironic/common/image_service.py index ee72dd68e0..548c9aac22 100644 --- a/ironic/common/image_service.py +++ b/ironic/common/image_service.py @@ -15,8 +15,8 @@ # under the License. -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils glance_opts = [ diff --git a/ironic/common/service.py b/ironic/common/service.py index 3a00e56014..5513d67384 100644 --- a/ironic/common/service.py +++ b/ironic/common/service.py @@ -19,8 +19,8 @@ import socket from oslo import messaging -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils from ironic.common import config from ironic.common.i18n import _LE diff --git a/ironic/common/utils.py b/ironic/common/utils.py index 730ba02f6e..3cbf9362bf 100644 --- a/ironic/common/utils.py +++ b/ironic/common/utils.py @@ -29,9 +29,9 @@ import tempfile import uuid import netaddr -from oslo.utils import excutils from oslo_concurrency import processutils from oslo_config import cfg +from oslo_utils import excutils import paramiko import six diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index 92e15dda23..1cc308cc08 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -50,10 +50,10 @@ import threading import eventlet from eventlet import greenpool from oslo import messaging -from oslo.utils import excutils from oslo_concurrency import lockutils from oslo_config import cfg from oslo_db import exception as db_exception +from oslo_utils import excutils from ironic.common import dhcp_factory from ironic.common import driver_factory diff --git a/ironic/conductor/task_manager.py b/ironic/conductor/task_manager.py index d921876f5f..615c63f974 100644 --- a/ironic/conductor/task_manager.py +++ b/ironic/conductor/task_manager.py @@ -96,8 +96,8 @@ raised in the background thread.): import functools -from oslo.utils import excutils from oslo_config import cfg +from oslo_utils import excutils import retrying from ironic.common import driver_factory diff --git a/ironic/conductor/utils.py b/ironic/conductor/utils.py index ebcdef2e39..6ff8e22def 100644 --- a/ironic/conductor/utils.py +++ b/ironic/conductor/utils.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import excutils +from oslo_utils import excutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py index bf5ffac6e0..ad7ff7796c 100644 --- a/ironic/db/sqlalchemy/api.py +++ b/ironic/db/sqlalchemy/api.py @@ -19,11 +19,11 @@ import collections import datetime -from oslo.utils import timeutils from oslo_config import cfg from oslo_db import exception as db_exc from oslo_db.sqlalchemy import session as db_session from oslo_db.sqlalchemy import utils as db_utils +from oslo_utils import timeutils from sqlalchemy.orm.exc import NoResultFound from ironic.common import exception diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index ddcd57c596..1c26963235 100644 --- a/ironic/dhcp/neutron.py +++ b/ironic/dhcp/neutron.py @@ -18,8 +18,8 @@ import time from neutronclient.common import exceptions as neutron_client_exc from neutronclient.v2_0 import client as clientv20 -from oslo.utils import netutils from oslo_config import cfg +from oslo_utils import netutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/agent.py b/ironic/drivers/agent.py index 65ab0e568b..16a3e2ea03 100644 --- a/ironic/drivers/agent.py +++ b/ironic/drivers/agent.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.utils import importutils +from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/base.py b/ironic/drivers/base.py index 24a4d5440a..397b8eb6ef 100644 --- a/ironic/drivers/base.py +++ b/ironic/drivers/base.py @@ -24,7 +24,7 @@ import functools import inspect import eventlet -from oslo.utils import excutils +from oslo_utils import excutils import six from ironic.common import exception diff --git a/ironic/drivers/drac.py b/ironic/drivers/drac.py index 796d783090..2ac2200814 100644 --- a/ironic/drivers/drac.py +++ b/ironic/drivers/drac.py @@ -14,7 +14,7 @@ DRAC Driver for remote system management using Dell Remote Access Card. """ -from oslo.utils import importutils +from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/fake.py b/ironic/drivers/fake.py index ac01e0c8cd..b8c886b07f 100644 --- a/ironic/drivers/fake.py +++ b/ironic/drivers/fake.py @@ -17,7 +17,7 @@ Fake drivers used in testing. """ -from oslo.utils import importutils +from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/ilo.py b/ironic/drivers/ilo.py index 921adece17..bfa588bc61 100644 --- a/ironic/drivers/ilo.py +++ b/ironic/drivers/ilo.py @@ -15,7 +15,7 @@ iLO Driver for managing HP Proliant Gen8 and above servers. """ -from oslo.utils import importutils +from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/modules/agent_base_vendor.py b/ironic/drivers/modules/agent_base_vendor.py index 8d52451942..479386daae 100644 --- a/ironic/drivers/modules/agent_base_vendor.py +++ b/ironic/drivers/modules/agent_base_vendor.py @@ -19,8 +19,8 @@ import time -from oslo.utils import excutils from oslo_config import cfg +from oslo_utils import excutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/modules/amt/common.py b/ironic/drivers/modules/amt/common.py index 3a19652530..f85a29ea22 100644 --- a/ironic/drivers/modules/amt/common.py +++ b/ironic/drivers/modules/amt/common.py @@ -16,8 +16,8 @@ Common functionalities for AMT Driver """ from xml.etree import ElementTree -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils import six from ironic.common import boot_devices diff --git a/ironic/drivers/modules/console_utils.py b/ironic/drivers/modules/console_utils.py index 58d8857c0c..b6d5ca055e 100644 --- a/ironic/drivers/modules/console_utils.py +++ b/ironic/drivers/modules/console_utils.py @@ -24,9 +24,9 @@ import subprocess import tempfile import time -from oslo.utils import netutils from oslo_concurrency import processutils from oslo_config import cfg +from oslo_utils import netutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/modules/deploy_utils.py b/ironic/drivers/modules/deploy_utils.py index f1bec18392..5e6a0a5eba 100644 --- a/ironic/drivers/modules/deploy_utils.py +++ b/ironic/drivers/modules/deploy_utils.py @@ -25,11 +25,11 @@ import stat import tempfile import time -from oslo.utils import excutils -from oslo.utils import units from oslo_concurrency import processutils from oslo_config import cfg from oslo_serialization import jsonutils +from oslo_utils import excutils +from oslo_utils import units import requests import six diff --git a/ironic/drivers/modules/drac/client.py b/ironic/drivers/modules/drac/client.py index 4ed4fbe2ac..3b4b889293 100644 --- a/ironic/drivers/modules/drac/client.py +++ b/ironic/drivers/modules/drac/client.py @@ -17,7 +17,7 @@ Wrapper for pywsman.Client from xml.etree import ElementTree -from oslo.utils import importutils +from oslo_utils import importutils from ironic.common import exception from ironic.drivers.modules.drac import common as drac_common diff --git a/ironic/drivers/modules/drac/common.py b/ironic/drivers/modules/drac/common.py index 79dadecda7..47e38ba09c 100644 --- a/ironic/drivers/modules/drac/common.py +++ b/ironic/drivers/modules/drac/common.py @@ -15,7 +15,7 @@ Common functionalities shared between different DRAC modules. """ -from oslo.utils import importutils +from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/modules/drac/management.py b/ironic/drivers/modules/drac/management.py index 26455be570..f5c5a890fe 100644 --- a/ironic/drivers/modules/drac/management.py +++ b/ironic/drivers/modules/drac/management.py @@ -19,8 +19,8 @@ DRAC Management Driver """ -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_utils import excutils +from oslo_utils import importutils from ironic.common import boot_devices from ironic.common import exception diff --git a/ironic/drivers/modules/drac/power.py b/ironic/drivers/modules/drac/power.py index 3ad79b8c69..41c5aa3e0e 100644 --- a/ironic/drivers/modules/drac/power.py +++ b/ironic/drivers/modules/drac/power.py @@ -15,8 +15,8 @@ DRAC Power Driver using the Base Server Profile """ -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_utils import excutils +from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _LE diff --git a/ironic/drivers/modules/iboot.py b/ironic/drivers/modules/iboot.py index 963b94a9ba..dfcd157369 100644 --- a/ironic/drivers/modules/iboot.py +++ b/ironic/drivers/modules/iboot.py @@ -19,7 +19,7 @@ Ironic iBoot PDU power manager. """ -from oslo.utils import importutils +from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/modules/ilo/common.py b/ironic/drivers/modules/ilo/common.py index 807e89b475..93a6b97abd 100644 --- a/ironic/drivers/modules/ilo/common.py +++ b/ironic/drivers/modules/ilo/common.py @@ -18,8 +18,8 @@ Common functionalities shared between different iLO modules. import tempfile -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/modules/ilo/management.py b/ironic/drivers/modules/ilo/management.py index 33097e7ae2..7870fadb63 100644 --- a/ironic/drivers/modules/ilo/management.py +++ b/ironic/drivers/modules/ilo/management.py @@ -15,7 +15,7 @@ iLO Management Interface """ -from oslo.utils import importutils +from oslo_utils import importutils from ironic.common import boot_devices from ironic.common import exception diff --git a/ironic/drivers/modules/ilo/power.py b/ironic/drivers/modules/ilo/power.py index 69d5b22bad..1230c84f14 100644 --- a/ironic/drivers/modules/ilo/power.py +++ b/ironic/drivers/modules/ilo/power.py @@ -16,8 +16,8 @@ iLO Power Driver """ -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils from ironic.common import boot_devices from ironic.common import exception diff --git a/ironic/drivers/modules/ipminative.py b/ironic/drivers/modules/ipminative.py index fa13665896..2bb4f1f7e4 100644 --- a/ironic/drivers/modules/ipminative.py +++ b/ironic/drivers/modules/ipminative.py @@ -22,9 +22,9 @@ Ironic Native IPMI power manager. import os import tempfile -from oslo.utils import excutils -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import importutils from ironic.common import boot_devices from ironic.common import exception diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py index 52fc6d0087..cb4ed86ac8 100644 --- a/ironic/drivers/modules/ipmitool.py +++ b/ironic/drivers/modules/ipmitool.py @@ -36,9 +36,9 @@ import stat import tempfile import time -from oslo.utils import excutils from oslo_concurrency import processutils from oslo_config import cfg +from oslo_utils import excutils from ironic.common import boot_devices from ironic.common import exception diff --git a/ironic/drivers/modules/irmc/common.py b/ironic/drivers/modules/irmc/common.py index f8ba44db6f..8dc340de62 100644 --- a/ironic/drivers/modules/irmc/common.py +++ b/ironic/drivers/modules/irmc/common.py @@ -15,8 +15,8 @@ Common functionalities shared between different iRMC modules. """ -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/modules/irmc/power.py b/ironic/drivers/modules/irmc/power.py index f650d609a8..6876c828b2 100644 --- a/ironic/drivers/modules/irmc/power.py +++ b/ironic/drivers/modules/irmc/power.py @@ -14,8 +14,8 @@ """ iRMC Power Driver using the Base Server Profile """ -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/drivers/modules/iscsi_deploy.py b/ironic/drivers/modules/iscsi_deploy.py index d929f5a724..b6c10ec478 100644 --- a/ironic/drivers/modules/iscsi_deploy.py +++ b/ironic/drivers/modules/iscsi_deploy.py @@ -15,8 +15,8 @@ import os -from oslo.utils import strutils from oslo_config import cfg +from oslo_utils import strutils import six from six.moves.urllib import parse diff --git a/ironic/drivers/modules/seamicro.py b/ironic/drivers/modules/seamicro.py index 8f72c10aab..fce3d690ba 100644 --- a/ironic/drivers/modules/seamicro.py +++ b/ironic/drivers/modules/seamicro.py @@ -21,8 +21,8 @@ Provides vendor passthru methods for SeaMicro specific functionality. import os import re -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils from six.moves.urllib import parse as urlparse from ironic.common import boot_devices diff --git a/ironic/drivers/modules/snmp.py b/ironic/drivers/modules/snmp.py index f1274535f8..10ab431662 100644 --- a/ironic/drivers/modules/snmp.py +++ b/ironic/drivers/modules/snmp.py @@ -29,8 +29,8 @@ models. import abc -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils import six from ironic.common import exception diff --git a/ironic/drivers/modules/virtualbox.py b/ironic/drivers/modules/virtualbox.py index ded3f50966..d2aa4d7652 100644 --- a/ironic/drivers/modules/virtualbox.py +++ b/ironic/drivers/modules/virtualbox.py @@ -14,8 +14,8 @@ VirtualBox Driver Modules """ -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils from ironic.common import boot_devices from ironic.common import exception diff --git a/ironic/drivers/pxe.py b/ironic/drivers/pxe.py index c14c1aa2d0..75a9efc017 100644 --- a/ironic/drivers/pxe.py +++ b/ironic/drivers/pxe.py @@ -17,7 +17,7 @@ PXE Driver and supporting meta-classes. """ -from oslo.utils import importutils +from oslo_utils import importutils from ironic.common import exception from ironic.common.i18n import _ diff --git a/ironic/netconf.py b/ironic/netconf.py index b4a76a09fc..a6fd19ee3b 100644 --- a/ironic/netconf.py +++ b/ironic/netconf.py @@ -15,8 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import netutils from oslo_config import cfg +from oslo_utils import netutils CONF = cfg.CONF diff --git a/ironic/objects/utils.py b/ironic/objects/utils.py index 2a15a4b828..1d29cf1077 100644 --- a/ironic/objects/utils.py +++ b/ironic/objects/utils.py @@ -19,7 +19,7 @@ import datetime import iso8601 import netaddr -from oslo.utils import timeutils +from oslo_utils import timeutils import six from ironic.common.i18n import _ diff --git a/ironic/tests/__init__.py b/ironic/tests/__init__.py index 918237d30b..7e8390833e 100644 --- a/ironic/tests/__init__.py +++ b/ironic/tests/__init__.py @@ -32,3 +32,14 @@ eventlet.monkey_patch(os=False) # The code below enables nosetests to work with i18n _() blocks import six.moves.builtins as __builtin__ setattr(__builtin__, '_', lambda x: x) + +# NOTE(viktors): Ironic unittests patches timeutils from oslo_utils. At the +# same time oslo.db uses oslo.utils not oslo_utils till 1.5.0 +# release, so timeutils in oslo.db code at and leave not +# patched, so time comparison fails in Ironic tests. To avoid +# this we have oslo_db use timeutils from oslo_utils in tests. +# TODO(viktors): Remove this workaround when Ironic will use oslo.db 1.5.0 +from oslo_db.sqlalchemy import models +from oslo_utils import timeutils + +models.timeutils = timeutils diff --git a/ironic/tests/api/v1/test_chassis.py b/ironic/tests/api/v1/test_chassis.py index 597fea76d8..01adb29f5f 100644 --- a/ironic/tests/api/v1/test_chassis.py +++ b/ironic/tests/api/v1/test_chassis.py @@ -18,8 +18,8 @@ Tests for the API /chassis/ methods. import datetime import mock -from oslo.utils import timeutils from oslo_config import cfg +from oslo_utils import timeutils from six.moves.urllib import parse as urlparse from wsme import types as wtypes diff --git a/ironic/tests/api/v1/test_nodes.py b/ironic/tests/api/v1/test_nodes.py index 0943fd897a..859ac4e89a 100644 --- a/ironic/tests/api/v1/test_nodes.py +++ b/ironic/tests/api/v1/test_nodes.py @@ -19,8 +19,8 @@ import datetime import json import mock -from oslo.utils import timeutils from oslo_config import cfg +from oslo_utils import timeutils import pecan from six.moves.urllib import parse as urlparse from testtools.matchers import HasLength diff --git a/ironic/tests/api/v1/test_ports.py b/ironic/tests/api/v1/test_ports.py index 25b3c3bc28..82f3507602 100644 --- a/ironic/tests/api/v1/test_ports.py +++ b/ironic/tests/api/v1/test_ports.py @@ -18,8 +18,8 @@ Tests for the API /ports/ methods. import datetime import mock -from oslo.utils import timeutils from oslo_config import cfg +from oslo_utils import timeutils from six.moves.urllib import parse as urlparse from testtools.matchers import HasLength from wsme import types as wtypes diff --git a/ironic/tests/db/test_conductor.py b/ironic/tests/db/test_conductor.py index dc9ce43f4f..d93aad1209 100644 --- a/ironic/tests/db/test_conductor.py +++ b/ironic/tests/db/test_conductor.py @@ -18,7 +18,7 @@ import datetime import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from ironic.common import exception from ironic.tests.db import base diff --git a/ironic/tests/db/test_nodes.py b/ironic/tests/db/test_nodes.py index e8baa67b39..b00f8be89e 100644 --- a/ironic/tests/db/test_nodes.py +++ b/ironic/tests/db/test_nodes.py @@ -18,7 +18,7 @@ import datetime import mock -from oslo.utils import timeutils +from oslo_utils import timeutils import six from ironic.common import exception diff --git a/ironic/tests/db/utils.py b/ironic/tests/db/utils.py index 28b931a6b2..f69e69458d 100644 --- a/ironic/tests/db/utils.py +++ b/ironic/tests/db/utils.py @@ -15,7 +15,7 @@ """Ironic test utilities.""" -from oslo.utils import timeutils +from oslo_utils import timeutils from ironic.common import states from ironic.db import api as db_api diff --git a/ironic/tests/drivers/ilo/test_common.py b/ironic/tests/drivers/ilo/test_common.py index b36608a38a..f1f771a1a4 100644 --- a/ironic/tests/drivers/ilo/test_common.py +++ b/ironic/tests/drivers/ilo/test_common.py @@ -18,8 +18,8 @@ import tempfile import mock -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils from ironic.common import exception from ironic.common import images diff --git a/ironic/tests/drivers/ilo/test_management.py b/ironic/tests/drivers/ilo/test_management.py index 78d4e71135..149fff8944 100644 --- a/ironic/tests/drivers/ilo/test_management.py +++ b/ironic/tests/drivers/ilo/test_management.py @@ -16,8 +16,8 @@ """Test class for Management Interface used by iLO modules.""" import mock -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils from ironic.common import boot_devices from ironic.common import exception diff --git a/ironic/tests/drivers/ilo/test_power.py b/ironic/tests/drivers/ilo/test_power.py index 3614b689f3..ead1a00f3c 100644 --- a/ironic/tests/drivers/ilo/test_power.py +++ b/ironic/tests/drivers/ilo/test_power.py @@ -16,8 +16,8 @@ """Test class for IloPower module.""" import mock -from oslo.utils import importutils from oslo_config import cfg +from oslo_utils import importutils from ironic.common import boot_devices from ironic.common import exception diff --git a/ironic/tests/drivers/test_console_utils.py b/ironic/tests/drivers/test_console_utils.py index da9e1557eb..503a9ebde9 100644 --- a/ironic/tests/drivers/test_console_utils.py +++ b/ironic/tests/drivers/test_console_utils.py @@ -24,9 +24,9 @@ import subprocess import tempfile import mock -from oslo.utils import netutils from oslo_concurrency import processutils from oslo_config import cfg +from oslo_utils import netutils from ironic.common import exception from ironic.common import utils diff --git a/ironic/tests/drivers/third_party_driver_mocks.py b/ironic/tests/drivers/third_party_driver_mocks.py index 09c6033c61..4100221013 100644 --- a/ironic/tests/drivers/third_party_driver_mocks.py +++ b/ironic/tests/drivers/third_party_driver_mocks.py @@ -32,7 +32,7 @@ Current list of mocked libraries: import sys import mock -from oslo.utils import importutils +from oslo_utils import importutils from ironic.drivers.modules import ipmitool diff --git a/ironic/tests/objects/test_conductor.py b/ironic/tests/objects/test_conductor.py index aa7764a037..81ceee0921 100644 --- a/ironic/tests/objects/test_conductor.py +++ b/ironic/tests/objects/test_conductor.py @@ -17,7 +17,7 @@ import datetime import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from ironic import objects from ironic.objects import utils as obj_utils diff --git a/ironic/tests/objects/test_objects.py b/ironic/tests/objects/test_objects.py index b7fde013c2..cb9f72a786 100644 --- a/ironic/tests/objects/test_objects.py +++ b/ironic/tests/objects/test_objects.py @@ -18,7 +18,7 @@ import gettext import iso8601 import netaddr -from oslo.utils import timeutils +from oslo_utils import timeutils import six from ironic.common import exception