From 41d45dfb1ceccd45bf5620567795c3fe319a750c Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Fri, 9 Jan 2015 18:42:43 +0000 Subject: [PATCH] Move from oslo.utils to oslo_utils oslo_utils has been moved out of the oslo namespace. bp drop-namespace-packages Change-Id: Ie818e72b31efd2a6ab182444967bdfaca9366f4a --- glance/api/common.py | 4 ++-- glance/api/v1/images.py | 4 ++-- glance/api/v1/upload_utils.py | 2 +- glance/api/v2/image_data.py | 2 +- glance/api/v2/image_members.py | 2 +- glance/api/v2/images.py | 2 +- glance/api/v2/model/metadef_namespace.py | 2 +- glance/api/v2/model/metadef_object.py | 2 +- glance/api/v2/model/metadef_resource_type.py | 4 ++-- glance/api/v2/model/metadef_tag.py | 2 +- glance/api/v2/tasks.py | 2 +- glance/cmd/__init__.py | 2 +- glance/cmd/cache_manage.py | 2 +- glance/cmd/control.py | 2 +- glance/cmd/manage.py | 2 +- glance/common/client.py | 2 +- glance/common/rpc.py | 4 ++-- glance/common/scripts/image_import/main.py | 2 +- glance/common/utils.py | 8 ++++---- glance/common/wsme_utils.py | 2 +- glance/db/__init__.py | 2 +- glance/db/simple/api.py | 2 +- glance/db/sqlalchemy/api.py | 2 +- glance/db/sqlalchemy/metadata.py | 2 +- .../migrate_repo/versions/035_add_metadef_tables.py | 2 +- glance/db/sqlalchemy/models.py | 2 +- glance/db/sqlalchemy/models_metadef.py | 2 +- glance/domain/__init__.py | 6 +++--- glance/image_cache/__init__.py | 6 +++--- glance/image_cache/drivers/sqlite.py | 2 +- glance/image_cache/drivers/xattr.py | 2 +- glance/location.py | 2 +- glance/notifier.py | 4 ++-- glance/openstack/common/fileutils.py | 2 +- glance/openstack/common/log.py | 2 +- glance/quota/__init__.py | 2 +- glance/registry/api/v1/images.py | 4 ++-- glance/registry/client/v1/client.py | 2 +- glance/tests/functional/db/base.py | 2 +- glance/tests/functional/store_utils.py | 2 +- glance/tests/functional/test_bin_glance_cache_manage.py | 2 +- glance/tests/functional/test_cache_middleware.py | 2 +- glance/tests/functional/test_scrubber.py | 2 +- glance/tests/functional/v1/test_api.py | 2 +- glance/tests/functional/v1/test_copy_to_file.py | 2 +- glance/tests/functional/v1/test_misc.py | 2 +- glance/tests/functional/v1/test_ssl.py | 4 ++-- glance/tests/integration/legacy_functional/test_v1_api.py | 4 ++-- glance/tests/integration/v2/test_tasks_api.py | 2 +- glance/tests/unit/test_auth.py | 2 +- glance/tests/unit/test_db.py | 2 +- glance/tests/unit/test_domain.py | 8 ++++---- glance/tests/unit/test_image_cache.py | 2 +- glance/tests/unit/test_migrations.py | 2 +- glance/tests/unit/test_notifier.py | 2 +- glance/tests/unit/test_quota.py | 2 +- glance/tests/unit/v1/test_api.py | 2 +- glance/tests/unit/v1/test_registry_api.py | 2 +- glance/tests/unit/v1/test_registry_client.py | 2 +- glance/tests/unit/v2/test_registry_api.py | 2 +- glance/tests/unit/v2/test_registry_client.py | 2 +- glance/tests/unit/v2/test_tasks_resource.py | 2 +- glance/tests/utils.py | 2 +- 63 files changed, 81 insertions(+), 81 deletions(-) diff --git a/glance/api/common.py b/glance/api/common.py index 5253f4071d..a61ab683d2 100644 --- a/glance/api/common.py +++ b/glance/api/common.py @@ -16,8 +16,8 @@ import re from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import units +from oslo_utils import excutils +from oslo_utils import units from glance.common import exception from glance import i18n diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py index 4fce7a0e27..b8496be607 100644 --- a/glance/api/v1/images.py +++ b/glance/api/v1/images.py @@ -23,8 +23,8 @@ import eventlet import glance_store as store import glance_store.location from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import strutils +from oslo_utils import excutils +from oslo_utils import strutils from webob.exc import HTTPBadRequest from webob.exc import HTTPConflict from webob.exc import HTTPForbidden diff --git a/glance/api/v1/upload_utils.py b/glance/api/v1/upload_utils.py index b55717322b..880f6a6e44 100644 --- a/glance/api/v1/upload_utils.py +++ b/glance/api/v1/upload_utils.py @@ -14,7 +14,7 @@ # under the License. import glance_store as store_api from oslo.config import cfg -from oslo.utils import excutils +from oslo_utils import excutils import webob.exc from glance.common import exception diff --git a/glance/api/v2/image_data.py b/glance/api/v2/image_data.py index a71243bce0..f1dd9e242d 100644 --- a/glance/api/v2/image_data.py +++ b/glance/api/v2/image_data.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. import glance_store -from oslo.utils import excutils +from oslo_utils import excutils import webob.exc import glance.api.policy diff --git a/glance/api/v2/image_members.py b/glance/api/v2/image_members.py index 13d646b3aa..4eefcfd0cb 100644 --- a/glance/api/v2/image_members.py +++ b/glance/api/v2/image_members.py @@ -17,7 +17,7 @@ import copy import glance_store from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_utils import timeutils import six import webob diff --git a/glance/api/v2/images.py b/glance/api/v2/images.py index 27158fda8c..4c3888ca33 100644 --- a/glance/api/v2/images.py +++ b/glance/api/v2/images.py @@ -18,7 +18,7 @@ import re import glance_store from oslo.config import cfg from oslo.serialization import jsonutils as json -from oslo.utils import timeutils +from oslo_utils import timeutils import six import six.moves.urllib.parse as urlparse import webob.exc diff --git a/glance/api/v2/model/metadef_namespace.py b/glance/api/v2/model/metadef_namespace.py index 9544f369ac..640063660d 100644 --- a/glance/api/v2/model/metadef_namespace.py +++ b/glance/api/v2/model/metadef_namespace.py @@ -35,7 +35,7 @@ class Namespace(types.Base, WSMEModelTransformer): owner = wsme.wsattr(types.text, mandatory=False) # Not using datetime since time format has to be - # in oslo.utils.timeutils.isotime() format + # in oslo_utils.timeutils.isotime() format created_at = wsme.wsattr(types.text, mandatory=False) updated_at = wsme.wsattr(types.text, mandatory=False) diff --git a/glance/api/v2/model/metadef_object.py b/glance/api/v2/model/metadef_object.py index 2e08084103..3569cc658f 100644 --- a/glance/api/v2/model/metadef_object.py +++ b/glance/api/v2/model/metadef_object.py @@ -28,7 +28,7 @@ class MetadefObject(types.Base, WSMEModelTransformer): properties = wsme.wsattr({types.text: PropertyType}, mandatory=False) # Not using datetime since time format has to be - # in oslo.utils.timeutils.isotime() format + # in oslo_utils.timeutils.isotime() format created_at = wsme.wsattr(types.text, mandatory=False) updated_at = wsme.wsattr(types.text, mandatory=False) diff --git a/glance/api/v2/model/metadef_resource_type.py b/glance/api/v2/model/metadef_resource_type.py index 38cd325902..94fcb31efe 100644 --- a/glance/api/v2/model/metadef_resource_type.py +++ b/glance/api/v2/model/metadef_resource_type.py @@ -25,7 +25,7 @@ class ResourceTypeAssociation(types.Base, WSMEModelTransformer): properties_target = wsme.wsattr(types.text, mandatory=False) # Not using datetime since time format has to be - # in oslo.utils.timeutils.isotime() format + # in oslo_utils.timeutils.isotime() format created_at = wsme.wsattr(types.text, mandatory=False) updated_at = wsme.wsattr(types.text, mandatory=False) @@ -46,7 +46,7 @@ class ResourceType(types.Base, WSMEModelTransformer): name = wsme.wsattr(types.text, mandatory=True) # Not using datetime since time format has to be - # in oslo.utils.timeutils.isotime() format + # in oslo_utils.timeutils.isotime() format created_at = wsme.wsattr(types.text, mandatory=False) updated_at = wsme.wsattr(types.text, mandatory=False) diff --git a/glance/api/v2/model/metadef_tag.py b/glance/api/v2/model/metadef_tag.py index 147b087db0..f0fbcb2bde 100644 --- a/glance/api/v2/model/metadef_tag.py +++ b/glance/api/v2/model/metadef_tag.py @@ -24,7 +24,7 @@ class MetadefTag(types.Base, wsme_utils.WSMEModelTransformer): name = wsme.wsattr(types.text, mandatory=True) # Not using datetime since time format has to be - # in oslo.utils.timeutils.isotime() format + # in oslo_utils.timeutils.isotime() format created_at = wsme.wsattr(types.text, mandatory=False) updated_at = wsme.wsattr(types.text, mandatory=False) diff --git a/glance/api/v2/tasks.py b/glance/api/v2/tasks.py index 3a4ed64c67..bc0b77f2c1 100644 --- a/glance/api/v2/tasks.py +++ b/glance/api/v2/tasks.py @@ -19,7 +19,7 @@ import copy import glance_store from oslo.config import cfg import oslo.serialization.jsonutils as json -from oslo.utils import timeutils +from oslo_utils import timeutils import six import six.moves.urllib.parse as urlparse import webob.exc diff --git a/glance/cmd/__init__.py b/glance/cmd/__init__.py index e753f71c3d..734e3090e1 100644 --- a/glance/cmd/__init__.py +++ b/glance/cmd/__init__.py @@ -16,7 +16,7 @@ import os import sys -import oslo.utils.strutils as strutils +import oslo_utils.strutils as strutils from glance import i18n diff --git a/glance/cmd/cache_manage.py b/glance/cmd/cache_manage.py index 3215c874b4..207d4ddf35 100755 --- a/glance/cmd/cache_manage.py +++ b/glance/cmd/cache_manage.py @@ -26,7 +26,7 @@ import os import sys import time -from oslo.utils import timeutils +from oslo_utils import timeutils from glance.common import utils diff --git a/glance/cmd/control.py b/glance/cmd/control.py index 8a44fec1cc..4a60572ae1 100644 --- a/glance/cmd/control.py +++ b/glance/cmd/control.py @@ -40,7 +40,7 @@ if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')): sys.path.insert(0, possible_topdir) from oslo.config import cfg -from oslo.utils import units +from oslo_utils import units from six.moves import xrange from glance.common import config diff --git a/glance/cmd/manage.py b/glance/cmd/manage.py index 78ae806d76..8d60af1df5 100755 --- a/glance/cmd/manage.py +++ b/glance/cmd/manage.py @@ -40,7 +40,7 @@ if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')): from oslo.config import cfg from oslo.db.sqlalchemy import migration -from oslo.utils import encodeutils +from oslo_utils import encodeutils from glance.common import config from glance.common import exception diff --git a/glance/common/client.py b/glance/common/client.py index 06fa35e048..7bc5ff473d 100644 --- a/glance/common/client.py +++ b/glance/common/client.py @@ -40,7 +40,7 @@ try: except ImportError: SENDFILE_SUPPORTED = False -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six import six.moves.urllib.parse as urlparse from six.moves import xrange diff --git a/glance/common/rpc.py b/glance/common/rpc.py index 846548fd2a..b3ab8c84d4 100644 --- a/glance/common/rpc.py +++ b/glance/common/rpc.py @@ -20,8 +20,8 @@ import datetime import traceback from oslo.config import cfg -import oslo.utils.importutils as imp -from oslo.utils import timeutils +import oslo_utils.importutils as imp +from oslo_utils import timeutils import six from webob import exc diff --git a/glance/common/scripts/image_import/main.py b/glance/common/scripts/image_import/main.py index 6388c82986..1c0b5c6ace 100644 --- a/glance/common/scripts/image_import/main.py +++ b/glance/common/scripts/image_import/main.py @@ -17,8 +17,8 @@ __all__ = [ 'run', ] -from oslo.utils import excutils from oslo_concurrency import lockutils +from oslo_utils import excutils import six from glance.api.v2 import images as v2_api diff --git a/glance/common/utils.py b/glance/common/utils.py index cbfa09b392..9e8ced280b 100644 --- a/glance/common/utils.py +++ b/glance/common/utils.py @@ -38,10 +38,10 @@ import uuid import netaddr from OpenSSL import crypto from oslo.config import cfg -from oslo.utils import encodeutils -from oslo.utils import excutils -from oslo.utils import netutils -from oslo.utils import strutils +from oslo_utils import encodeutils +from oslo_utils import excutils +from oslo_utils import netutils +from oslo_utils import strutils import six from webob import exc diff --git a/glance/common/wsme_utils.py b/glance/common/wsme_utils.py index 010606341f..bcca895782 100644 --- a/glance/common/wsme_utils.py +++ b/glance/common/wsme_utils.py @@ -14,7 +14,7 @@ from datetime import datetime -from oslo.utils import timeutils +from oslo_utils import timeutils from wsme import types as wsme_types diff --git a/glance/db/__init__.py b/glance/db/__init__.py index 82b42b8604..5716650c23 100644 --- a/glance/db/__init__.py +++ b/glance/db/__init__.py @@ -17,7 +17,7 @@ # under the License. from oslo.config import cfg -from oslo.utils import importutils +from oslo_utils import importutils from wsme.rest import json from glance.api.v2.model.metadef_property_type import PropertyType diff --git a/glance/db/simple/api.py b/glance/db/simple/api.py index 481c629f0f..e279dfd7d7 100644 --- a/glance/db/simple/api.py +++ b/glance/db/simple/api.py @@ -19,7 +19,7 @@ import datetime import functools import uuid -from oslo.utils import timeutils +from oslo_utils import timeutils import six from glance.common import exception diff --git a/glance/db/sqlalchemy/api.py b/glance/db/sqlalchemy/api.py index d8ca6487fe..4e3ffa619c 100644 --- a/glance/db/sqlalchemy/api.py +++ b/glance/db/sqlalchemy/api.py @@ -25,7 +25,7 @@ import threading from oslo.config import cfg from oslo.db import exception as db_exception from oslo.db.sqlalchemy import session -from oslo.utils import timeutils +from oslo_utils import timeutils import osprofiler.sqlalchemy from retrying import retry import six diff --git a/glance/db/sqlalchemy/metadata.py b/glance/db/sqlalchemy/metadata.py index 00162b5f5a..defdc24dab 100644 --- a/glance/db/sqlalchemy/metadata.py +++ b/glance/db/sqlalchemy/metadata.py @@ -24,7 +24,7 @@ from os.path import join import re from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils import six import sqlalchemy from sqlalchemy.schema import MetaData diff --git a/glance/db/sqlalchemy/migrate_repo/versions/035_add_metadef_tables.py b/glance/db/sqlalchemy/migrate_repo/versions/035_add_metadef_tables.py index 8053227bc1..43e5ff0689 100644 --- a/glance/db/sqlalchemy/migrate_repo/versions/035_add_metadef_tables.py +++ b/glance/db/sqlalchemy/migrate_repo/versions/035_add_metadef_tables.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import timeutils +from oslo_utils import timeutils import sqlalchemy from sqlalchemy.schema import ( Column, ForeignKey, Index, MetaData, Table, UniqueConstraint) # noqa diff --git a/glance/db/sqlalchemy/models.py b/glance/db/sqlalchemy/models.py index bfde1973ee..0cff7336a9 100644 --- a/glance/db/sqlalchemy/models.py +++ b/glance/db/sqlalchemy/models.py @@ -22,7 +22,7 @@ import uuid from oslo.db.sqlalchemy import models from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_utils import timeutils from sqlalchemy import BigInteger from sqlalchemy import Boolean from sqlalchemy import Column diff --git a/glance/db/sqlalchemy/models_metadef.py b/glance/db/sqlalchemy/models_metadef.py index 81432de45a..8fff323782 100644 --- a/glance/db/sqlalchemy/models_metadef.py +++ b/glance/db/sqlalchemy/models_metadef.py @@ -17,7 +17,7 @@ SQLAlchemy models for glance metadata schema """ from oslo.db.sqlalchemy import models -from oslo.utils import timeutils +from oslo_utils import timeutils from sqlalchemy import Boolean from sqlalchemy import Column from sqlalchemy import DateTime diff --git a/glance/domain/__init__.py b/glance/domain/__init__.py index 86768660f7..876140f36b 100644 --- a/glance/domain/__init__.py +++ b/glance/domain/__init__.py @@ -19,9 +19,9 @@ import datetime import uuid from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import timeutils import six from glance.common import exception diff --git a/glance/image_cache/__init__.py b/glance/image_cache/__init__.py index 48f2817104..6d8d006e94 100644 --- a/glance/image_cache/__init__.py +++ b/glance/image_cache/__init__.py @@ -20,9 +20,9 @@ LRU Cache for Image Data import hashlib from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import units +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import units from glance.common import exception from glance.common import utils diff --git a/glance/image_cache/drivers/sqlite.py b/glance/image_cache/drivers/sqlite.py index d564504981..f80894f497 100644 --- a/glance/image_cache/drivers/sqlite.py +++ b/glance/image_cache/drivers/sqlite.py @@ -27,7 +27,7 @@ import time from eventlet import sleep from eventlet import timeout from oslo.config import cfg -from oslo.utils import excutils +from oslo_utils import excutils from glance.common import exception from glance import i18n diff --git a/glance/image_cache/drivers/xattr.py b/glance/image_cache/drivers/xattr.py index 941f643e27..26576ee9ed 100644 --- a/glance/image_cache/drivers/xattr.py +++ b/glance/image_cache/drivers/xattr.py @@ -59,7 +59,7 @@ import stat import time from oslo.config import cfg -from oslo.utils import excutils +from oslo_utils import excutils import xattr from glance.common import exception diff --git a/glance/location.py b/glance/location.py index 46b8c7c696..b9a7053390 100644 --- a/glance/location.py +++ b/glance/location.py @@ -18,7 +18,7 @@ import copy import glance_store as store from oslo.config import cfg -from oslo.utils import excutils +from oslo_utils import excutils from glance.common import exception from glance.common import utils diff --git a/glance/notifier.py b/glance/notifier.py index bec5137917..74b134d244 100644 --- a/glance/notifier.py +++ b/glance/notifier.py @@ -17,8 +17,8 @@ import glance_store from oslo.config import cfg from oslo import messaging -from oslo.utils import excutils -from oslo.utils import timeutils +from oslo_utils import excutils +from oslo_utils import timeutils import webob from glance.common import exception diff --git a/glance/openstack/common/fileutils.py b/glance/openstack/common/fileutils.py index cfc6bcf528..5cf2f63008 100644 --- a/glance/openstack/common/fileutils.py +++ b/glance/openstack/common/fileutils.py @@ -18,7 +18,7 @@ import errno import os import tempfile -from oslo.utils import excutils +from oslo_utils import excutils from glance.openstack.common import log as logging diff --git a/glance/openstack/common/log.py b/glance/openstack/common/log.py index 27297875c8..1ade396228 100644 --- a/glance/openstack/common/log.py +++ b/glance/openstack/common/log.py @@ -39,7 +39,7 @@ import traceback from oslo.config import cfg from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_utils import importutils import six from six import moves diff --git a/glance/quota/__init__.py b/glance/quota/__init__.py index cee7a866f8..fbcb280be3 100644 --- a/glance/quota/__init__.py +++ b/glance/quota/__init__.py @@ -16,7 +16,7 @@ import copy import glance_store as store from oslo.config import cfg -from oslo.utils import excutils +from oslo_utils import excutils import six import glance.api.common diff --git a/glance/registry/api/v1/images.py b/glance/registry/api/v1/images.py index 107b1eb95c..8d8872729e 100644 --- a/glance/registry/api/v1/images.py +++ b/glance/registry/api/v1/images.py @@ -18,8 +18,8 @@ Reference implementation registry server WSGI controller """ from oslo.config import cfg -from oslo.utils import strutils -from oslo.utils import timeutils +from oslo_utils import strutils +from oslo_utils import timeutils from webob import exc from glance.common import exception diff --git a/glance/registry/client/v1/client.py b/glance/registry/client/v1/client.py index fe467ada17..aad9c717c8 100644 --- a/glance/registry/client/v1/client.py +++ b/glance/registry/client/v1/client.py @@ -19,7 +19,7 @@ the Glance Registry API """ from oslo.serialization import jsonutils -from oslo.utils import excutils +from oslo_utils import excutils from glance.common.client import BaseClient from glance.common import crypt diff --git a/glance/tests/functional/db/base.py b/glance/tests/functional/db/base.py index 21ca783252..495667c9f9 100644 --- a/glance/tests/functional/db/base.py +++ b/glance/tests/functional/db/base.py @@ -20,7 +20,7 @@ import datetime import uuid import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from glance.common import exception from glance import context diff --git a/glance/tests/functional/store_utils.py b/glance/tests/functional/store_utils.py index 97592697da..89230f71e7 100644 --- a/glance/tests/functional/store_utils.py +++ b/glance/tests/functional/store_utils.py @@ -23,7 +23,7 @@ from __future__ import print_function import BaseHTTPServer import threading -from oslo.utils import units +from oslo_utils import units FIVE_KB = 5 * units.Ki diff --git a/glance/tests/functional/test_bin_glance_cache_manage.py b/glance/tests/functional/test_bin_glance_cache_manage.py index 0ff48ef1a4..3cd702bf50 100644 --- a/glance/tests/functional/test_bin_glance_cache_manage.py +++ b/glance/tests/functional/test_bin_glance_cache_manage.py @@ -22,7 +22,7 @@ import sys import httplib2 from oslo.serialization import jsonutils -from oslo.utils import units +from oslo_utils import units from six.moves import xrange from glance.tests import functional diff --git a/glance/tests/functional/test_cache_middleware.py b/glance/tests/functional/test_cache_middleware.py index b07ff98c47..5d1e162ebf 100644 --- a/glance/tests/functional/test_cache_middleware.py +++ b/glance/tests/functional/test_cache_middleware.py @@ -28,7 +28,7 @@ import time import httplib2 from oslo.serialization import jsonutils -from oslo.utils import units +from oslo_utils import units from six.moves import xrange from glance.tests import functional diff --git a/glance/tests/functional/test_scrubber.py b/glance/tests/functional/test_scrubber.py index 96269f5c66..78646e979b 100644 --- a/glance/tests/functional/test_scrubber.py +++ b/glance/tests/functional/test_scrubber.py @@ -20,7 +20,7 @@ import time import glance_store.location import httplib2 from oslo.serialization import jsonutils -from oslo.utils import units +from oslo_utils import units from six.moves import xrange from glance.common import crypt diff --git a/glance/tests/functional/v1/test_api.py b/glance/tests/functional/v1/test_api.py index 4c92c129ad..9c9c947708 100644 --- a/glance/tests/functional/v1/test_api.py +++ b/glance/tests/functional/v1/test_api.py @@ -19,7 +19,7 @@ import hashlib import httplib2 from oslo.serialization import jsonutils -from oslo.utils import units +from oslo_utils import units from glance.tests import functional from glance.tests.utils import minimal_headers diff --git a/glance/tests/functional/v1/test_copy_to_file.py b/glance/tests/functional/v1/test_copy_to_file.py index 3bc2681e81..fc386798b6 100644 --- a/glance/tests/functional/v1/test_copy_to_file.py +++ b/glance/tests/functional/v1/test_copy_to_file.py @@ -25,7 +25,7 @@ import time import httplib2 from oslo.serialization import jsonutils -from oslo.utils import units +from oslo_utils import units from six.moves import xrange from glance.tests import functional diff --git a/glance/tests/functional/v1/test_misc.py b/glance/tests/functional/v1/test_misc.py index 64f3315e60..3b4e6b2b35 100644 --- a/glance/tests/functional/v1/test_misc.py +++ b/glance/tests/functional/v1/test_misc.py @@ -17,7 +17,7 @@ import os import httplib2 from oslo.serialization import jsonutils -from oslo.utils import units +from oslo_utils import units from glance.tests import functional from glance.tests.utils import execute diff --git a/glance/tests/functional/v1/test_ssl.py b/glance/tests/functional/v1/test_ssl.py index 624f149abb..dc4ab93b42 100644 --- a/glance/tests/functional/v1/test_ssl.py +++ b/glance/tests/functional/v1/test_ssl.py @@ -35,8 +35,8 @@ import uuid import httplib2 from oslo.serialization import jsonutils -from oslo.utils import timeutils -from oslo.utils import units +from oslo_utils import timeutils +from oslo_utils import units from glance.tests import functional from glance.tests.utils import minimal_headers diff --git a/glance/tests/integration/legacy_functional/test_v1_api.py b/glance/tests/integration/legacy_functional/test_v1_api.py index ec7abb8644..dff4364659 100644 --- a/glance/tests/integration/legacy_functional/test_v1_api.py +++ b/glance/tests/integration/legacy_functional/test_v1_api.py @@ -16,8 +16,8 @@ import os import tempfile from oslo.serialization import jsonutils -from oslo.utils import timeutils -from oslo.utils import units +from oslo_utils import timeutils +from oslo_utils import units import testtools from glance.tests.integration.legacy_functional import base diff --git a/glance/tests/integration/v2/test_tasks_api.py b/glance/tests/integration/v2/test_tasks_api.py index 3e4c14f36d..f7e6672d1b 100644 --- a/glance/tests/integration/v2/test_tasks_api.py +++ b/glance/tests/integration/v2/test_tasks_api.py @@ -16,7 +16,7 @@ import time from oslo.serialization import jsonutils as json -from oslo.utils import timeutils +from oslo_utils import timeutils from glance.api.v2 import tasks from glance.tests.integration.v2 import base diff --git a/glance/tests/unit/test_auth.py b/glance/tests/unit/test_auth.py index 390d29a57e..949064f2a9 100644 --- a/glance/tests/unit/test_auth.py +++ b/glance/tests/unit/test_auth.py @@ -15,7 +15,7 @@ # under the License. from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_utils import timeutils import stubout import webob diff --git a/glance/tests/unit/test_db.py b/glance/tests/unit/test_db.py index 929e42def8..9237de9838 100644 --- a/glance/tests/unit/test_db.py +++ b/glance/tests/unit/test_db.py @@ -33,7 +33,7 @@ CONF = cfg.CONF CONF.import_opt('metadata_encryption_key', 'glance.common.config') -@mock.patch('oslo.utils.importutils.import_module') +@mock.patch('oslo_utils.importutils.import_module') class TestDbUtilities(test_utils.BaseTestCase): def setUp(self): super(TestDbUtilities, self).setUp() diff --git a/glance/tests/unit/test_domain.py b/glance/tests/unit/test_domain.py index d328a9b122..093cd6a905 100644 --- a/glance/tests/unit/test_domain.py +++ b/glance/tests/unit/test_domain.py @@ -19,8 +19,8 @@ import uuid import mock from oslo.config import cfg -import oslo.utils.importutils -from oslo.utils import timeutils +import oslo_utils.importutils +from oslo_utils import timeutils import glance.async from glance.common import exception @@ -526,7 +526,7 @@ class TestTaskExecutorFactory(test_utils.BaseTestCase): self.image_repo, self.image_factory) context = mock.Mock() - with mock.patch.object(oslo.utils.importutils, + with mock.patch.object(oslo_utils.importutils, 'import_class') as mock_import_class: mock_executor = mock.Mock() mock_import_class.return_value = mock_executor @@ -542,7 +542,7 @@ class TestTaskExecutorFactory(test_utils.BaseTestCase): self.image_repo, self.image_factory) context = mock.Mock() - with mock.patch.object(oslo.utils.importutils, + with mock.patch.object(oslo_utils.importutils, 'import_class') as mock_import_class: mock_import_class.side_effect = ImportError diff --git a/glance/tests/unit/test_image_cache.py b/glance/tests/unit/test_image_cache.py index a43913e490..b190e1b6ff 100644 --- a/glance/tests/unit/test_image_cache.py +++ b/glance/tests/unit/test_image_cache.py @@ -20,7 +20,7 @@ import os import time import fixtures -from oslo.utils import units +from oslo_utils import units import six from six.moves import xrange import stubout diff --git a/glance/tests/unit/test_migrations.py b/glance/tests/unit/test_migrations.py index 98dc3c6eb5..92b75727c7 100644 --- a/glance/tests/unit/test_migrations.py +++ b/glance/tests/unit/test_migrations.py @@ -38,7 +38,7 @@ from oslo.db.sqlalchemy import test_base from oslo.db.sqlalchemy import test_migrations from oslo.db.sqlalchemy import utils as db_utils from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_utils import timeutils import sqlalchemy from glance.common import crypt diff --git a/glance/tests/unit/test_notifier.py b/glance/tests/unit/test_notifier.py index af3698a4e1..31ffc13de5 100644 --- a/glance/tests/unit/test_notifier.py +++ b/glance/tests/unit/test_notifier.py @@ -20,7 +20,7 @@ import glance_store import mock from oslo.config import cfg from oslo import messaging -from oslo.utils import timeutils +from oslo_utils import timeutils import webob import glance.async diff --git a/glance/tests/unit/test_quota.py b/glance/tests/unit/test_quota.py index d2f6e47cb5..c6fef5cd30 100644 --- a/glance/tests/unit/test_quota.py +++ b/glance/tests/unit/test_quota.py @@ -16,7 +16,7 @@ import uuid import mock from mock import patch -from oslo.utils import units +from oslo_utils import units import six from glance.common import exception diff --git a/glance/tests/unit/v1/test_api.py b/glance/tests/unit/v1/test_api.py index acdc7d99a9..03a262876f 100644 --- a/glance/tests/unit/v1/test_api.py +++ b/glance/tests/unit/v1/test_api.py @@ -25,7 +25,7 @@ import glance_store as store import mock from oslo.config import cfg from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_utils import timeutils import routes import six import webob diff --git a/glance/tests/unit/v1/test_registry_api.py b/glance/tests/unit/v1/test_registry_api.py index bae5781a45..113fcaf703 100644 --- a/glance/tests/unit/v1/test_registry_api.py +++ b/glance/tests/unit/v1/test_registry_api.py @@ -21,7 +21,7 @@ import uuid import mock from oslo.config import cfg from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_utils import timeutils import routes import six import webob diff --git a/glance/tests/unit/v1/test_registry_client.py b/glance/tests/unit/v1/test_registry_client.py index a038d0f9ae..3844bf4ca5 100644 --- a/glance/tests/unit/v1/test_registry_client.py +++ b/glance/tests/unit/v1/test_registry_client.py @@ -19,7 +19,7 @@ import os import uuid from mock import patch -from oslo.utils import timeutils +from oslo_utils import timeutils import testtools from glance.common import client as test_client diff --git a/glance/tests/unit/v2/test_registry_api.py b/glance/tests/unit/v2/test_registry_api.py index 22f1852479..016ecabea3 100644 --- a/glance/tests/unit/v2/test_registry_api.py +++ b/glance/tests/unit/v2/test_registry_api.py @@ -20,7 +20,7 @@ import uuid from oslo.config import cfg from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_utils import timeutils import routes import six import webob diff --git a/glance/tests/unit/v2/test_registry_client.py b/glance/tests/unit/v2/test_registry_client.py index 3a65ccf302..82c7ae77c3 100644 --- a/glance/tests/unit/v2/test_registry_client.py +++ b/glance/tests/unit/v2/test_registry_client.py @@ -25,7 +25,7 @@ import os import uuid from mock import patch -from oslo.utils import timeutils +from oslo_utils import timeutils from glance.common import config from glance.common import exception diff --git a/glance/tests/unit/v2/test_tasks_resource.py b/glance/tests/unit/v2/test_tasks_resource.py index c0a280ec7e..4381241712 100644 --- a/glance/tests/unit/v2/test_tasks_resource.py +++ b/glance/tests/unit/v2/test_tasks_resource.py @@ -19,7 +19,7 @@ import uuid import mock from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_utils import timeutils import webob import glance.api.v2.tasks diff --git a/glance/tests/utils.py b/glance/tests/utils.py index 0c537b3a97..c5d9d8ad83 100644 --- a/glance/tests/utils.py +++ b/glance/tests/utils.py @@ -26,7 +26,7 @@ import subprocess import fixtures from oslo.config import cfg from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_utils import timeutils import six import stubout import testtools