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
This commit is contained in:
Jay S. Bryant 2015-01-16 16:54:27 -06:00
parent 09b1ff2091
commit b6ec77e6d4
181 changed files with 243 additions and 239 deletions

View File

@ -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

View File

@ -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

View File

@ -15,7 +15,7 @@
"""The QoS specs extension"""
from oslo.utils import strutils
from oslo_utils import strutils
import six
import webob

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -15,7 +15,7 @@
"""The volumes snapshots api."""
from oslo.utils import strutils
from oslo_utils import strutils
import webob
from webob import exc

View File

@ -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

View File

@ -15,7 +15,7 @@
"""The volumes snapshots api."""
from oslo.utils import strutils
from oslo_utils import strutils
import webob
from webob import exc

View File

@ -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

View File

@ -15,7 +15,7 @@
import datetime
from oslo.utils import timeutils
from oslo_utils import timeutils
class ViewBuilder(object):

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -14,7 +14,7 @@
# under the License.
import oslo.config.cfg
from oslo.utils import importutils
from oslo_utils import importutils
_compute_opts = [

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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',

View File

@ -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

View File

@ -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

View File

@ -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):

View File

@ -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

View File

@ -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 _

View File

@ -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',

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 _

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -15,7 +15,7 @@
import uuid
from oslo.utils import timeutils
from oslo_utils import timeutils
import routes
import webob
import webob.dec

View File

@ -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

View File

@ -16,7 +16,7 @@
import uuid
from lxml import etree
from oslo.utils import timeutils
from oslo_utils import timeutils
import six
import webob

View File

@ -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

View File

@ -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

View File

@ -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):

View File

@ -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')

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"))))

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -18,7 +18,7 @@ import re
import sys
import mock
from oslo.utils import units
from oslo_utils import units
fakeStorPool = mock.Mock()

View File

@ -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

View File

@ -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))

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

Some files were not shown because too many files have changed in this diff Show More