Move oslo.utils to oslo_utils namespace

This is the fourth in a series of changes to move to using
the new oslo_<library> namespace that is being used for
oslo libraries.

There is currently a shim in place that is allowing the old
oslo.<library> imports to work, but we need to be prepared for
when the shims go away.  Thus, we need patches like this one to
move to the new namespace.

This patch also updates our hacking check to ensure that no instances
of oslo.utils sneak back in.

Change-Id: I19c331a9b54c5f42c278577ecc59fe1b65e61af0

diff --git a/cinder/api/contrib/admin_actions.py b/cinder/api/contrib/admin_actions.py
index 964af7b3802f256057b2685a34b53f91372228d7..0c1b9e89e0744d6a95c92110f4a69400da4cdb5a 100644 (file)
--- a/cinder/api/contrib/admin_actions.py
+++ b/cinder/api/contrib/admin_actions.py
@@ -12,7 +12,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import webob
 from webob import exc
 

diff --git a/cinder/api/contrib/hosts.py b/cinder/api/contrib/hosts.py
index 4f79248c83b43e4e53a8714d77d71e070b2db66d..1940ab4d3eefc4860febb1cf8394e03cf2038ee3 100644 (file)
--- a/cinder/api/contrib/hosts.py
+++ b/cinder/api/contrib/hosts.py
@@ -17,8 +17,8 @@
 
 from xml.parsers import expat
 
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import timeutils
 import webob.exc
 
 from cinder.api import extensions

diff --git a/cinder/api/contrib/qos_specs_manage.py b/cinder/api/contrib/qos_specs_manage.py
index 062d1f6d679bc4eeb7a733427febe38e677c82da..03481ed35e4eea1e86e0a3af1caca67180d25a45 100644 (file)
--- a/cinder/api/contrib/qos_specs_manage.py
+++ b/cinder/api/contrib/qos_specs_manage.py
@@ -15,7 +15,7 @@
 
 """The QoS specs extension"""
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import six
 import webob
 

diff --git a/cinder/api/contrib/quotas.py b/cinder/api/contrib/quotas.py
index 121224fefdc6942fb902075ae174157215ad5306..8ef8ee2e4eebe88071e9af5ba3eb6630f1b8886f 100644 (file)
--- a/cinder/api/contrib/quotas.py
+++ b/cinder/api/contrib/quotas.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import webob
 
 from cinder.api import extensions

diff --git a/cinder/api/contrib/services.py b/cinder/api/contrib/services.py
index 369b85e0b8c096a58cbef6bdf13adbce69b08a22..c0971bec816d8ae184679a9c59c77284a313a279 100644 (file)
--- a/cinder/api/contrib/services.py
+++ b/cinder/api/contrib/services.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import timeutils
 import webob.exc
 
 from cinder.api import extensions

diff --git a/cinder/api/contrib/volume_actions.py b/cinder/api/contrib/volume_actions.py
index fd4bc1f8b08e57129692b5e77235b3b659374ca1..fa018923c86dd642cc3cb58f3526d85d2ccc2d29 100644 (file)
--- a/cinder/api/contrib/volume_actions.py
+++ b/cinder/api/contrib/volume_actions.py
@@ -14,7 +14,7 @@
 
 
 from oslo import messaging
-from oslo.utils import strutils
+from oslo_utils import strutils
 import webob
 
 from cinder.api import extensions

diff --git a/cinder/api/extensions.py b/cinder/api/extensions.py
index f8733f66d1b686d8c3c7d169211fbc1c4322447e..579bdf31a31d65461198ed7ae0e9601f183016ee 100644 (file)
--- a/cinder/api/extensions.py
+++ b/cinder/api/extensions.py
@@ -16,8 +16,8 @@
 
 import os
 
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 import webob.dec
 import webob.exc
 

diff --git a/cinder/api/openstack/wsgi.py b/cinder/api/openstack/wsgi.py
index 648a88407e24635a730c7c3dc447070e427a2bca..6b3a1ee2f38e4aaf7e8e68369807f1254044bedd 100644 (file)
--- a/cinder/api/openstack/wsgi.py
+++ b/cinder/api/openstack/wsgi.py
@@ -22,7 +22,7 @@ from xml.parsers import expat
 
 from lxml import etree
 from oslo.serialization import jsonutils
-from oslo.utils import excutils
+from oslo_utils import excutils
 import six
 import webob
 

diff --git a/cinder/api/v1/limits.py b/cinder/api/v1/limits.py
index 0f44c7b7b4ee668fea2e0dcddc38f18e29e2f580..7793b20ac780cd6dea470497cd1a764ebcf4199b 100644 (file)
--- a/cinder/api/v1/limits.py
+++ b/cinder/api/v1/limits.py
@@ -25,7 +25,7 @@ import re
 import time
 
 from oslo.serialization import jsonutils
-from oslo.utils import importutils
+from oslo_utils import importutils
 import webob.dec
 import webob.exc
 

diff --git a/cinder/api/v1/snapshots.py b/cinder/api/v1/snapshots.py
index 016d1e44701d1b7113361393bee78e2452e1fb3c..59eb85607ec42ba79134175321dc1d734009e5aa 100644 (file)
--- a/cinder/api/v1/snapshots.py
+++ b/cinder/api/v1/snapshots.py
@@ -15,7 +15,7 @@
 
 """The volumes snapshots api."""
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import webob
 from webob import exc
 

diff --git a/cinder/api/v2/limits.py b/cinder/api/v2/limits.py
index e89393d900b14cb768abf0ac44fbfe5c50c2283f..6df83b98302414558905edfad539ce6c36e60b33 100644 (file)
--- a/cinder/api/v2/limits.py
+++ b/cinder/api/v2/limits.py
@@ -25,7 +25,7 @@ import re
 import time
 
 from oslo.serialization import jsonutils
-from oslo.utils import importutils
+from oslo_utils import importutils
 import webob.dec
 import webob.exc
 

diff --git a/cinder/api/v2/snapshots.py b/cinder/api/v2/snapshots.py
index 64d1d28436724df1df814393b20084288e26703c..27060c3081c007a6c647a944e17ff239564d3da6 100644 (file)
--- a/cinder/api/v2/snapshots.py
+++ b/cinder/api/v2/snapshots.py
@@ -15,7 +15,7 @@
 
 """The volumes snapshots api."""
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import webob
 from webob import exc
 

diff --git a/cinder/api/v2/types.py b/cinder/api/v2/types.py
index 5710df97a98b38d57e583b2b99b76c1a899e79c3..6707ccbab1c6602297793b699224d647b43dd870 100644 (file)
--- a/cinder/api/v2/types.py
+++ b/cinder/api/v2/types.py
@@ -15,7 +15,7 @@
 
 """The volume type & volume types extra specs extension."""
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 from webob import exc
 
 from cinder.api.openstack import wsgi

diff --git a/cinder/api/views/limits.py b/cinder/api/views/limits.py
index b676f10efee32ca903af1123abb4f38072e8331f..d8c22af0576009e40d7e160ba38db44fe4308e50 100644 (file)
--- a/cinder/api/views/limits.py
+++ b/cinder/api/views/limits.py
@@ -15,7 +15,7 @@
 
 import datetime
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 
 class ViewBuilder(object):

diff --git a/cinder/backup/__init__.py b/cinder/backup/__init__.py
index 7482eb458a5863d98181edd458e3a7f989a6a66a..d39c6159f3d6eb03746734fab09d09ff0dd7dfdb 100644 (file)
--- a/cinder/backup/__init__.py
+++ b/cinder/backup/__init__.py
@@ -16,7 +16,7 @@
 # Importing full names to not pollute the namespace and cause possible
 # collisions with use of 'from cinder.backup import <foo>' elsewhere.
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 from cinder.common import config
 

diff --git a/cinder/backup/api.py b/cinder/backup/api.py
index 1b3cee173213e1968e07cf28f7598f6a0cb2001f..89a1f36528665652d6e7e99c73abe4c6aa0c9b89 100644 (file)
--- a/cinder/backup/api.py
+++ b/cinder/backup/api.py
@@ -19,8 +19,8 @@ Handles all requests relating to the volume backups service.
 
 
 from eventlet import greenthread
-from oslo.utils import excutils
 from oslo_config import cfg
+from oslo_utils import excutils
 
 from cinder.backup import rpcapi as backup_rpcapi
 from cinder import context

diff --git a/cinder/backup/drivers/ceph.py b/cinder/backup/drivers/ceph.py
index 57887eeb10aabfdfa8d500cc07ac2aeeefc1c3fa..6c780c6ced964801bb1200f8e6cbb3fb999f9e56 100644 (file)
--- a/cinder/backup/drivers/ceph.py
+++ b/cinder/backup/drivers/ceph.py
@@ -49,10 +49,10 @@ import subprocess
 import time
 
 import eventlet
-from oslo.utils import encodeutils
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import encodeutils
+from oslo_utils import excutils
+from oslo_utils import units
 
 from cinder.backup.driver import BackupDriver
 from cinder import exception

diff --git a/cinder/backup/drivers/swift.py b/cinder/backup/drivers/swift.py
index 50139c3e87c57c6261911bcc482ed97f1db95228..25ac7149a232985b8e239cede3c4687ba26fec38 100644 (file)
--- a/cinder/backup/drivers/swift.py
+++ b/cinder/backup/drivers/swift.py
@@ -37,10 +37,10 @@ import os
 import socket
 
 import eventlet
-from oslo.utils import excutils
-from oslo.utils import timeutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import timeutils
+from oslo_utils import units
 import six
 from swiftclient import client as swift
 

diff --git a/cinder/backup/manager.py b/cinder/backup/manager.py
index a766eeb2829fd127857115009d91db36a05e502a..89c1408236403010680b92c894b60c99c2277c5f 100644 (file)
--- a/cinder/backup/manager.py
+++ b/cinder/backup/manager.py
@@ -34,9 +34,9 @@ Volume backups can be created, restored, deleted and listed.
 """
 
 from oslo import messaging
-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 cinder.backup import driver
 from cinder.backup import rpcapi as backup_rpcapi

diff --git a/cinder/brick/local_dev/lvm.py b/cinder/brick/local_dev/lvm.py
index 9d2cdf7ff6eb1c95c8fe1d78c23f09bc339edcd7..9776ddf2e315e2a1df13d8b99947216e941ebc5a 100644 (file)
--- a/cinder/brick/local_dev/lvm.py
+++ b/cinder/brick/local_dev/lvm.py
@@ -22,8 +22,8 @@ import math
 import re
 import time
 
-from oslo.utils import excutils
 from oslo_concurrency import processutils as putils
+from oslo_utils import excutils
 
 from cinder.brick import exception
 from cinder.brick import executor

diff --git a/cinder/compute/__init__.py b/cinder/compute/__init__.py
index b3cdf137ab31c61ee973fc959c7181e53de4d994..21a94f826c48fff8e85c16b453b800f11e1ce8a9 100644 (file)
--- a/cinder/compute/__init__.py
+++ b/cinder/compute/__init__.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import oslo.config.cfg
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 
 _compute_opts = [

diff --git a/cinder/consistencygroup/__init__.py b/cinder/consistencygroup/__init__.py
index efa3bc0e12eb2fb2551440a187dbe8f1cd2cf95e..29aa02d00310bf40ad10ef69421a61ba74b384ce 100644 (file)
--- a/cinder/consistencygroup/__init__.py
+++ b/cinder/consistencygroup/__init__.py
@@ -16,7 +16,7 @@
 # Importing full names to not pollute the namespace and cause possible
 # collisions with use of 'from cinder.transfer import <foo>' elsewhere.
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 from cinder.common import config
 

diff --git a/cinder/consistencygroup/api.py b/cinder/consistencygroup/api.py
index 6c225f05d62a6f79523f43364832e0846fc7b1aa..9c90c0a38671a63274597dd53047053f8c1bd0f8 100644 (file)
--- a/cinder/consistencygroup/api.py
+++ b/cinder/consistencygroup/api.py
@@ -20,9 +20,9 @@ Handles all requests relating to consistency groups.
 
 import functools
 
-from oslo.utils import excutils
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import timeutils
 
 from cinder.db import base
 from cinder import exception

diff --git a/cinder/context.py b/cinder/context.py
index 81602b87ae390d2f907c3cb02e87d5f1bddf3ff7..e9879d8653a73e4923c400a18c49e494609a96b5 100644 (file)
--- a/cinder/context.py
+++ b/cinder/context.py
@@ -19,8 +19,8 @@
 
 import copy
 
-from oslo.utils import timeutils
 from oslo_context import context
+from oslo_utils import timeutils
 
 from cinder.i18n import _
 from cinder.openstack.common import local

diff --git a/cinder/db/base.py b/cinder/db/base.py
index e35943af2168bb3be76ee404faa26c33f8f86cb4..69365c6dfb101b1957fcd314033dccfaa477861d 100644 (file)
--- a/cinder/db/base.py
+++ b/cinder/db/base.py
@@ -17,8 +17,8 @@
 """Base class for classes that need modular database access."""
 
 
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 
 db_driver_opt = cfg.StrOpt('db_driver',

diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py
index 8034ee31bdf07853e16ca159595e1b8269deb7a9..172cdcf20298c3f70bae2b4fe1710463c7033c0d 100644 (file)
--- a/cinder/db/sqlalchemy/api.py
+++ b/cinder/db/sqlalchemy/api.py
@@ -26,11 +26,11 @@ import time
 import uuid
 import warnings
 
-from oslo.utils import timeutils
 from oslo_config import cfg
 from oslo_db import exception as db_exc
 from oslo_db import options
 from oslo_db.sqlalchemy import session as db_session
+from oslo_utils import timeutils
 import osprofiler.sqlalchemy
 import six
 import sqlalchemy

diff --git a/cinder/db/sqlalchemy/models.py b/cinder/db/sqlalchemy/models.py
index d053820a1d8f4f0e0ccf55d51531de60c1972d91..82d423a58a4ad5d901449abebdb9def2e12ff2da 100644 (file)
--- a/cinder/db/sqlalchemy/models.py
+++ b/cinder/db/sqlalchemy/models.py
@@ -19,9 +19,9 @@
 SQLAlchemy models for cinder data.
 """
 
