Use oslo_utils replace oslo.utils

oslo.utils 1.2.0 has changed its namespace from oslo.utils to
oslo_utils.

Co-Authored-By: Victor Sergeyev <vsergeyev@mirantis.com>

Change-Id: I07ce4791cfe3b32efb02be60f792bd1c4f03d82f

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

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
 

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 = [

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

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
 

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

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

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 _

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

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 _

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 _

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

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 _

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 _

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 _

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 _

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

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 _

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
 

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

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 _

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

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

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 _

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 _

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

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

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

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

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 _

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 _

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
 

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

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

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

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 _

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
 

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 _

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

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
 

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

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

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

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

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

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

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

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

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

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
 

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

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