diff --git a/manila/api/contrib/quotas.py b/manila/api/contrib/quotas.py index d25d245306..817801880e 100644 --- a/manila/api/contrib/quotas.py +++ b/manila/api/contrib/quotas.py @@ -15,6 +15,7 @@ import urlparse +from oslo.utils import strutils import webob from manila.api import extensions @@ -25,7 +26,6 @@ from manila.db.sqlalchemy import api as sqlalchemy_api from manila import exception from manila.i18n import _ from manila.openstack.common import log as logging -from manila.openstack.common import strutils from manila import quota diff --git a/manila/api/extensions.py b/manila/api/extensions.py index 02484bfb66..07c385f14e 100644 --- a/manila/api/extensions.py +++ b/manila/api/extensions.py @@ -17,6 +17,7 @@ import os from oslo.config import cfg +from oslo.utils import importutils import six import webob.dec import webob.exc @@ -26,7 +27,6 @@ from manila.api.openstack import wsgi from manila.api import xmlutil from manila import exception from manila.i18n import _ -from manila.openstack.common import importutils from manila.openstack.common import log as logging import manila.policy diff --git a/manila/api/v1/limits.py b/manila/api/v1/limits.py index bf9bd32cdd..1cf0bc5b04 100644 --- a/manila/api/v1/limits.py +++ b/manila/api/v1/limits.py @@ -24,6 +24,7 @@ import math import re import time +from oslo.utils import importutils import webob.dec import webob.exc @@ -31,7 +32,6 @@ from manila.api.openstack import wsgi from manila.api.views import limits as limits_views from manila.api import xmlutil from manila.i18n import _ -from manila.openstack.common import importutils from manila.openstack.common import jsonutils from manila import quota from manila import wsgi as base_wsgi diff --git a/manila/api/views/limits.py b/manila/api/views/limits.py index 04eedac9bf..a0e80e1886 100644 --- a/manila/api/views/limits.py +++ b/manila/api/views/limits.py @@ -15,10 +15,9 @@ import datetime +from oslo.utils import timeutils import six -from manila.openstack.common import timeutils - class ViewBuilder(object): """OpenStack API base limits view builder.""" diff --git a/manila/context.py b/manila/context.py index 9daa9bcb68..8a1fa7a90d 100644 --- a/manila/context.py +++ b/manila/context.py @@ -19,13 +19,13 @@ import copy +from oslo.utils import timeutils import six from manila.i18n import _ from manila.openstack.common import context as common_context from manila.openstack.common import local from manila.openstack.common import log as logging -from manila.openstack.common import timeutils from manila import policy diff --git a/manila/db/base.py b/manila/db/base.py index 2b6a90e7f3..72ab8d78de 100644 --- a/manila/db/base.py +++ b/manila/db/base.py @@ -17,9 +17,7 @@ """Base class for classes that need modular database access.""" from oslo.config import cfg - - -from manila.openstack.common import importutils +from oslo.utils import importutils db_driver_opt = cfg.StrOpt('db_driver', default='manila.db', diff --git a/manila/db/sqlalchemy/api.py b/manila/db/sqlalchemy/api.py index 0e696b7816..d32d14e7eb 100644 --- a/manila/db/sqlalchemy/api.py +++ b/manila/db/sqlalchemy/api.py @@ -26,6 +26,7 @@ from oslo.config import cfg from oslo.db import exception as db_exception from oslo.db import options as db_options from oslo.db.sqlalchemy import session +from oslo.utils import timeutils import six from sqlalchemy import or_ from sqlalchemy.orm import joinedload @@ -37,7 +38,6 @@ from manila.db.sqlalchemy import models from manila import exception from manila.i18n import _ from manila.openstack.common import log as logging -from manila.openstack.common import timeutils CONF = cfg.CONF diff --git a/manila/db/sqlalchemy/models.py b/manila/db/sqlalchemy/models.py index 38bdc9c809..5f5485b81a 100644 --- a/manila/db/sqlalchemy/models.py +++ b/manila/db/sqlalchemy/models.py @@ -21,6 +21,7 @@ SQLAlchemy models for Manila data. from oslo.config import cfg from oslo.db.sqlalchemy import models +from oslo.utils import timeutils import six from sqlalchemy import Column, Integer, String from sqlalchemy.ext.declarative import declarative_base @@ -28,7 +29,6 @@ from sqlalchemy import orm from sqlalchemy import ForeignKey, DateTime, Boolean, Enum from manila.common import constants -from manila.openstack.common import timeutils CONF = cfg.CONF BASE = declarative_base() diff --git a/manila/quota.py b/manila/quota.py index 3a72b54f17..dd3953438d 100644 --- a/manila/quota.py +++ b/manila/quota.py @@ -19,14 +19,14 @@ import datetime from oslo.config import cfg +from oslo.utils import importutils +from oslo.utils import timeutils import six from manila import db from manila import exception from manila.i18n import _ -from manila.openstack.common import importutils from manila.openstack.common import log as logging -from manila.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/manila/scheduler/driver.py b/manila/scheduler/driver.py index 8d8f293377..ca6f4670e5 100644 --- a/manila/scheduler/driver.py +++ b/manila/scheduler/driver.py @@ -20,11 +20,11 @@ Scheduler base class that all Schedulers should inherit from """ from oslo.config import cfg +from oslo.utils import importutils +from oslo.utils import timeutils from manila import db from manila.i18n import _ -from manila.openstack.common import importutils -from manila.openstack.common import timeutils from manila.share import rpcapi as share_rpcapi from manila import utils diff --git a/manila/scheduler/host_manager.py b/manila/scheduler/host_manager.py index 9ec4404221..8758caf1e3 100644 --- a/manila/scheduler/host_manager.py +++ b/manila/scheduler/host_manager.py @@ -20,6 +20,7 @@ Manage hosts in the current zone. import UserDict from oslo.config import cfg +from oslo.utils import timeutils import six from manila import db @@ -28,7 +29,6 @@ from manila.i18n import _ from manila.openstack.common import log as logging from manila.openstack.common.scheduler import filters from manila.openstack.common.scheduler import weights -from manila.openstack.common import timeutils from manila import utils host_manager_opts = [ diff --git a/manila/scheduler/manager.py b/manila/scheduler/manager.py index 7a0c77f862..0a909fe96d 100644 --- a/manila/scheduler/manager.py +++ b/manila/scheduler/manager.py @@ -20,14 +20,14 @@ Scheduler Service """ from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import importutils from manila import context from manila import db from manila import exception from manila.i18n import _ from manila import manager -from manila.openstack.common import excutils -from manila.openstack.common import importutils from manila.openstack.common import log as logging from manila import rpc from manila.share import rpcapi as share_rpcapi diff --git a/manila/scheduler/scheduler_options.py b/manila/scheduler/scheduler_options.py index 8ef060bf1f..5ef3e4a48f 100644 --- a/manila/scheduler/scheduler_options.py +++ b/manila/scheduler/scheduler_options.py @@ -24,11 +24,11 @@ import datetime import os from oslo.config import cfg +from oslo.utils import timeutils from manila.i18n import _ from manila.openstack.common import jsonutils from manila.openstack.common import log as logging -from manila.openstack.common import timeutils scheduler_json_config_location_opt = cfg.StrOpt( 'scheduler_json_config_location', diff --git a/manila/service.py b/manila/service.py index 55859f947d..3cbde77a07 100644 --- a/manila/service.py +++ b/manila/service.py @@ -29,12 +29,12 @@ import eventlet import greenlet from oslo.config import cfg from oslo import messaging +from oslo.utils import importutils from manila import context from manila import db from manila import exception from manila.i18n import _ -from manila.openstack.common import importutils from manila.openstack.common import log as logging from manila.openstack.common import loopingcall from manila import rpc diff --git a/manila/share/api.py b/manila/share/api.py index 82501d6643..48305e9eee 100644 --- a/manila/share/api.py +++ b/manila/share/api.py @@ -19,15 +19,15 @@ Handles all requests relating to shares. """ from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import timeutils import six from manila.api import extensions from manila.db import base from manila import exception from manila.i18n import _ -from manila.openstack.common import excutils from manila.openstack.common import log as logging -from manila.openstack.common import timeutils from manila import policy from manila import quota from manila.scheduler import rpcapi as scheduler_rpcapi diff --git a/manila/share/drivers/emc/plugins/vnx/connection.py b/manila/share/drivers/emc/plugins/vnx/connection.py index 20154c8fbc..b28a6ae5e1 100644 --- a/manila/share/drivers/emc/plugins/vnx/connection.py +++ b/manila/share/drivers/emc/plugins/vnx/connection.py @@ -13,13 +13,13 @@ # License for the specific language governing permissions and limitations # under the License. """VNX backend for the EMC Manila driver.""" +from oslo.utils import excutils from oslo.utils import units import six from manila import db as manila_db from manila import exception from manila.i18n import _ -from manila.openstack.common import excutils from manila.openstack.common import log from manila.share.drivers.emc.plugins import base as driver import manila.share.drivers.emc.plugins.registry diff --git a/manila/share/drivers/emc/plugins/vnx/utils.py b/manila/share/drivers/emc/plugins/vnx/utils.py index 25423eb720..59d5d3e8ba 100644 --- a/manila/share/drivers/emc/plugins/vnx/utils.py +++ b/manila/share/drivers/emc/plugins/vnx/utils.py @@ -15,9 +15,9 @@ import types from oslo.config import cfg +from oslo.utils import timeutils from manila.openstack.common import log -from manila.openstack.common import timeutils CONF = cfg.CONF diff --git a/manila/share/drivers/generic.py b/manila/share/drivers/generic.py index e8734f0afe..9be0039371 100644 --- a/manila/share/drivers/generic.py +++ b/manila/share/drivers/generic.py @@ -20,6 +20,8 @@ import re import time from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import importutils import six from manila.common import constants as const @@ -27,8 +29,6 @@ from manila import compute from manila import context from manila import exception from manila.i18n import _ -from manila.openstack.common import excutils -from manila.openstack.common import importutils from manila.openstack.common import log as logging from manila.openstack.common import processutils from manila.share import driver diff --git a/manila/share/drivers/netapp/cluster_mode.py b/manila/share/drivers/netapp/cluster_mode.py index e48e8bc461..85649707f1 100644 --- a/manila/share/drivers/netapp/cluster_mode.py +++ b/manila/share/drivers/netapp/cluster_mode.py @@ -24,13 +24,13 @@ import hashlib import re from oslo.config import cfg +from oslo.utils import excutils from oslo.utils import units import six from manila import context from manila import exception from manila.i18n import _ -from manila.openstack.common import excutils from manila.openstack.common import log from manila.share import driver from manila.share.drivers.netapp import api as naapi diff --git a/manila/share/drivers/service_instance.py b/manila/share/drivers/service_instance.py index b084ec189e..e828c0dc35 100644 --- a/manila/share/drivers/service_instance.py +++ b/manila/share/drivers/service_instance.py @@ -22,6 +22,7 @@ import time import netaddr from oslo.config import cfg +from oslo.utils import importutils import six from manila.common import constants @@ -31,7 +32,6 @@ from manila import exception from manila.i18n import _ from manila.network.linux import ip_lib from manila.network.neutron import api as neutron -from manila.openstack.common import importutils from manila.openstack.common import log as logging from manila import utils diff --git a/manila/share/manager.py b/manila/share/manager.py index d0885400a0..c4f3545544 100644 --- a/manila/share/manager.py +++ b/manila/share/manager.py @@ -20,6 +20,9 @@ """ from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import importutils +from oslo.utils import timeutils import six from manila.common import constants @@ -28,10 +31,7 @@ from manila import exception from manila.i18n import _ from manila import manager from manila import network -from manila.openstack.common import excutils -from manila.openstack.common import importutils from manila.openstack.common import log as logging -from manila.openstack.common import timeutils from manila import quota import manila.share.configuration from manila import utils diff --git a/manila/test.py b/manila/test.py index 3db0ea3bfd..bea98c65b6 100644 --- a/manila/test.py +++ b/manila/test.py @@ -29,6 +29,7 @@ import fixtures import mock from oslo.config import cfg from oslo.messaging import conffixture as messaging_conffixture +from oslo.utils import timeutils import six import testtools @@ -36,7 +37,6 @@ from manila.db import migration from manila.db.sqlalchemy import api as db_api from manila.db.sqlalchemy import models as db_models from manila.openstack.common import log as logging -from manila.openstack.common import timeutils from manila import rpc from manila import service from manila.tests import conf_fixture diff --git a/manila/tests/api/contrib/test_services.py b/manila/tests/api/contrib/test_services.py index cb4c6e34e6..216152a95e 100644 --- a/manila/tests/api/contrib/test_services.py +++ b/manila/tests/api/contrib/test_services.py @@ -17,11 +17,12 @@ import datetime +from oslo.utils import timeutils + from manila.api.contrib import services from manila import context from manila import db from manila import exception -from manila.openstack.common import timeutils from manila import policy from manila import test from manila.tests.api import fakes diff --git a/manila/tests/api/fakes.py b/manila/tests/api/fakes.py index 810eaefb7d..19f991324b 100644 --- a/manila/tests/api/fakes.py +++ b/manila/tests/api/fakes.py @@ -15,6 +15,7 @@ import uuid +from oslo.utils import timeutils import routes import six import webob @@ -30,7 +31,6 @@ from manila.api.v1 import router from manila.api import versions from manila import context from manila import exception as exc -from manila.openstack.common import timeutils from manila import wsgi diff --git a/manila/tests/api/v1/test_volume_types.py b/manila/tests/api/v1/test_volume_types.py index 963f663cc0..d5a45e5373 100644 --- a/manila/tests/api/v1/test_volume_types.py +++ b/manila/tests/api/v1/test_volume_types.py @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.utils import timeutils import webob from manila.api.v1 import volume_types as types from manila.api.views import types as views_types from manila import exception -from manila.openstack.common import timeutils from manila.share import volume_types from manila import test from manila.tests.api import fakes diff --git a/manila/tests/scheduler/fakes.py b/manila/tests/scheduler/fakes.py index 042e9c78db..fd22929225 100644 --- a/manila/tests/scheduler/fakes.py +++ b/manila/tests/scheduler/fakes.py @@ -16,9 +16,9 @@ Fakes For Scheduler tests. """ +from oslo.utils import timeutils import six -from manila.openstack.common import timeutils from manila.scheduler import filter_scheduler from manila.scheduler import host_manager diff --git a/manila/tests/scheduler/test_host_manager.py b/manila/tests/scheduler/test_host_manager.py index ffe1315008..92bdc3ac8b 100644 --- a/manila/tests/scheduler/test_host_manager.py +++ b/manila/tests/scheduler/test_host_manager.py @@ -17,11 +17,11 @@ Tests For HostManager """ import mock from oslo.config import cfg +from oslo.utils import timeutils from manila import db from manila import exception from manila.openstack.common.scheduler import filters -from manila.openstack.common import timeutils from manila.scheduler import host_manager from manila import test from manila.tests.scheduler import fakes diff --git a/manila/tests/scheduler/test_scheduler.py b/manila/tests/scheduler/test_scheduler.py index 82dc24e099..3c26bd8796 100644 --- a/manila/tests/scheduler/test_scheduler.py +++ b/manila/tests/scheduler/test_scheduler.py @@ -19,11 +19,11 @@ Tests For Scheduler import mock from oslo.config import cfg +from oslo.utils import timeutils from manila import context from manila import db from manila import exception -from manila.openstack.common import timeutils from manila.scheduler import driver from manila.scheduler import manager from manila.scheduler import simple diff --git a/manila/tests/share/test_api.py b/manila/tests/share/test_api.py index c0e21665d6..75ac893b3e 100644 --- a/manila/tests/share/test_api.py +++ b/manila/tests/share/test_api.py @@ -19,11 +19,11 @@ import uuid import mock from oslo.config import cfg +from oslo.utils import timeutils from manila import context from manila import db as db_driver from manila import exception -from manila.openstack.common import timeutils from manila import quota from manila import share from manila.share import api as share_api diff --git a/manila/tests/share/test_manager.py b/manila/tests/share/test_manager.py index 8c48b82379..7f4dc589cc 100644 --- a/manila/tests/share/test_manager.py +++ b/manila/tests/share/test_manager.py @@ -16,13 +16,13 @@ """Test of Share Manager for Manila.""" import mock +from oslo.utils import importutils from manila.common import constants from manila import context from manila import db from manila.db.sqlalchemy import models from manila import exception -from manila.openstack.common import importutils from manila.share import manager from manila import test from manila import utils diff --git a/manila/tests/test_manager.py b/manila/tests/test_manager.py index a73579acc7..a4d971ce8e 100644 --- a/manila/tests/test_manager.py +++ b/manila/tests/test_manager.py @@ -16,9 +16,9 @@ """Test of Base Manager for Manila.""" import mock +from oslo.utils import importutils from manila import manager -from manila.openstack.common import importutils from manila import test diff --git a/manila/tests/test_quota.py b/manila/tests/test_quota.py index 482c65295e..419bdc9f30 100644 --- a/manila/tests/test_quota.py +++ b/manila/tests/test_quota.py @@ -18,6 +18,7 @@ import datetime import mock from oslo.config import cfg +from oslo.utils import timeutils import testtools from manila import context @@ -25,7 +26,6 @@ from manila import db from manila.db.sqlalchemy import api as sqa_api from manila.db.sqlalchemy import models as sqa_models from manila import exception -from manila.openstack.common import timeutils from manila import quota from manila import share from manila import test diff --git a/manila/tests/test_utils.py b/manila/tests/test_utils.py index cbbc0ec66e..d2faf1f21d 100644 --- a/manila/tests/test_utils.py +++ b/manila/tests/test_utils.py @@ -26,12 +26,12 @@ import uuid import mock from oslo.config import cfg +from oslo.utils import timeutils import paramiko import six import manila from manila import exception -from manila.openstack.common import timeutils from manila import test from manila import utils diff --git a/manila/utils.py b/manila/utils.py index 047d42b4e9..fdf01c8185 100644 --- a/manila/utils.py +++ b/manila/utils.py @@ -39,17 +39,17 @@ from xml.sax import saxutils from eventlet import pools import netaddr from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import importutils +from oslo.utils import timeutils import paramiko import six from manila import exception from manila.i18n import _ -from manila.openstack.common import excutils -from manila.openstack.common import importutils from manila.openstack.common import lockutils from manila.openstack.common import log as logging from manila.openstack.common import processutils -from manila.openstack.common import timeutils CONF = cfg.CONF diff --git a/openstack-common.conf b/openstack-common.conf index 01c517c119..1c60157dcd 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -4,14 +4,17 @@ module=config module=context module=eventlet_backdoor +# TODO(jaegerandi) remove excutils with next sync of oslo-incubator module=excutils module=fileutils +# TODO(jaegerandi) remove importutils with next sync of oslo-incubator module=importutils module=jsonutils module=local module=lockutils module=log module=loopingcall +# TODO(jaegerandi) remove network_utils with next sync of oslo-incubator module=network_utils module=policy module=processutils @@ -20,9 +23,11 @@ module=scheduler.filters module=scheduler.weights module=service module=sslutils +# TODO(jaegerandi) remove strutils with next sync of oslo-incubator module=strutils module=systemd module=threadgroup +# TODO(jaegerandi) remove timeutils with next sync of oslo-incubator module=timeutils module=uuidutils module=versionutils