-from oslo.utils import timeutils
 from oslo_config import cfg
 from oslo_db.sqlalchemy import models
+from oslo_utils import timeutils
 from sqlalchemy import Column, Integer, String, Text, schema
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import ForeignKey, DateTime, Boolean

diff --git a/cinder/hacking/checks.py b/cinder/hacking/checks.py
index 29efadd9aa3ed106b0c321e24acad1e49ae1f2f6..b7965ec5b776e9df6d90d4cfe81b5b5d63ed4ef6 100644 (file)
--- a/cinder/hacking/checks.py
+++ b/cinder/hacking/checks.py
@@ -44,7 +44,7 @@ no_audit_log = re.compile(r"(.)*LOG\.audit(.)*")
 # NOTE(jsbryant): When other oslo libraries switch over non-namespaced
 # imports, we will need to add them to the regex below.
 oslo_namespace_imports = re.compile(r"from[\s]*oslo[.](concurrency|db"
-                                    "|config)")
+                                    "|config|utils)")
 
 
 def no_vi_headers(physical_line, line_number, lines):

diff --git a/cinder/image/glance.py b/cinder/image/glance.py
index fb936eb9d346c6ac4fb81eb8d8fb422de458b0e1..1f85429f3bec5e7e79e1d8f12227d39989c561b2 100644 (file)
--- a/cinder/image/glance.py
+++ b/cinder/image/glance.py
@@ -28,8 +28,8 @@ import time
 
 import glanceclient.exc
 from oslo.serialization import jsonutils
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import timeutils
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception

diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py
index 4e24778f98b44be8b72830cb8602e62262ebd030..ff0570d05545d0c5ed766e491cc289812ef0bd62 100644 (file)
--- a/cinder/image/image_utils.py
+++ b/cinder/image/image_utils.py
@@ -28,10 +28,10 @@ import contextlib
 import os
 import tempfile
 
-from oslo.utils import timeutils
-from oslo.utils import units
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import timeutils
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _

diff --git a/cinder/keymgr/__init__.py b/cinder/keymgr/__init__.py
index 6c144451d2cda74bc00baf4d94bc5e6201368986..846e74691173af2e9a366c34adc39048ee5992c8 100644 (file)
--- a/cinder/keymgr/__init__.py
+++ b/cinder/keymgr/__init__.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 keymgr_opts = [
     cfg.StrOpt('api_class',

diff --git a/cinder/keymgr/barbican.py b/cinder/keymgr/barbican.py
index 09ec4b721422cb12210513955600b58e11e1effe..34c6d79bc3a02afab132668efaf5b5156d10aa7f 100644 (file)
--- a/cinder/keymgr/barbican.py
+++ b/cinder/keymgr/barbican.py
@@ -24,8 +24,8 @@ import binascii
 from barbicanclient import client as barbican_client
 from keystoneclient.auth import identity
 from keystoneclient import session
-from oslo.utils import excutils
 from oslo_config import cfg
+from oslo_utils import excutils
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/quota.py b/cinder/quota.py
index 570b6bc4f812ce04d8d3a44d2529a666d25f8848..d8ae0ad48cc42de654da886744dbbac7a180619d 100644 (file)
--- a/cinder/quota.py
+++ b/cinder/quota.py
@@ -19,9 +19,9 @@
 
 import datetime
 
-from oslo.utils import importutils
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import importutils
+from oslo_utils import timeutils
 
 from cinder import context
 from cinder import db

diff --git a/cinder/replication/__init__.py b/cinder/replication/__init__.py
index aa36e07c35ff655bf0784823995e2b8233dbf68c..4b8c6cf5bea55b0a5525e370f1b949f3a2811fe9 100644 (file)
--- a/cinder/replication/__init__.py
+++ b/cinder/replication/__init__.py
@@ -13,8 +13,8 @@
 #    under the License.
 
 
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 
 CONF = cfg.CONF

diff --git a/cinder/scheduler/driver.py b/cinder/scheduler/driver.py
index 158d7a241407aec7bbea9ddae71ecbc050a928e6..c27fef152fec2ffa4c21068efed3d52035f823ec 100644 (file)
--- a/cinder/scheduler/driver.py
+++ b/cinder/scheduler/driver.py
@@ -19,9 +19,9 @@
 Scheduler base class that all Schedulers should inherit from
 """
 
-from oslo.utils import importutils
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import importutils
+from oslo_utils import timeutils
 
 from cinder import db
 from cinder.i18n import _

diff --git a/cinder/scheduler/flows/create_volume.py b/cinder/scheduler/flows/create_volume.py
index b6f70305a34b32fc9e78a7d20e04807235fb5fb0..4e55d4d1a337fd14ecd410fb320a5e4063914725 100644 (file)
--- a/cinder/scheduler/flows/create_volume.py
+++ b/cinder/scheduler/flows/create_volume.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 import taskflow.engines
 from taskflow.patterns import linear_flow
 

diff --git a/cinder/scheduler/host_manager.py b/cinder/scheduler/host_manager.py
index 47828063c4c9433ae1ffd2f858a366f52133a5d1..582a954dc1e273fd8abe19ad1d5cf074c42419b7 100644 (file)
--- a/cinder/scheduler/host_manager.py
+++ b/cinder/scheduler/host_manager.py
@@ -19,8 +19,8 @@ Manage hosts in the current zone.
 
 import UserDict
 
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import timeutils
 
 from cinder import db
 from cinder import exception

diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py
index ee69741d5bdad5752cfc70f82f7e16a06103af91..0790bcdbf493e3abf670d77ef65c186d955d4d41 100644 (file)
--- a/cinder/scheduler/manager.py
+++ b/cinder/scheduler/manager.py
@@ -20,9 +20,9 @@ Scheduler Service
 """
 
 from oslo import messaging
-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 cinder import context
 from cinder import db

diff --git a/cinder/scheduler/scheduler_options.py b/cinder/scheduler/scheduler_options.py
index 965f1f42c8e7374a826c4ae25b6c3f6780bb6469..a70218058b7dc4c317e576d8d6a5e40fc2e147d9 100644 (file)
--- a/cinder/scheduler/scheduler_options.py
+++ b/cinder/scheduler/scheduler_options.py
@@ -24,8 +24,8 @@ import datetime
 import json
 import os
 
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import timeutils
 
 from cinder.i18n import _LE
 from cinder.openstack.common import log as logging

diff --git a/cinder/service.py b/cinder/service.py
index 347309583023aa229b828d003f2b05b132a76da2..5918bafa293dcbb74e13810c005175de2cd5cecb 100644 (file)
--- a/cinder/service.py
+++ b/cinder/service.py
@@ -23,10 +23,10 @@ import os
 import random
 
 from oslo import messaging
-from oslo.utils import importutils
 from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_db import exception as db_exc
+from oslo_utils import importutils
 import osprofiler.notifier
 from osprofiler import profiler
 import osprofiler.web

diff --git a/cinder/test.py b/cinder/test.py
index 429c1f2a5b482fd9f12446c5f2477549ae9a374f..a502c08a9b572322d9aede976e1c561799e3f1e4 100644 (file)
--- a/cinder/test.py
+++ b/cinder/test.py
@@ -30,11 +30,11 @@ import fixtures
 import mock
 import mox
 from oslo.messaging import conffixture as messaging_conffixture
-from oslo.utils import strutils
-from oslo.utils import timeutils
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
+from oslo_utils import strutils
+from oslo_utils import timeutils
 import stubout
 import testtools
 

diff --git a/cinder/tests/api/contrib/test_admin_actions.py b/cinder/tests/api/contrib/test_admin_actions.py
index 69bf92f31c3a1551394f6c6e74ad71e6203088f2..a037bcc4a4bdc83f954cb89b011b8e670510a4bd 100644 (file)
--- a/cinder/tests/api/contrib/test_admin_actions.py
+++ b/cinder/tests/api/contrib/test_admin_actions.py
@@ -14,10 +14,10 @@ import ast
 
 import fixtures
 from oslo.serialization import jsonutils
-from oslo.utils import timeutils
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
+from oslo_utils import timeutils
 import webob
 from webob import exc
 

diff --git a/cinder/tests/api/contrib/test_availability_zones.py b/cinder/tests/api/contrib/test_availability_zones.py
index 06ecd88f470d68237f801db5a6361e70e84c52cb..a4683991160f06d06432c527fd872f368b46f8bb 100644 (file)
--- a/cinder/tests/api/contrib/test_availability_zones.py
+++ b/cinder/tests/api/contrib/test_availability_zones.py
@@ -16,7 +16,7 @@
 import datetime
 
 from lxml import etree
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 import cinder.api.contrib.availability_zones
 import cinder.context

diff --git a/cinder/tests/api/contrib/test_backups.py b/cinder/tests/api/contrib/test_backups.py
index b6c3a89bb071fd1df40550bf1cb1c0adad0dc344..3bf5f22a745775aa5899dc1407c9e86dab1ef97e 100644 (file)
--- a/cinder/tests/api/contrib/test_backups.py
+++ b/cinder/tests/api/contrib/test_backups.py
@@ -21,7 +21,7 @@ import json
 from xml.dom import minidom
 
 import mock
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import webob
 
 # needed for stubs to work

diff --git a/cinder/tests/api/contrib/test_hosts.py b/cinder/tests/api/contrib/test_hosts.py
index 8e578884801ce532a7171904fbf299c20da83f51..d0208971a233f395fa472bd6e3a2ed2d3ed9481e 100644 (file)
--- a/cinder/tests/api/contrib/test_hosts.py
+++ b/cinder/tests/api/contrib/test_hosts.py
@@ -16,7 +16,7 @@
 import datetime
 
 from lxml import etree
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import webob.exc
 
 from cinder.api.contrib import hosts as os_hosts

diff --git a/cinder/tests/api/contrib/test_services.py b/cinder/tests/api/contrib/test_services.py
index cf26ebd96ef36450c8bcbf508e364e2aa95e4ccc..273af9471c12ab45b1f9f29b739ca53a6be35f83 100644 (file)
--- a/cinder/tests/api/contrib/test_services.py
+++ b/cinder/tests/api/contrib/test_services.py
@@ -16,7 +16,7 @@
 
 from datetime import datetime
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import webob.exc
 
 from cinder.api.contrib import services

diff --git a/cinder/tests/api/fakes.py b/cinder/tests/api/fakes.py
index 0242a50ce61746d3d09ab287410725997c7a2214..fd6aa0930bb2f49f4635c6e04bc734d98064556e 100644 (file)
--- a/cinder/tests/api/fakes.py
+++ b/cinder/tests/api/fakes.py
@@ -15,7 +15,7 @@
 
 import uuid
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import routes
 import webob
 import webob.dec

diff --git a/cinder/tests/api/v1/test_types.py b/cinder/tests/api/v1/test_types.py
index 13c8836d51e223f6a5ab0d4f6e2242c3745aeed8..290f279e42ee1ac939dd0f9f22a0a40c17ec015a 100644 (file)
--- a/cinder/tests/api/v1/test_types.py
+++ b/cinder/tests/api/v1/test_types.py
@@ -16,7 +16,7 @@
 import uuid
 
 from lxml import etree
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import webob
 
 from cinder.api.v1 import types

diff --git a/cinder/tests/api/v2/test_types.py b/cinder/tests/api/v2/test_types.py
index 66bd9cedc3c0d2008485a797ae272192fba4861e..c2877dd2c1361437d5f5b994f64b39ab84179918 100644 (file)
--- a/cinder/tests/api/v2/test_types.py
+++ b/cinder/tests/api/v2/test_types.py
@@ -16,7 +16,7 @@
 import uuid
 
 from lxml import etree
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import six
 import webob
 

diff --git a/cinder/tests/integrated/api/client.py b/cinder/tests/integrated/api/client.py
index 1c16306c9ab031a2f3ad21ab720fdb1dd69ea961..95e4196777a3259a105f8a85b7ce17f9ef94c2df 100644 (file)
--- a/cinder/tests/integrated/api/client.py
+++ b/cinder/tests/integrated/api/client.py
@@ -13,7 +13,7 @@
 #    under the License.
 
 from oslo.serialization import jsonutils
-from oslo.utils import netutils
+from oslo_utils import netutils
 import requests
 import six.moves.urllib.parse as urlparse
 

diff --git a/cinder/tests/scheduler/fakes.py b/cinder/tests/scheduler/fakes.py
index e5fa3a32e69e97e2b3383d14cd558501a838d7c6..35e5337c7717385425ad62a1b2ea3b7fc2081c2c 100644 (file)
--- a/cinder/tests/scheduler/fakes.py
+++ b/cinder/tests/scheduler/fakes.py
@@ -16,7 +16,7 @@
 Fakes For Scheduler tests.
 """
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from cinder.openstack.common import uuidutils
 from cinder.scheduler import filter_scheduler

diff --git a/cinder/tests/scheduler/test_host_manager.py b/cinder/tests/scheduler/test_host_manager.py
index 881630f37bf6c2f1756eca285cce4332864e139d..eea6bcc8cccd213404ae709ed53e4d6c45033237 100644 (file)
--- a/cinder/tests/scheduler/test_host_manager.py
+++ b/cinder/tests/scheduler/test_host_manager.py
@@ -17,8 +17,8 @@ Tests For HostManager
 """
 
 import mock
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import timeutils
 
 from cinder import exception
 from cinder.openstack.common.scheduler import filters
@@ -84,7 +84,7 @@ class HostManagerTestCase(test.TestCase):
         self.assertEqual(expected, mock_func.call_args_list)
         self.assertEqual(set(result), set(self.fake_hosts))
 
-    @mock.patch('oslo.utils.timeutils.utcnow')
+    @mock.patch('oslo_utils.timeutils.utcnow')
     def test_update_service_capabilities(self, _mock_utcnow):
         service_states = self.host_manager.service_states
         self.assertDictMatch(service_states, {})
@@ -118,7 +118,7 @@ class HostManagerTestCase(test.TestCase):
 
     @mock.patch('cinder.db.service_get_all_by_topic')
     @mock.patch('cinder.utils.service_is_up')
-    @mock.patch('oslo.utils.timeutils.utcnow')
+    @mock.patch('oslo_utils.timeutils.utcnow')
     def test_update_and_get_pools(self, _mock_utcnow,
                                   _mock_service_is_up,
                                   _mock_service_get_all_by_topic):

diff --git a/cinder/tests/scheduler/test_scheduler.py b/cinder/tests/scheduler/test_scheduler.py
index 7351c11bd413437a3ae8fac4ab278ddb024d45f9..bdaf35eb3aed4ec2971c2de07f45175deaa71ead 100644 (file)
--- a/cinder/tests/scheduler/test_scheduler.py
+++ b/cinder/tests/scheduler/test_scheduler.py
@@ -278,7 +278,7 @@ class SchedulerDriverModuleTestCase(test.TestCase):
         self.context = context.RequestContext('fake_user', 'fake_project')
 
     @mock.patch('cinder.db.volume_update')
-    @mock.patch('oslo.utils.timeutils.utcnow')
+    @mock.patch('oslo_utils.timeutils.utcnow')
     def test_volume_host_update_db(self, _mock_utcnow, _mock_vol_update):
         _mock_utcnow.return_value = 'fake-now'
         driver.volume_update_db(self.context, 31337, 'fake_host')

diff --git a/cinder/tests/targets/test_base_iscsi_driver.py b/cinder/tests/targets/test_base_iscsi_driver.py
index 3bcb3cad6c3cc1a0a82142bba2aec90381b25ae4..14c80db93b1e81de87a25f75f7fb050f861e29d2 100644 (file)
--- a/cinder/tests/targets/test_base_iscsi_driver.py
+++ b/cinder/tests/targets/test_base_iscsi_driver.py
@@ -10,8 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import timeutils
 
 from cinder import exception
 from cinder import test

diff --git a/cinder/tests/targets/test_tgt_driver.py b/cinder/tests/targets/test_tgt_driver.py
index fec0bf4281f75b6e9ce3e9f4e177aaffae5f43f9..fb88afa9009bc57313fc93071b929e41a0999897 100644 (file)
--- a/cinder/tests/targets/test_tgt_driver.py
+++ b/cinder/tests/targets/test_tgt_driver.py
@@ -14,8 +14,8 @@ import os
 import tempfile
 
 import mock
-from oslo.utils import timeutils
 from oslo_concurrency import processutils as putils
+from oslo_utils import timeutils
 
 from cinder import context
 from cinder import test

diff --git a/cinder/tests/test_backup.py b/cinder/tests/test_backup.py
index 847384d5d623d5fdd25c0089a778f427436ed183..d82e81cc3530960c523bf3900342b0ed4be34725 100644 (file)
--- a/cinder/tests/test_backup.py
+++ b/cinder/tests/test_backup.py
@@ -20,9 +20,9 @@ Tests for Backup code.
 import tempfile
 
 import mock
-from oslo.utils import importutils
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import importutils
+from oslo_utils import timeutils
 
 from cinder.backup import manager
 from cinder import context

diff --git a/cinder/tests/test_coraid.py b/cinder/tests/test_coraid.py
index f1206b59175cca8c6bd3058f2fb94804c48be854..a55a339f7fe057b3982e9420fa2f681950248aac 100644 (file)
--- a/cinder/tests/test_coraid.py
+++ b/cinder/tests/test_coraid.py
@@ -19,8 +19,8 @@ import math
 import mock
 import mox
 from oslo.serialization import jsonutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder.brick.initiator import connector
 from cinder import exception

diff --git a/cinder/tests/test_drbdmanagedrv.py b/cinder/tests/test_drbdmanagedrv.py
index 3eb033e09a425d751be09b92a642528f966dce68..c87957dc5ec075df0b010ecce18f688c340acec5 100644 (file)
--- a/cinder/tests/test_drbdmanagedrv.py
+++ b/cinder/tests/test_drbdmanagedrv.py
@@ -16,8 +16,8 @@
 import collections
 
 import mock
-from oslo.utils import importutils
-from oslo.utils import timeutils
+from oslo_utils import importutils
+from oslo_utils import timeutils
 
 from cinder import context
 from cinder.openstack.common import log as logging

diff --git a/cinder/tests/test_fusionio_ioControl.py b/cinder/tests/test_fusionio_ioControl.py
index 1455f991f24f546a77f05d610f35fc2fd61c3c83..cf00ea76285b0c6e779010b5873d029748377642 100644 (file)
--- a/cinder/tests/test_fusionio_ioControl.py
+++ b/cinder/tests/test_fusionio_ioControl.py
@@ -17,8 +17,8 @@ import copy
 import json
 
 import mock
-from oslo.utils import timeutils
-from oslo.utils import units
+from oslo_utils import timeutils
+from oslo_utils import units
 import requests
 
 from cinder import context

diff --git a/cinder/tests/test_glusterfs.py b/cinder/tests/test_glusterfs.py
index fc2feba85fa696bc80145494f77dad6901de3c66..4e70bd4e8b0e0c7a04b2d921adb520e8479ddbc4 100644 (file)
--- a/cinder/tests/test_glusterfs.py
+++ b/cinder/tests/test_glusterfs.py
@@ -21,9 +21,9 @@ import time
 import traceback
 
 import mock
-from oslo.utils import units
 from oslo_concurrency import processutils as putils
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import brick
 from cinder import compute

diff --git a/cinder/tests/test_gpfs.py b/cinder/tests/test_gpfs.py
index 1535f0c6cc09f7e2d6acd1de7af484f845ab91c5..cea131316dca60d0c0334c6e7021c2068eae4d53 100644 (file)
--- a/cinder/tests/test_gpfs.py
+++ b/cinder/tests/test_gpfs.py
@@ -18,9 +18,9 @@ import shutil
 import tempfile
 
 import mock
-from oslo.utils import units
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_hacking.py b/cinder/tests/test_hacking.py
index 19068c100b95dc8bf65dcb8a74c23356dd206e33..5dfb27b2fa3c36c01cccee43d9fee88a6fc682c0 100644 (file)
--- a/cinder/tests/test_hacking.py
+++ b/cinder/tests/test_hacking.py
@@ -151,3 +151,7 @@ class HackingTestCase(test.TestCase):
             "from oslo.config import foo"))))
         self.assertEqual(0, len(list(checks.check_oslo_namespace_imports(
             "from oslo_config import bar"))))
+        self.assertEqual(1, len(list(checks.check_oslo_namespace_imports(
+            "from oslo.utils import foo"))))
+        self.assertEqual(0, len(list(checks.check_oslo_namespace_imports(
+            "from oslo_utils import bar"))))

diff --git a/cinder/tests/test_hp3par.py b/cinder/tests/test_hp3par.py
index 77878c9bac66f88d82539b47d29d2b769ac9b9a3..91102595012176cee15f6d5790e22c5fa105d8ac 100644 (file)
--- a/cinder/tests/test_hp3par.py
+++ b/cinder/tests/test_hp3par.py
@@ -19,8 +19,8 @@ import mock
 
 import ast
 
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_hplefthand.py b/cinder/tests/test_hplefthand.py
index 564dbdeb4c633177501115076111ad1f2231896a..8bcfdc20185e8bd6122ba838396e17553015e4c2 100644 (file)
--- a/cinder/tests/test_hplefthand.py
+++ b/cinder/tests/test_hplefthand.py
@@ -15,7 +15,7 @@
 #
 """Unit tests for OpenStack Cinder volume drivers."""
 import mock
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_huawei_drivers_compatibility.py b/cinder/tests/test_huawei_drivers_compatibility.py
index 5a5df04a573789daafb6f8124a34a72b5db4e032..98d6b308eb56d89a12dab50a353a7f17dcea3fd6 100644 (file)
--- a/cinder/tests/test_huawei_drivers_compatibility.py
+++ b/cinder/tests/test_huawei_drivers_compatibility.py
@@ -13,8 +13,8 @@
 #    under the License.
 
 
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 from cinder import context
 from cinder import test

diff --git a/cinder/tests/test_huaweistorac.py b/cinder/tests/test_huaweistorac.py
index 6bb52dd66ccc3f825b9c84e08c01c3aef33d0c41..8175bbb76e26244721ac9354d5d844e4001a9947 100644 (file)
--- a/cinder/tests/test_huaweistorac.py
+++ b/cinder/tests/test_huaweistorac.py
@@ -23,7 +23,7 @@ import re
 import tempfile
 from xml.dom.minidom import Document
 
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder.brick.initiator import connector as brick_connector
 from cinder import exception

diff --git a/cinder/tests/test_ibm_flashsystem.py b/cinder/tests/test_ibm_flashsystem.py
index 2a453e6a65e9128e38bfb1590d08e504e173ba5e..3060f451f45fc9bfe2ab4ef7c90e55a7da37f717 100644 (file)
--- a/cinder/tests/test_ibm_flashsystem.py
+++ b/cinder/tests/test_ibm_flashsystem.py
@@ -20,9 +20,9 @@ Tests for the IBM FlashSystem volume driver.
 """
 
 import mock
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_concurrency import processutils
+from oslo_utils import excutils
+from oslo_utils import units
 import six
 
 import random

diff --git a/cinder/tests/test_ibmnas.py b/cinder/tests/test_ibmnas.py
index 23157d8e2839bf60046f8fe011ae03fbf7a12445..114dd857d843aff68c346bfb595859d40b9d9a14 100644 (file)
--- a/cinder/tests/test_ibmnas.py
+++ b/cinder/tests/test_ibmnas.py
@@ -22,8 +22,8 @@ NAS based IBM GPFS Storage Systems).
 """
 
 import mock
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_nexenta.py b/cinder/tests/test_nexenta.py
index 0192db102260b2c834bee8c7d5ad483b6c911296..7d39c79cef7330542ba484aaaba1cd0534b22293 100644 (file)
--- a/cinder/tests/test_nexenta.py
+++ b/cinder/tests/test_nexenta.py
@@ -21,7 +21,7 @@ import base64
 import urllib2
 
 import mox as mox_lib
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import context
 from cinder import db

diff --git a/cinder/tests/test_nfs.py b/cinder/tests/test_nfs.py
index 46df23fbfd49eb46c8cc4d8e66ee868071904c56..45851e0d288309748765de4bf71fd689a615505e 100644 (file)
--- a/cinder/tests/test_nfs.py
+++ b/cinder/tests/test_nfs.py
@@ -23,7 +23,7 @@ import mox as mox_lib
 from mox import IgnoreArg
 from mox import IsA
 from mox import stubout
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_prophetstor_dpl.py b/cinder/tests/test_prophetstor_dpl.py
index 657fcf31f70eeb2057c6abad9ee47020e5e2e85d..3780949c0102cbc699e58e28c009e53e29522766 100644 (file)
--- a/cinder/tests/test_prophetstor_dpl.py
+++ b/cinder/tests/test_prophetstor_dpl.py
@@ -18,7 +18,7 @@ import httplib
 import re
 
 import mock
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import exception
 from cinder import test

diff --git a/cinder/tests/test_pure.py b/cinder/tests/test_pure.py
index 50492589ce20bac63c05626ae0cad17b20e7b27a..d0139a047895df2130ac78340ef3035798e380dc 100644 (file)
--- a/cinder/tests/test_pure.py
+++ b/cinder/tests/test_pure.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 import mock
-from oslo.utils import units
 from oslo_concurrency import processutils
+from oslo_utils import units
 
 from cinder import exception
 from cinder import test

diff --git a/cinder/tests/test_quobyte.py b/cinder/tests/test_quobyte.py
index 23ff13ef3fdce6dfa01135a4aa85c6a4f9ed5ddb..2bce9aea40f909ff81fa6701a252b12ed71196bb 100644 (file)
--- a/cinder/tests/test_quobyte.py
+++ b/cinder/tests/test_quobyte.py
@@ -26,9 +26,9 @@ import mox as mox_lib
 from mox import IgnoreArg
 from mox import IsA
 from mox import stubout
-from oslo.utils import units
 from oslo_concurrency import processutils as putils
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_quota.py b/cinder/tests/test_quota.py
index 0143438620bb468929d4ec20106719c85e4e026c..617b94c27a95917430655904f7071532cee9d03d 100644 (file)
--- a/cinder/tests/test_quota.py
+++ b/cinder/tests/test_quota.py
@@ -19,8 +19,8 @@
 import datetime
 
 import mock
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import timeutils
 
 from cinder import backup
 from cinder import context

diff --git a/cinder/tests/test_rbd.py b/cinder/tests/test_rbd.py
index 2dabe8c4a0379aa2f673e55bbec9e754c259dc07..8af04ea2f035822d69c780d627cbfaaafa7440f5 100644 (file)
--- a/cinder/tests/test_rbd.py
+++ b/cinder/tests/test_rbd.py
@@ -21,8 +21,8 @@ import os
 import tempfile
 
 import mock
-from oslo.utils import timeutils
-from oslo.utils import units
+from oslo_utils import timeutils
+from oslo_utils import units
 
 from cinder import db
 from cinder import exception

diff --git a/cinder/tests/test_replication.py b/cinder/tests/test_replication.py
index 59f22e7038b96149129b660798cfc0a95cfedd14..ef4e15d3a1b3bd632d816a4ccf05b522cff2e43b 100644 (file)
--- a/cinder/tests/test_replication.py
+++ b/cinder/tests/test_replication.py
@@ -16,8 +16,8 @@ Tests for Volume replication code.
 """
 
 import mock
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 from cinder import context
 from cinder import db

diff --git a/cinder/tests/test_scality.py b/cinder/tests/test_scality.py
index 657ff9aaccbc10103aacf1e48487fa2ef0c3a9f2..bb63d1261765928ef6b928aa9c4d889419fcbee7 100644 (file)
--- a/cinder/tests/test_scality.py
+++ b/cinder/tests/test_scality.py
@@ -22,7 +22,7 @@ import shutil
 import tempfile
 
 import mox as mox_lib
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_sheepdog.py b/cinder/tests/test_sheepdog.py
index 97fb768041ae64d1f04fbc8684ab7475acafbe19..38ad4428b5338b059ad857827a524670fddceee2 100644 (file)
--- a/cinder/tests/test_sheepdog.py
+++ b/cinder/tests/test_sheepdog.py
@@ -18,8 +18,8 @@
 import contextlib
 
 import mock
-from oslo.utils import units
 from oslo_concurrency import processutils
+from oslo_utils import units
 
 from cinder.image import image_utils
 from cinder import test

diff --git a/cinder/tests/test_solidfire.py b/cinder/tests/test_solidfire.py
index 7d45609cb54366f8f670980d69ca4b37affb4850..d86b51fc3d092bc32746c437167cecb3ae23ac8b 100644 (file)
--- a/cinder/tests/test_solidfire.py
+++ b/cinder/tests/test_solidfire.py
@@ -18,8 +18,8 @@ import datetime
 
 import mock
 import mox
-from oslo.utils import timeutils
-from oslo.utils import units
+from oslo_utils import timeutils
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_srb.py b/cinder/tests/test_srb.py
index b084c2680215652b16c0d80d91d1baa14a48e139..e3f02c1187201b9ce24c298d51979e6808b48616 100644 (file)
--- a/cinder/tests/test_srb.py
+++ b/cinder/tests/test_srb.py
@@ -17,8 +17,8 @@ Unit tests for the Scality Rest Block Volume Driver.
 """
 
 import mock
-from oslo.utils import units
 from oslo_concurrency import processutils
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_storpool.py b/cinder/tests/test_storpool.py
index 6a6fec7969d33a027261ee32b3213cf86f4c300e..36a0598232ddbb2b78fd2c4cdfe6af525ccd5a25 100644 (file)
--- a/cinder/tests/test_storpool.py
+++ b/cinder/tests/test_storpool.py
@@ -18,7 +18,7 @@ import re
 import sys
 
 import mock
-from oslo.utils import units
+from oslo_utils import units
 
 
 fakeStorPool = mock.Mock()

diff --git a/cinder/tests/test_storwize_svc.py b/cinder/tests/test_storwize_svc.py
index 9272d9427718991a8f7468ff25df8a70c1f58056..b8bcfe50e89e64647b61d80a1e533a3b0c05d727 100644 (file)
--- a/cinder/tests/test_storwize_svc.py
+++ b/cinder/tests/test_storwize_svc.py
@@ -23,10 +23,10 @@ import re
 import time
 
 import mock
-from oslo.utils import excutils
-from oslo.utils import importutils
-from oslo.utils import units
 from oslo_concurrency import processutils
+from oslo_utils import excutils
+from oslo_utils import importutils
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_utils.py b/cinder/tests/test_utils.py
index 4ee35a433f20a91d003bdd0bf15f55d0fdab17f5..1eeec4854e996c6c155755165cb7ed307fdd656c 100644 (file)
--- a/cinder/tests/test_utils.py
+++ b/cinder/tests/test_utils.py
@@ -19,9 +19,9 @@ import os
 import uuid
 
 import mock
-from oslo.utils import timeutils
 from oslo_concurrency import processutils as putils
 from oslo_config import cfg
+from oslo_utils import timeutils
 import paramiko
 import six
 
@@ -353,7 +353,7 @@ class GenericUtilsTestCase(test.TestCase):
                           utils.read_file_as_root,
                           test_filepath)
 
-    @mock.patch('oslo.utils.timeutils.utcnow')
+    @mock.patch('oslo_utils.timeutils.utcnow')
     def test_service_is_up(self, mock_utcnow):
         fts_func = datetime.datetime.fromtimestamp
         fake_now = 1000
@@ -893,7 +893,7 @@ class AuditPeriodTest(test.TestCase):
                                                 month=2,
                                                 year=2012))
 
-    @mock.patch('oslo.utils.timeutils.utcnow',
+    @mock.patch('oslo_utils.timeutils.utcnow',
                 return_value=datetime.datetime(day=1,
                                                month=1,
                                                year=2012))
@@ -902,7 +902,7 @@ class AuditPeriodTest(test.TestCase):
         self.assertEqual(datetime.datetime(day=1, month=11, year=2011), begin)
         self.assertEqual(datetime.datetime(day=1, month=12, year=2011), end)
 
-    @mock.patch('oslo.utils.timeutils.utcnow',
+    @mock.patch('oslo_utils.timeutils.utcnow',
                 return_value=datetime.datetime(day=2,
                                                month=1,
                                                year=2012))

diff --git a/cinder/tests/test_v6000_fcp.py b/cinder/tests/test_v6000_fcp.py
index 34d50920407f509a373c334d52fd55019840e646..a28ac7ae010bd2b37f729848b88a9932477da970 100644 (file)
--- a/cinder/tests/test_v6000_fcp.py
+++ b/cinder/tests/test_v6000_fcp.py
@@ -18,7 +18,7 @@ Tests for Violin Memory 6000 Series All-Flash Array Fibrechannel Driver
 """
 
 import mock
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import context
 from cinder.db.sqlalchemy import models

diff --git a/cinder/tests/test_v6000_iscsi.py b/cinder/tests/test_v6000_iscsi.py
index 2c9f8e750b362dba598442899682972e9b218d93..c87df966f3516835e3db84a6c927ff185e8ae27d 100644 (file)
--- a/cinder/tests/test_v6000_iscsi.py
+++ b/cinder/tests/test_v6000_iscsi.py
@@ -18,7 +18,7 @@ Tests for Violin Memory 6000 Series All-Flash Array iSCSI driver
 """
 
 import mock
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import context
 from cinder.db.sqlalchemy import models

diff --git a/cinder/tests/test_vmware_datastore.py b/cinder/tests/test_vmware_datastore.py
index a118a52d00b32e2dfc897441e04089332e391963..fe70779391d9938253c8bdda11f230865b8e5ccb 100644 (file)
--- a/cinder/tests/test_vmware_datastore.py
+++ b/cinder/tests/test_vmware_datastore.py
@@ -18,7 +18,7 @@ Unit tests for datastore module.
 """
 
 import mock
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import test
 from cinder.volume.drivers.vmware import datastore as ds_sel

diff --git a/cinder/tests/test_vmware_vmdk.py b/cinder/tests/test_vmware_vmdk.py
index 6140fc25f11b3f25cf95796bc4230255a32cb1fd..942355e7f558dc0ccc4d1f9988920f4b2978c21b 100644 (file)
--- a/cinder/tests/test_vmware_vmdk.py
+++ b/cinder/tests/test_vmware_vmdk.py
@@ -22,7 +22,7 @@ import os
 
 import mock
 import mox
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import exception
 from cinder.image import glance

diff --git a/cinder/tests/test_vmware_volumeops.py b/cinder/tests/test_vmware_volumeops.py
index 9644413a779a21621099bee3bda37291d40e69db..d2d91d37aa38672111c17eaa4ceb0e559847e2fb 100644 (file)
--- a/cinder/tests/test_vmware_volumeops.py
+++ b/cinder/tests/test_vmware_volumeops.py
@@ -18,7 +18,7 @@ Test suite for VMware VMDK driver volumeops module.
 """
 
 import mock
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import test
 from cinder.volume.drivers.vmware import error_util

diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
index 8778129ea8f0950b71d81fcb743797322180e7ae..120b7a34c4508b940fd5baa87fa58dafbb11b2d2 100644 (file)
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@ -30,10 +30,10 @@ import eventlet
 import mock
 import mox
 from oslo.serialization import jsonutils
-from oslo.utils import importutils
-from oslo.utils import timeutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import importutils
+from oslo_utils import timeutils
+from oslo_utils import units
 from stevedore import extension
 from taskflow.engines.action_engine import engine
 

diff --git a/cinder/tests/test_zfssa.py b/cinder/tests/test_zfssa.py
index b0fdcf8f403cfab1910053c49a8a7466879ee826..740314eb026e589d608e3cd2353a513e5e2d22d7 100644 (file)
--- a/cinder/tests/test_zfssa.py
+++ b/cinder/tests/test_zfssa.py
@@ -19,7 +19,7 @@ import mock
 
 from json import JSONEncoder
 
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder.openstack.common import log as logging
 from cinder import test

diff --git a/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py b/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py
index 2129abb1db307c7ec42e981f0bb93cbe196d0d9c..69c7c139b10ea6726781d0b327117b595237ac1d 100644 (file)
--- a/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py
+++ b/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py
@@ -20,8 +20,8 @@
 """Unit tests for Brocade fc zone driver."""
 
 import mock
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 import paramiko
 
 from cinder import exception

diff --git a/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py b/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py
index b1441aa0ddee220801f8ff95c495fd26d05c1dba..a9aa3c4a454709f4b6b5252a782a3b33f09e0afb 100644 (file)
--- a/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py
+++ b/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py
@@ -17,9 +17,9 @@
 
 """Unit tests for Cisco FC zone driver."""
 
-from oslo.utils import importutils
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 from cinder import exception
 from cinder import test

diff --git a/cinder/transfer/__init__.py b/cinder/transfer/__init__.py
index b778d52bdfaa7fc294c35b7c84e9a551b5e6968e..7b4107dad229c9174f4dbc4ec6ff57e868e9a4a5 100644 (file)
--- a/cinder/transfer/__init__.py
+++ b/cinder/transfer/__init__.py
@@ -17,8 +17,8 @@
 # collisions with use of 'from cinder.transfer import <foo>' elsewhere.
 
 
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 
 CONF = cfg.CONF

diff --git a/cinder/transfer/api.py b/cinder/transfer/api.py
index 3789f547759bba15e1fda4fbbcd14cac5273413a..164a97e7e8c46d87e54b5d7ee1af526ff9d76105 100644 (file)
--- a/cinder/transfer/api.py
+++ b/cinder/transfer/api.py
@@ -22,8 +22,8 @@ import hashlib
 import hmac
 import os
 
-from oslo.utils import excutils
 from oslo_config import cfg
+from oslo_utils import excutils
 
 from cinder.db import base
 from cinder import exception

diff --git a/cinder/utils.py b/cinder/utils.py
index 357305255ea42321ad66cd5ca2d3185d68951fa3..674ca5b952b2291652aefdd4f491d63938c7c208 100644 (file)
--- a/cinder/utils.py
+++ b/cinder/utils.py
@@ -35,11 +35,11 @@ from xml import sax
 from xml.sax import expatreader
 from xml.sax import saxutils
 
-from oslo.utils import importutils
-from oslo.utils import timeutils
 from oslo_concurrency import lockutils
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import importutils
+from oslo_utils import timeutils
 import six
 
 from cinder.brick.initiator import connector

diff --git a/cinder/volume/__init__.py b/cinder/volume/__init__.py
index 374aa8851c8601eb47cf38a15e6fc9e173cfde34..55c98ef3d70020274ed4854cbb720fec8389de52 100644 (file)
--- a/cinder/volume/__init__.py
+++ b/cinder/volume/__init__.py
@@ -17,7 +17,7 @@
 # Importing full names to not pollute the namespace and cause possible
 # collisions with use of 'from cinder.volume import <foo>' elsewhere.
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 from cinder.common import config
 

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index 303372c2fa98fa56b4b01e50d3e72e089fc120f4..9cd7f3a401ccddecdbaa482f6e0872dfdde49ed6 100644 (file)
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -23,9 +23,9 @@ import collections
 import datetime
 import functools
 
-from oslo.utils import excutils
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import timeutils
 import six
 
 from cinder import context

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index bfc644caa43460e5aac00ef9f296cb01b63eb35f..34a6d89bbfa7dd8fbedc92daaf83df694a08c15b 100644 (file)
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -19,9 +19,9 @@ Drivers for volumes.
 
 import time
 
-from oslo.utils import excutils
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import excutils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LW

diff --git a/cinder/volume/drivers/block_device.py b/cinder/volume/drivers/block_device.py
index f59baf3e2661935c2af268f674a6709eeeb1d101..4b49c0f409448b643d2abf251c851dd8386a98de 100644 (file)
--- a/cinder/volume/drivers/block_device.py
+++ b/cinder/volume/drivers/block_device.py
@@ -15,8 +15,8 @@
 
 import os
 
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 from cinder import context
 from cinder.db.sqlalchemy import api

diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py
index 1ce9375f5606c79c4e82a7d1b9f575dd94432f74..e0c4bca8c9fa58bbec9a370204a66e92d60e79ca 100644 (file)
--- a/cinder/volume/drivers/coraid.py
+++ b/cinder/volume/drivers/coraid.py
@@ -27,9 +27,9 @@ import urllib
 import urllib2
 
 from oslo.serialization import jsonutils
-from oslo.utils import units
 from oslo_concurrency import lockutils
 from oslo_config import cfg
+from oslo_utils import units
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception

diff --git a/cinder/volume/drivers/datera.py b/cinder/volume/drivers/datera.py
index 2c33a9815f5b5e20fb242a402e72b4564b13d33a..2165519b45747da691a20ea0aa3dede195366ffe 100644 (file)
--- a/cinder/volume/drivers/datera.py
+++ b/cinder/volume/drivers/datera.py
@@ -15,8 +15,8 @@
 
 import json
 
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import units
 import requests
 
 from cinder import exception

diff --git a/cinder/volume/drivers/dell/dell_storagecenter_common.py b/cinder/volume/drivers/dell/dell_storagecenter_common.py
index 55c690f3497217c16476b96e4a89b4ad39db3500..9dea49679109110f756a2446c99cb3b8dcb88275 100644 (file)
--- a/cinder/volume/drivers/dell/dell_storagecenter_common.py
+++ b/cinder/volume/drivers/dell/dell_storagecenter_common.py
@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import excutils
 from oslo_config import cfg
+from oslo_utils import excutils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LW

diff --git a/cinder/volume/drivers/dell/dell_storagecenter_fc.py b/cinder/volume/drivers/dell/dell_storagecenter_fc.py
index c1ce3995a846b8cf4b4c172d769d3b64dedbce28..bf4d511cebdbfebdad76771bd4588593cd64b54c 100644 (file)
--- a/cinder/volume/drivers/dell/dell_storagecenter_fc.py
+++ b/cinder/volume/drivers/dell/dell_storagecenter_fc.py
@@ -14,7 +14,7 @@
 
 '''Volume driver for Dell Storage Center.'''
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/volume/drivers/dell/dell_storagecenter_iscsi.py b/cinder/volume/drivers/dell/dell_storagecenter_iscsi.py
index 658bc5b435dc876300964104a84483822f31750e..00d198655b58f11ff501f3e65f9b166fda834633 100644 (file)
--- a/cinder/volume/drivers/dell/dell_storagecenter_iscsi.py
+++ b/cinder/volume/drivers/dell/dell_storagecenter_iscsi.py
@@ -14,7 +14,7 @@
 
 '''Volume driver for Dell Storage Center.'''
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/volume/drivers/drbdmanagedrv.py b/cinder/volume/drivers/drbdmanagedrv.py
index c0dab7ba31614569057362c4e111ecd9abc24887..e8b10886b91dc326c302d72c6802423679f037fd 100644 (file)
--- a/cinder/volume/drivers/drbdmanagedrv.py
+++ b/cinder/volume/drivers/drbdmanagedrv.py
@@ -25,9 +25,9 @@ for more details.
 
 import uuid
 
-from oslo.utils import importutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import importutils
+from oslo_utils import units
 import six
 
 

diff --git a/cinder/volume/drivers/emc/emc_vnx_cli.py b/cinder/volume/drivers/emc/emc_vnx_cli.py
index 02d5f587e7aa1c2ccbb0d432386182138e2f3f2f..4d72a3fa8aaad4f50fae35b3fd0f366fea8565c3 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vnx_cli.py
+++ b/cinder/volume/drivers/emc/emc_vnx_cli.py
@@ -22,11 +22,11 @@ import re
 import time
 
 from oslo.serialization import jsonutils as json
-from oslo.utils import excutils
-from oslo.utils import timeutils
 from oslo_concurrency import lockutils
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import timeutils
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/eqlx.py b/cinder/volume/drivers/eqlx.py
index 9b9fff01eadb37f11693cd034e8d443edccc64ad..35df8018735107a0f543e5fa9bfbb8e235dab15c 100644 (file)
--- a/cinder/volume/drivers/eqlx.py
+++ b/cinder/volume/drivers/eqlx.py
@@ -21,9 +21,9 @@ import random
 import eventlet
 from eventlet import greenthread
 import greenlet
-from oslo.utils import excutils
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import excutils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LW, _LI

diff --git a/cinder/volume/drivers/fujitsu_eternus_dx_common.py b/cinder/volume/drivers/fujitsu_eternus_dx_common.py
index 34c4946b8a11ddf35e224f5f7c09419387e6a2d1..2f52854d1ac54fd2752bbe1e2fb6b3b477340f59 100644 (file)
--- a/cinder/volume/drivers/fujitsu_eternus_dx_common.py
+++ b/cinder/volume/drivers/fujitsu_eternus_dx_common.py
@@ -25,8 +25,8 @@ import hashlib
 import time
 from xml.dom.minidom import parseString
 
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import units
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/fusionio/ioControl.py b/cinder/volume/drivers/fusionio/ioControl.py
index 8f3b8857eee6e14d77a42cf6b5974a4b8957e319..17b356deb979a795cf6fe0b78478724671627b0c 100644 (file)
--- a/cinder/volume/drivers/fusionio/ioControl.py
+++ b/cinder/volume/drivers/fusionio/ioControl.py
@@ -23,8 +23,8 @@ import json
 import random
 import uuid
 
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import units
 import requests
 
 from cinder import exception

diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py
index dcf0c109c73120f41542ce84f86b910b4293800a..011c526586028aa8d55c18a2512151ee3f05bfe0 100644 (file)
--- a/cinder/volume/drivers/glusterfs.py
+++ b/cinder/volume/drivers/glusterfs.py
@@ -17,9 +17,9 @@ import errno
 import os
 import stat
 
-from oslo.utils import units
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder.brick.remotefs import remotefs as remotefs_brick
 from cinder import exception

diff --git a/cinder/volume/drivers/hds/hds.py b/cinder/volume/drivers/hds/hds.py
index 4992b70bbecdc77c32af08df02be611a81f74b2a..ae0f271f045165046130dc2a14b8a4ab03a91898 100644 (file)
--- a/cinder/volume/drivers/hds/hds.py
+++ b/cinder/volume/drivers/hds/hds.py
@@ -21,8 +21,8 @@ iSCSI Cinder Volume driver for Hitachi Unified Storage (HUS) platform.
 
 from xml.etree import ElementTree as ETree
 
-from oslo.utils import excutils
 from oslo_config import cfg
+from oslo_utils import excutils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LI

diff --git a/cinder/volume/drivers/hds/hnas_backend.py b/cinder/volume/drivers/hds/hnas_backend.py
index 420affa64a2d71b2b81ec8c67a42adfcc2b8307e..e935199d818c0c78708ccf08a61d6a6644ee6856 100644 (file)
--- a/cinder/volume/drivers/hds/hnas_backend.py
+++ b/cinder/volume/drivers/hds/hnas_backend.py
@@ -20,7 +20,7 @@ Hitachi Unified Storage (HUS-HNAS) platform. Backend operations.
 
 import re
 
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder.openstack.common import log as logging
 from cinder import utils

diff --git a/cinder/volume/drivers/hds/iscsi.py b/cinder/volume/drivers/hds/iscsi.py
index d33436be2589facda9154b05e9c9026dbb7421a3..24d2b2ad4f0d19fc1fc70190813de2eccc75af9f 100644 (file)
--- a/cinder/volume/drivers/hds/iscsi.py
+++ b/cinder/volume/drivers/hds/iscsi.py
@@ -20,9 +20,9 @@ iSCSI Cinder Volume driver for Hitachi Unified Storage (HUS-HNAS) platform.
 
 from xml.etree import ElementTree as ETree
 
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _LE, _LI

diff --git a/cinder/volume/drivers/hds/nfs.py b/cinder/volume/drivers/hds/nfs.py
index b522446053d454b0e16781cd2aeb6711e24ea2f3..46b67be49f771dba00f8c358f37989fc78dc13d3 100644 (file)
--- a/cinder/volume/drivers/hds/nfs.py
+++ b/cinder/volume/drivers/hds/nfs.py
@@ -21,10 +21,10 @@ import os
 import time
 from xml.etree import ElementTree as ETree
 
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LI

diff --git a/cinder/volume/drivers/hitachi/hbsd_basiclib.py b/cinder/volume/drivers/hitachi/hbsd_basiclib.py
index 23693696b78095642f844f2634544cbdfb1b6c6c..dcd0094c62125c7bd2feb4d4f2ffc949433fd95f 100644 (file)
--- a/cinder/volume/drivers/hitachi/hbsd_basiclib.py
+++ b/cinder/volume/drivers/hitachi/hbsd_basiclib.py
@@ -16,9 +16,9 @@ import inspect
 import os
 import shlex
 
-from oslo.utils import excutils
 from oslo_concurrency import lockutils
 from oslo_concurrency import processutils as putils
+from oslo_utils import excutils
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/hitachi/hbsd_common.py b/cinder/volume/drivers/hitachi/hbsd_common.py
index ecb1865072b66f2782505a64fab18974d955610a..a07a84de411c302769922d076f62ebc06eb988c2 100644 (file)
--- a/cinder/volume/drivers/hitachi/hbsd_common.py
+++ b/cinder/volume/drivers/hitachi/hbsd_common.py
@@ -20,8 +20,8 @@ from contextlib import nested
 import re
 import threading
 
-from oslo.utils import excutils
 from oslo_config import cfg
+from oslo_utils import excutils
 import six
 
 from cinder.db.sqlalchemy import api

diff --git a/cinder/volume/drivers/hitachi/hbsd_fc.py b/cinder/volume/drivers/hitachi/hbsd_fc.py
index c10156c9dbb9f59aa6a77808ab03c24cb91d7b49..e7947dfc5a7e9eaf6cf0968e80fac804d13f7b75 100644 (file)
--- a/cinder/volume/drivers/hitachi/hbsd_fc.py
+++ b/cinder/volume/drivers/hitachi/hbsd_fc.py
@@ -20,8 +20,8 @@ from contextlib import nested
 import os
 import threading
 
-from oslo.utils import excutils
 from oslo_config import cfg
+from oslo_utils import excutils
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/hitachi/hbsd_horcm.py b/cinder/volume/drivers/hitachi/hbsd_horcm.py
index 27f527caf5b6039da14680abaefb537df59fa1ce..8a0570926a10674003348500891bb0d24cca61d6 100644 (file)
--- a/cinder/volume/drivers/hitachi/hbsd_horcm.py
+++ b/cinder/volume/drivers/hitachi/hbsd_horcm.py
@@ -20,9 +20,9 @@ import shlex
 import threading
 import time
 
-from oslo.utils import excutils
 from oslo_concurrency import processutils as putils
 from oslo_config import cfg
+from oslo_utils import excutils
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/huawei/rest_common.py b/cinder/volume/drivers/huawei/rest_common.py
index 1780fc91d552c1d17277ddee5cd0fd1e8213534a..2f64d4e6921c1741778c5baa05c687d90a83f5d9 100644 (file)
--- a/cinder/volume/drivers/huawei/rest_common.py
+++ b/cinder/volume/drivers/huawei/rest_common.py
@@ -22,8 +22,8 @@ import urllib2
 import uuid
 from xml.etree import ElementTree as ET
 
-from oslo.utils import excutils
-from oslo.utils import units
+from oslo_utils import excutils
+from oslo_utils import units
 import six
 
 from cinder import context

diff --git a/cinder/volume/drivers/huawei/ssh_common.py b/cinder/volume/drivers/huawei/ssh_common.py
index 215bdcea4dd5fb3c27c6b784b6867d8b958eec71..4f2ce60759ea739114ec6105db08c773bf2ac709 100644 (file)
--- a/cinder/volume/drivers/huawei/ssh_common.py
+++ b/cinder/volume/drivers/huawei/ssh_common.py
@@ -26,7 +26,7 @@ import threading
 import time
 from xml.etree import ElementTree as ET
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/volume/drivers/huaweistorhyper/huaweistorac.py b/cinder/volume/drivers/huaweistorhyper/huaweistorac.py
index 2c46070bcf5dc9954379c79b02ba8d6422eaad8f..596d8bad9759bec2639ff46e45a64da229fd0486 100644 (file)
--- a/cinder/volume/drivers/huaweistorhyper/huaweistorac.py
+++ b/cinder/volume/drivers/huaweistorhyper/huaweistorac.py
@@ -20,8 +20,8 @@
 import uuid
 
 
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import units
 import six
 
 from cinder import context

diff --git a/cinder/volume/drivers/huaweistorhyper/vbs_client.py b/cinder/volume/drivers/huaweistorhyper/vbs_client.py
index d6bf650a72fe649f828ccc3674dfa131d697e285..12a0102f5b7ec8190580321d4c96b7736b7aff52 100644 (file)
--- a/cinder/volume/drivers/huaweistorhyper/vbs_client.py
+++ b/cinder/volume/drivers/huaweistorhyper/vbs_client.py
@@ -19,7 +19,7 @@
 
 import socket
 
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder.i18n import _, _LE
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/drivers/ibm/flashsystem.py b/cinder/volume/drivers/ibm/flashsystem.py
index eeb8852fb6b4004741462821e3b914f4ea82b88b..16c11f0ce911d9c83a46105359c167a4fc1df324 100644 (file)
--- a/cinder/volume/drivers/ibm/flashsystem.py
+++ b/cinder/volume/drivers/ibm/flashsystem.py
@@ -29,10 +29,10 @@ import re
 import string
 import threading
 
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import units
 import six
 
 from cinder import context

diff --git a/cinder/volume/drivers/ibm/gpfs.py b/cinder/volume/drivers/ibm/gpfs.py
index 2e97728c2222cbb2e93d7acb9c7707474f67d588..7d8de1e0074b8ced6d0c2a75e2b8851458c32933 100644 (file)
--- a/cinder/volume/drivers/ibm/gpfs.py
+++ b/cinder/volume/drivers/ibm/gpfs.py
@@ -21,9 +21,9 @@ import os
 import re
 import shutil
 
-from oslo.utils import units
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LI

diff --git a/cinder/volume/drivers/ibm/ibmnas.py b/cinder/volume/drivers/ibm/ibmnas.py
index 469ea8da3895c9739a8bb1120dd91f3e4e9a0a7c..fdd93e8b3908368ad4f831266ddd2a811a261518 100644 (file)
--- a/cinder/volume/drivers/ibm/ibmnas.py
+++ b/cinder/volume/drivers/ibm/ibmnas.py
@@ -32,9 +32,9 @@ Notes:
 import os
 import re
 
-from oslo.utils import units
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _, _LI, _LW

diff --git a/cinder/volume/drivers/ibm/storwize_svc/__init__.py b/cinder/volume/drivers/ibm/storwize_svc/__init__.py
index 2a3bc3112bb30d40a2f13f9d9cb63cebfea2186c..e2b838d761c69980f16416654385453550736a3d 100644 (file)
--- a/cinder/volume/drivers/ibm/storwize_svc/__init__.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/__init__.py
@@ -37,9 +37,9 @@ Limitations:
 import math
 import time
 
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/volume/drivers/ibm/storwize_svc/helpers.py b/cinder/volume/drivers/ibm/storwize_svc/helpers.py
index acc4de9fae7e1fbe92b0df37fd5e2bcf88f8f362..c4a60cc7562fbaba2b83855253baf30dfce0cf99 100644 (file)
--- a/cinder/volume/drivers/ibm/storwize_svc/helpers.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/helpers.py
@@ -19,8 +19,8 @@ import re
 import unicodedata
 
 from eventlet import greenthread
-from oslo.utils import excutils
-from oslo.utils import strutils
+from oslo_utils import excutils
+from oslo_utils import strutils
 import six
 
 from cinder import context

diff --git a/cinder/volume/drivers/ibm/xiv_ds8k.py b/cinder/volume/drivers/ibm/xiv_ds8k.py
index 19eff017d4fdfe4638d8b86e7d01da72875b8f85..9f697773236950a566c9a8b3d1c66380770f95b4 100644 (file)
--- a/cinder/volume/drivers/ibm/xiv_ds8k.py
+++ b/cinder/volume/drivers/ibm/xiv_ds8k.py
@@ -22,8 +22,8 @@
 Unified Volume driver for IBM XIV and DS8K Storage Systems.
 """
 
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 from cinder import exception
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py
index b3398df998814208312262c9cf0a7246c45df9d9..5c10a866d19593d1f8b75a3e6d478b9fb715c1c9 100644 (file)
--- a/cinder/volume/drivers/lvm.py
+++ b/cinder/volume/drivers/lvm.py
@@ -19,10 +19,10 @@ import math
 import os
 import socket
 
-from oslo.utils import importutils
-from oslo.utils import units
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import importutils
+from oslo_utils import units
 
 from cinder.brick import exception as brick_exception
 from cinder.brick.local_dev import lvm as lvm

diff --git a/cinder/volume/drivers/netapp/common.py b/cinder/volume/drivers/netapp/common.py
index 8efa8f2e4b59d1398f149b969261c5b867d8fc28..85dbdfa8440668eb868798534a8b749cd55543dd 100644 (file)
--- a/cinder/volume/drivers/netapp/common.py
+++ b/cinder/volume/drivers/netapp/common.py
@@ -18,7 +18,7 @@ Unified driver for NetApp storage systems.
 Supports multiple storage systems of different families and protocols.
 """
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 from cinder import exception
 from cinder.i18n import _, _LI

diff --git a/cinder/volume/drivers/netapp/dataontap/block_7mode.py b/cinder/volume/drivers/netapp/dataontap/block_7mode.py
index bea12f382548844f79c72e25ca357f9705bb408c..7a371db386c6bab0f45d0dd9bb0196c6b1839147 100644 (file)
--- a/cinder/volume/drivers/netapp/dataontap/block_7mode.py
+++ b/cinder/volume/drivers/netapp/dataontap/block_7mode.py
@@ -21,8 +21,8 @@
 Volume driver library for NetApp 7-mode block storage systems.
 """
 
-from oslo.utils import timeutils
-from oslo.utils import units
+from oslo_utils import timeutils
+from oslo_utils import units
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/netapp/dataontap/block_base.py b/cinder/volume/drivers/netapp/dataontap/block_base.py
index ba8a52409f367db4eebac1a66c23a57cb32b2115..446c7a755bc7b48a7e8778f66a245ff30d32df6a 100644 (file)
--- a/cinder/volume/drivers/netapp/dataontap/block_base.py
+++ b/cinder/volume/drivers/netapp/dataontap/block_base.py
@@ -24,8 +24,8 @@ Volume driver library for NetApp 7/C-mode block storage systems.
 import sys
 import uuid
 
-from oslo.utils import excutils
-from oslo.utils import units
+from oslo_utils import excutils
+from oslo_utils import units
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/netapp/dataontap/block_cmode.py b/cinder/volume/drivers/netapp/dataontap/block_cmode.py
index 8ec2e22135cfae5a15f3994736914dbebe7beb79..6d944428cad01d6682d0f091c1e9b37cc153e5d3 100644 (file)
--- a/cinder/volume/drivers/netapp/dataontap/block_cmode.py
+++ b/cinder/volume/drivers/netapp/dataontap/block_cmode.py
@@ -23,7 +23,7 @@ Volume driver library for NetApp C-mode block storage systems.
 
 import copy
 
-from oslo.utils import units
+from oslo_utils import units
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/netapp/dataontap/client/client_base.py b/cinder/volume/drivers/netapp/dataontap/client/client_base.py
index 09811e3f89f83f4bb804dd94f9d851c3cbd96bde..89b1592bf7971150840dc04d205a4bb23cad161c 100644 (file)
--- a/cinder/volume/drivers/netapp/dataontap/client/client_base.py
+++ b/cinder/volume/drivers/netapp/dataontap/client/client_base.py
@@ -17,8 +17,8 @@ import copy
 import socket
 import sys
 
-from oslo.utils import excutils
-from oslo.utils import timeutils
+from oslo_utils import excutils
+from oslo_utils import timeutils
 import six
 
 from cinder.i18n import _LE, _LW, _LI

diff --git a/cinder/volume/drivers/netapp/dataontap/nfs_7mode.py b/cinder/volume/drivers/netapp/dataontap/nfs_7mode.py
index eb686b0cf55f68d6cb7245540867b813f50ad02a..34329f753f811b8b98f63283199f571bf34af73d 100644 (file)
--- a/cinder/volume/drivers/netapp/dataontap/nfs_7mode.py
+++ b/cinder/volume/drivers/netapp/dataontap/nfs_7mode.py
@@ -20,7 +20,7 @@
 Volume driver for NetApp NFS storage.
 """
 
-from oslo.utils import units
+from oslo_utils import units
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/netapp/dataontap/nfs_base.py b/cinder/volume/drivers/netapp/dataontap/nfs_base.py
index 61bbc9b3c68817dcd6878062bc397ae7f431312b..cf4b5a9a35782ffddf2fd689876af6198225588e 100644 (file)
--- a/cinder/volume/drivers/netapp/dataontap/nfs_base.py
+++ b/cinder/volume/drivers/netapp/dataontap/nfs_base.py
@@ -25,9 +25,9 @@ import re
 from threading import Timer
 import time
 
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_concurrency import processutils
+from oslo_utils import excutils
+from oslo_utils import units
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception

diff --git a/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py b/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
index a11d9c02be497f05e68a374be6cbe7c29320edd6..9c9077759c19b09d7a1c3772dca96448057feb4b 100644 (file)
--- a/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
+++ b/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
@@ -23,7 +23,7 @@ Volume driver for NetApp NFS storage.
 import os
 import uuid
 
-from oslo.utils import units
+from oslo_utils import units
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/netapp/dataontap/ssc_cmode.py b/cinder/volume/drivers/netapp/dataontap/ssc_cmode.py
index 197112aee6b08421cfd8fcd144762a395a39a4eb..08b33b3f331b431affbd07312f96f14375d5162f 100644 (file)
--- a/cinder/volume/drivers/netapp/dataontap/ssc_cmode.py
+++ b/cinder/volume/drivers/netapp/dataontap/ssc_cmode.py
@@ -21,7 +21,7 @@ Storage service catalog utility functions and classes for NetApp systems.
 import copy
 from threading import Timer
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/netapp/eseries/iscsi.py b/cinder/volume/drivers/netapp/eseries/iscsi.py
index 272054e5f81674f56b4530c822dae547a97adf11..952d2bd36963da0b69db21454907d62e34ec7647 100644 (file)
--- a/cinder/volume/drivers/netapp/eseries/iscsi.py
+++ b/cinder/volume/drivers/netapp/eseries/iscsi.py
@@ -19,9 +19,9 @@ import socket
 import time
 import uuid
 
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import units
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/nexenta/nfs.py b/cinder/volume/drivers/nexenta/nfs.py
index 84e6976aa74e4d070505e60be062e38582171e6a..1419c2796240f6911ff295fc4fe6c4d915aa3d87 100644 (file)
--- a/cinder/volume/drivers/nexenta/nfs.py
+++ b/cinder/volume/drivers/nexenta/nfs.py
@@ -25,7 +25,7 @@ import hashlib
 import os
 import re
 
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import context
 from cinder import db

diff --git a/cinder/volume/drivers/nexenta/utils.py b/cinder/volume/drivers/nexenta/utils.py
index a7c3f12c1c42ace33d196f1da324736a7f3e7d6d..93a636e8bb7b849c6950eb8bd853e84146462838 100644 (file)
--- a/cinder/volume/drivers/nexenta/utils.py
+++ b/cinder/volume/drivers/nexenta/utils.py
@@ -23,7 +23,7 @@
 
 import re
 
-from oslo.utils import units
+from oslo_utils import units
 import six.moves.urllib.parse as urlparse
 
 from cinder.i18n import _

diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
index e6561bffeee928707726aab0d0e41c6c9a9c74a6..6acce926115e0eb34c6b24aba5a8edb446f1ef9d 100644 (file)
--- a/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -17,9 +17,9 @@ import errno
 import os
 import time
 
-from oslo.utils import units
 from oslo_concurrency import processutils as putils
 from oslo_config import cfg
+from oslo_utils import units
 import six
 
 from cinder.brick.remotefs import remotefs as remotefs_brick

diff --git a/cinder/volume/drivers/nimble.py b/cinder/volume/drivers/nimble.py
index d8337746b265765dec10e4a3e346c3456b05afcb..7e289bbbb5c41256af4bf17c55d1b8a0429f66f0 100644 (file)
--- a/cinder/volume/drivers/nimble.py
+++ b/cinder/volume/drivers/nimble.py
@@ -24,8 +24,8 @@ import re
 import string
 import urllib2
 
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import units
 from suds import client
 
 from cinder import exception

diff --git a/cinder/volume/drivers/prophetstor/dplcommon.py b/cinder/volume/drivers/prophetstor/dplcommon.py
index 560f5a3d5da764c4e85cb1011bd4d10449eb45cc..1bf34a0121c53191864aae2ce355699384f40f61 100644 (file)
--- a/cinder/volume/drivers/prophetstor/dplcommon.py
+++ b/cinder/volume/drivers/prophetstor/dplcommon.py
@@ -25,7 +25,7 @@ import json
 import random
 import time
 
-from oslo.utils import units
+from oslo_utils import units
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py
index 62f108e6dca18d348e9f57d528f911e60ad67e33..0e5abf68774a80fc6057d7a61dbb4cd8e8ce6e36 100644 (file)
--- a/cinder/volume/drivers/pure.py
+++ b/cinder/volume/drivers/pure.py
@@ -22,10 +22,10 @@ import math
 import re
 import uuid
 
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LI, _LW

diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py
index 6a9e16837c39efe7f1585c4265d1ed71a1503254..a2dd527301a868616ec4c172f9e84180714015e6 100644 (file)
--- a/cinder/volume/drivers/rbd.py
+++ b/cinder/volume/drivers/rbd.py
@@ -21,9 +21,9 @@ import os
 import tempfile
 import urllib
 
-from oslo.utils import encodeutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import encodeutils
+from oslo_utils import units
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py
index 2314e13656c0776530d90b8b4b74a8131cf2c4e7..f51956df2ecb8903add7bb9bbee381665ce8ac76 100644 (file)
--- a/cinder/volume/drivers/remotefs.py
+++ b/cinder/volume/drivers/remotefs.py
@@ -21,9 +21,9 @@ import re
 import tempfile
 import time
 
-from oslo.utils import units
 from oslo_concurrency import processutils as putils
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import compute
 from cinder import db

diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py
index 0df3575241cd97e3b6abd63e598e158d983ac667..a9f111b4b2741f20231784e422516c93508e6411 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_common.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_common.py
@@ -42,16 +42,16 @@ import pprint
 import re
 import uuid
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 hp3parclient = importutils.try_import("hp3parclient")
 if hp3parclient:
     from hp3parclient import client
     from hp3parclient import exceptions as hpexceptions
 
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py b/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
index 14e3b253d55e8b18184739cc43c617b20cf8bfc0..c6954984b5a9322b40ec8c6c8a26971b7663dcba 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
+++ b/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
@@ -21,8 +21,8 @@ operations on the SAN.
 """
 
 from lxml import etree
-from oslo.utils import units
 from oslo_concurrency import processutils
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py b/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py
index 2e02b3535f7d83b810f71918fa380b171f186051..0eb594324ba3cc0f1289523c6b46a38a2148ab07 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py
+++ b/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py
@@ -15,8 +15,8 @@
 #
 """HP LeftHand SAN ISCSI REST Proxy."""
 
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/volume/drivers/san/san.py b/cinder/volume/drivers/san/san.py
index fa04affd44c18f12b0cbb6a94ed66b0ad5a66518..f5adc86b8f30095d1a41550a2e79d5fda21e8680 100644 (file)
--- a/cinder/volume/drivers/san/san.py
+++ b/cinder/volume/drivers/san/san.py
@@ -22,9 +22,9 @@ controller on the SAN hardware.  We expect to access it over SSH or some API.
 import random
 
 from eventlet import greenthread
-from oslo.utils import excutils
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import excutils
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/volume/drivers/scality.py b/cinder/volume/drivers/scality.py
index 65bee2f31fc0236b053428f007ac1e348d8ad846..99729a1b24d80bf38c9c7f6ef535de845b98be27 100644 (file)
--- a/cinder/volume/drivers/scality.py
+++ b/cinder/volume/drivers/scality.py
@@ -21,9 +21,9 @@ import errno
 import os
 import urllib2
 
-from oslo.utils import units
 from oslo_concurrency import lockutils
 from oslo_config import cfg
+from oslo_utils import units
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception

diff --git a/cinder/volume/drivers/sheepdog.py b/cinder/volume/drivers/sheepdog.py
index ad8fb858893d826c827f94651af25a7e139c1b88..aedec2b231d048800df045dc105dbb4c5f1accc7 100644 (file)
--- a/cinder/volume/drivers/sheepdog.py
+++ b/cinder/volume/drivers/sheepdog.py
@@ -20,9 +20,9 @@ SheepDog Volume Driver.
 """
 import re
 
-from oslo.utils import units
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/volume/drivers/smbfs.py b/cinder/volume/drivers/smbfs.py
index a9fad716db4c88e56bd5bcf2e793803775362a15..4509fb541d5ee33a9e1949e3190663840626f52e 100644 (file)
--- a/cinder/volume/drivers/smbfs.py
+++ b/cinder/volume/drivers/smbfs.py
@@ -16,9 +16,9 @@
 import os
 import re
 
-from oslo.utils import units
 from oslo_concurrency import processutils as putils
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder.brick.remotefs import remotefs
 from cinder import exception

diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py
index a1c0825a9f98197f40d82b3c1e0a1869b2e47690..c824f3be73d331103a9f9c2223059418b594223a 100644 (file)
--- a/cinder/volume/drivers/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -20,9 +20,9 @@ import socket
 import string
 import time
 
-from oslo.utils import timeutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import timeutils
+from oslo_utils import units
 import requests
 from six import wraps
 

diff --git a/cinder/volume/drivers/srb.py b/cinder/volume/drivers/srb.py
index 1c70416de3821976c900fc414903ee3d48c5db3c..df83ec3f1a1aeca501a0784b62fd2e152cf88dc6 100644 (file)
--- a/cinder/volume/drivers/srb.py
+++ b/cinder/volume/drivers/srb.py
@@ -24,11 +24,11 @@ import functools
 import sys
 import time
 
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_concurrency import lockutils
 from oslo_concurrency import processutils as putils
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import units
 import six
 
 from cinder.brick.local_dev import lvm

diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
index ad26973d103955887338656e38e4a82e0d69d0c6..c5d75700ec2b787267ffe261ddfa84095d72ad35 100644 (file)
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
@@ -17,9 +17,9 @@
 
 from __future__ import absolute_import
 
-from oslo.utils import importutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import importutils
+from oslo_utils import units
 import six
 
 from cinder import exception

diff --git a/cinder/volume/drivers/violin/v6000_common.py b/cinder/volume/drivers/violin/v6000_common.py
index 15863877bbae6403b1794a02ea5bbc6589f2c500..1ecdfb37e0e85d2aa269a9f788bc10183169ae48 100644 (file)
--- a/cinder/volume/drivers/violin/v6000_common.py
+++ b/cinder/volume/drivers/violin/v6000_common.py
@@ -31,8 +31,8 @@ driver documentation for more information.
 import re
 import time
 
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LW, _LI

diff --git a/cinder/volume/drivers/violin/v6000_fcp.py b/cinder/volume/drivers/violin/v6000_fcp.py
index aeedf494fb6266932a6261bf3f1e9dfe42a19f0e..59e2fc54283b791f509311fd196f5197d6455322 100644 (file)
--- a/cinder/volume/drivers/violin/v6000_fcp.py
+++ b/cinder/volume/drivers/violin/v6000_fcp.py
@@ -35,7 +35,7 @@ properly in an active-active HA configuration.  See OpenStack Cinder
 driver documentation for more information.
 """
 
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import context
 from cinder.db.sqlalchemy import models

diff --git a/cinder/volume/drivers/violin/v6000_iscsi.py b/cinder/volume/drivers/violin/v6000_iscsi.py
index fe594cbab26fb4ea10d5c98b3cf255da53b02317..ce4e27ac6a268f09d27499892313ca6cd2a52544 100644 (file)
--- a/cinder/volume/drivers/violin/v6000_iscsi.py
+++ b/cinder/volume/drivers/violin/v6000_iscsi.py
@@ -36,7 +36,7 @@ driver documentation for more information.
 
 import random
 
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder import context
 from cinder.db.sqlalchemy import models

diff --git a/cinder/volume/drivers/vmware/datastore.py b/cinder/volume/drivers/vmware/datastore.py
index 0c052720b87d2a886ffcc8292283fa7be8154289..5f908c8a4980c613a91106f5c06bc24a73c21404 100644 (file)
--- a/cinder/volume/drivers/vmware/datastore.py
+++ b/cinder/volume/drivers/vmware/datastore.py
@@ -17,7 +17,7 @@
 Classes and utility methods for datastore selection.
 """
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 from cinder.i18n import _LE, _LW
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/drivers/vmware/read_write_util.py b/cinder/volume/drivers/vmware/read_write_util.py
index 86351713d29c1332bcb9309dfc673cce0ff74755..20f238c0bb43faf4a2db240d7815c93b24ab0d0d 100644 (file)
--- a/cinder/volume/drivers/vmware/read_write_util.py
+++ b/cinder/volume/drivers/vmware/read_write_util.py
@@ -23,7 +23,7 @@ import httplib
 import urllib
 import urllib2
 
-from oslo.utils import netutils
+from oslo_utils import netutils
 import six.moves.urllib.parse as urlparse
 
 from cinder.i18n import _, _LI

diff --git a/cinder/volume/drivers/vmware/vim_util.py b/cinder/volume/drivers/vmware/vim_util.py
index 97861d8b215d34c7e8f57df3799d7357d9225c83..28269cc32262e3eaccad6f4f9cc17da9bfff5400 100644 (file)
--- a/cinder/volume/drivers/vmware/vim_util.py
+++ b/cinder/volume/drivers/vmware/vim_util.py
@@ -17,7 +17,7 @@
 The VMware API utility module.
 """
 
-from oslo.utils import netutils
+from oslo_utils import netutils
 
 
 def get_soap_url(protocol, host, path='sdk'):

diff --git a/cinder/volume/drivers/vmware/vmdk.py b/cinder/volume/drivers/vmware/vmdk.py
index ff79122f8ff1a0e75018098eea788b2c6b66d6d6..31daa1c2ba41f92115e61e6f5c752c5ce931017a 100644 (file)
--- a/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@ -27,9 +27,9 @@ import distutils.version as dist_version  # pylint: disable=E0611
 import os
 import tempfile
 
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LI, _LW

diff --git a/cinder/volume/drivers/vmware/volumeops.py b/cinder/volume/drivers/vmware/volumeops.py
index 58b81285e6e428cfda16c22a46eaf1c1fdde92fc..d1b2012550075afee7b3b3000da7618b3d708a54 100644 (file)
--- a/cinder/volume/drivers/vmware/volumeops.py
+++ b/cinder/volume/drivers/vmware/volumeops.py
@@ -19,7 +19,7 @@ Implements operations on volumes residing on VMware datastores.
 
 import urllib
 
-from oslo.utils import units
+from oslo_utils import units
 
 from cinder.i18n import _, _LE, _LI
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/drivers/windows/smbfs.py b/cinder/volume/drivers/windows/smbfs.py
index 4beffbf6a279d89fce492d48d0ce28bcf50a9fec..30c93644c7396711b77bcafb6bc8845d74112b72 100644 (file)
--- a/cinder/volume/drivers/windows/smbfs.py
+++ b/cinder/volume/drivers/windows/smbfs.py
@@ -18,8 +18,8 @@ import os
 import re
 import sys
 
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _

diff --git a/cinder/volume/drivers/zfssa/zfssaiscsi.py b/cinder/volume/drivers/zfssa/zfssaiscsi.py
index 48e6dbb99c4d618f339d7e11227e56510d347bfc..92a6913dedc230abe890c2f9f8411b77ba695fed 100644 (file)
--- a/cinder/volume/drivers/zfssa/zfssaiscsi.py
+++ b/cinder/volume/drivers/zfssa/zfssaiscsi.py
@@ -17,8 +17,8 @@ ZFS Storage Appliance Cinder Volume Driver
 import ast
 import base64
 
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LW

diff --git a/cinder/volume/drivers/zfssa/zfssanfs.py b/cinder/volume/drivers/zfssa/zfssanfs.py
index 58637976da4a13830c6b68cc1386b25f0ed64659..7dba434015633e43d7c440621b33bc5ce335a7ba 100644 (file)
--- a/cinder/volume/drivers/zfssa/zfssanfs.py
+++ b/cinder/volume/drivers/zfssa/zfssanfs.py
@@ -18,9 +18,9 @@ import base64
 from datetime import datetime
 import errno
 
-from oslo.utils import excutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import units
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LI

diff --git a/cinder/volume/flows/api/create_volume.py b/cinder/volume/flows/api/create_volume.py
index 6a72a30061a436087c2610cc956ca0a1b2d5f6cc..1f1cd3d4ef2ab1d8b754e69962203dd67839f858 100644 (file)
--- a/cinder/volume/flows/api/create_volume.py
+++ b/cinder/volume/flows/api/create_volume.py
@@ -11,9 +11,9 @@
 #    under the License.
 
 
-from oslo.utils import timeutils
-from oslo.utils import units
 from oslo_config import cfg
+from oslo_utils import timeutils
+from oslo_utils import units
 import taskflow.engines
 from taskflow.patterns import linear_flow
 from taskflow.utils import misc

diff --git a/cinder/volume/flows/manager/create_volume.py b/cinder/volume/flows/manager/create_volume.py
index 894dad02a4df357c930e0d9cb1b24bf8c2ffda91..cea0b2e610094dda4925243da35a79f635e306cf 100644 (file)
--- a/cinder/volume/flows/manager/create_volume.py
+++ b/cinder/volume/flows/manager/create_volume.py
@@ -12,9 +12,9 @@
 
 import traceback
 
-from oslo.utils import timeutils
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import timeutils
 import taskflow.engines
 from taskflow.patterns import linear_flow
 from taskflow.utils import misc

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 4ea9e2c917a91559dbd7350c5cdfca508d72f5e6..186b783c49617319e7c9f432f61f5e5f763de2b3 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -41,10 +41,10 @@ import time
 
 from oslo import messaging
 from oslo.serialization import jsonutils
-from oslo.utils import excutils
-from oslo.utils import importutils
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import importutils
+from oslo_utils import timeutils
 from osprofiler import profiler
 
 from cinder import compute

diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py
index 716331695238e2ed1be2ef48cc2d56cb418a1425..1c15b2d4855e84310f5169e7f03839b07ad5e57f 100644 (file)
--- a/cinder/volume/utils.py
+++ b/cinder/volume/utils.py
@@ -18,11 +18,11 @@
 import math
 
 from Crypto.Random import random
-from oslo.utils import strutils
-from oslo.utils import timeutils
-from oslo.utils import units
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils import strutils
+from oslo_utils import timeutils
+from oslo_utils import units
 
 from cinder.brick.local_dev import lvm as brick_lvm
 from cinder import exception

diff --git a/cinder/wsgi.py b/cinder/wsgi.py
index 94710c66fbeac2225d9a1a3fdeb44d9583966599..258b1d6822f54916ce0d18a61fceb8325f0b8cc2 100644 (file)
--- a/cinder/wsgi.py
+++ b/cinder/wsgi.py
@@ -29,9 +29,9 @@ import time
 import eventlet
 import eventlet.wsgi
 import greenlet
-from oslo.utils import excutils
-from oslo.utils import netutils
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import netutils
 from paste import deploy
 import routes.middleware
 import webob.dec

diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py b/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
index 9a43551db90fc975a18f5518d635820ef0c73b7a..1d6c108a27c022cc37d4346d1c965ff2eb98f150 100644 (file)
--- a/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
+++ b/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
@@ -17,7 +17,7 @@
 #
 
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 import paramiko
 
 from cinder import exception

diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
index 063b7c155f7d5ddba320129dfae7f1b7a8bba894..4bb53bcce652e293e74624405c6a9eb9c854216a 100644 (file)
--- a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
+++ b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
@@ -25,8 +25,8 @@ import random
 import re
 
 from eventlet import greenthread
-from oslo.utils import excutils
 from oslo_concurrency import processutils
+from oslo_utils import excutils
 
 from cinder import exception
 from cinder.i18n import _, _LE

diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
index fb737018fac3109b4a31f5b65abbe55865543a68..687e7972e70c1190da18a754dc4a3cabd88beef6 100644 (file)
--- a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
+++ b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
@@ -30,10 +30,10 @@ add_connection and delete_connection interfaces.
 """
 
 
-from oslo.utils import excutils
-from oslo.utils import importutils
 from oslo_concurrency import lockutils
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import importutils
 
 from cinder import exception
 from cinder.i18n import _, _LE, _LI

diff --git a/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py b/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py
index e5b63ab19ed3cb1325aed35b8df8cf91ba1eff65..06173c103c7fdb9e4948007379b33fb9c3301c95 100644 (file)
--- a/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py
+++ b/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py
@@ -18,8 +18,8 @@
 import random
 
 from eventlet import greenthread
-from oslo.utils import excutils
 from oslo_concurrency import processutils
+from oslo_utils import excutils
 import six
 
 from cinder import exception

diff --git a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
index 00b1412cd7f01cf9c8cf49edeeb50bd4b476f8bd..9b102d94e9b4d1ab5d22f117f1ce2bafa3dc0a90 100644 (file)
--- a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
+++ b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
@@ -22,8 +22,8 @@ import random
 import re
 
 from eventlet import greenthread
-from oslo.utils import excutils
 from oslo_concurrency import processutils
+from oslo_utils import excutils
 import six
 
 from cinder import exception

diff --git a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py
index f983729330dc8b2621b650b5839fa978931b2b3f..8ca309aa9757bb10d5cc1de899fa46f43a5f1a3c 100644 (file)
--- a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py
+++ b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py
@@ -27,10 +27,10 @@ add_connection and delete_connection interfaces.
 :zone_name_prefix: Used by: class: 'FCZoneDriver'. Defaults to 'openstack'
 """
 
-from oslo.utils import excutils
-from oslo.utils import importutils
 from oslo_concurrency import lockutils
 from oslo_config import cfg
+from oslo_utils import excutils
+from oslo_utils import importutils
 import six
 
 from cinder import exception

diff --git a/cinder/zonemanager/fc_san_lookup_service.py b/cinder/zonemanager/fc_san_lookup_service.py
index 1cbee7cf89a8ea7cdc0a8be17e3e2bb167f467a3..48b0df691355f4ff58cbaaf7fadc2a6e30c896d5 100644 (file)
--- a/cinder/zonemanager/fc_san_lookup_service.py
+++ b/cinder/zonemanager/fc_san_lookup_service.py
@@ -23,7 +23,7 @@ defined in this class.
 
 """
 
-from oslo.utils import importutils
+from oslo_utils import importutils
 
 from cinder import exception
 from cinder.i18n import _

diff --git a/cinder/zonemanager/fc_zone_manager.py b/cinder/zonemanager/fc_zone_manager.py
index 75037ce8960783c01f166a4a52254a2fcd8ec009..f0070156972eea7447380cd026f595da751a29e3 100644 (file)
--- a/cinder/zonemanager/fc_zone_manager.py
+++ b/cinder/zonemanager/fc_zone_manager.py
@@ -31,8 +31,8 @@ detach operation.
 
 """
 
-from oslo.utils import importutils
 from oslo_config import cfg
+from oslo_utils import importutils
 
 from cinder import exception
 from cinder.i18n import _, _LI