From ae21f4dffacca5766a10ad6060324933e4f7ce2c Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Tue, 28 Apr 2015 18:57:45 +0000 Subject: [PATCH] Drop use of 'oslo' namespace package The Oslo libraries have moved all of their code out of the 'oslo' namespace package into per-library packages. The namespace package was retained during kilo for backwards compatibility, but will be removed by the liberty-2 milestone. This change removes the use of the namespace package, replacing it with the new package names. The patches in the libraries will be put on hold until application patches have landed, or L2, whichever comes first. At that point, new versions of the libraries without namespace packages will be released as a major version update. Please merge this patch, or an equivalent, before L2 to avoid problems with those library releases. Blueprint: remove-namespace-packages https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages Change-Id: Ifa8baab33cdb3e606cf175a8c29c3a4ef6c44480 --- glance/api/middleware/context.py | 2 +- glance/api/v2/image_members.py | 2 +- glance/api/v2/images.py | 2 +- glance/api/v2/metadef_namespaces.py | 2 +- glance/api/v2/metadef_objects.py | 2 +- glance/api/v2/metadef_properties.py | 2 +- glance/api/v2/metadef_resource_types.py | 2 +- glance/api/v2/metadef_tags.py | 2 +- glance/api/v2/tasks.py | 2 +- glance/api/versions.py | 2 +- glance/cmd/replicator.py | 4 ++-- glance/cmd/search.py | 2 +- glance/common/artifacts/loader.py | 2 +- glance/common/auth.py | 2 +- glance/common/wsgi.py | 2 +- glance/db/sqlalchemy/artifacts.py | 4 ++-- glance/db/sqlalchemy/models.py | 2 +- glance/i18n.py | 2 +- glance/image_cache/client.py | 2 +- glance/listener.py | 10 +++++----- glance/registry/client/v1/api.py | 2 +- glance/registry/client/v1/client.py | 2 +- glance/search/api/v0_1/search.py | 2 +- glance/service.py | 10 +++++----- glance/tests/functional/__init__.py | 2 +- glance/tests/functional/db/test_rpc_endpoint.py | 2 +- glance/tests/functional/test_api.py | 2 +- .../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/v2/test_images.py | 2 +- glance/tests/functional/v2/test_metadef_namespaces.py | 2 +- glance/tests/functional/v2/test_metadef_objects.py | 2 +- glance/tests/functional/v2/test_metadef_properties.py | 2 +- .../tests/functional/v2/test_metadef_resourcetypes.py | 2 +- glance/tests/functional/v2/test_metadef_tags.py | 2 +- glance/tests/functional/v2/test_schemas.py | 2 +- glance/tests/functional/v2/test_tasks.py | 2 +- .../tests/integration/legacy_functional/test_v1_api.py | 2 +- .../integration/v2/test_property_quota_violations.py | 2 +- glance/tests/integration/v2/test_tasks_api.py | 2 +- glance/tests/unit/async/test_taskflow_executor.py | 2 +- glance/tests/unit/base.py | 2 +- glance/tests/unit/common/test_rpc.py | 2 +- glance/tests/unit/common/test_wsgi.py | 2 +- glance/tests/unit/test_auth.py | 2 +- glance/tests/unit/test_glance_replicator.py | 2 +- glance/tests/unit/test_migrations.py | 2 +- glance/tests/unit/test_versions.py | 2 +- glance/tests/unit/v0_1/test_search.py | 2 +- glance/tests/unit/v1/test_api.py | 2 +- glance/tests/unit/v1/test_registry_api.py | 2 +- glance/tests/unit/v2/test_image_members_resource.py | 2 +- glance/tests/unit/v2/test_images_resource.py | 2 +- glance/tests/unit/v2/test_registry_api.py | 2 +- glance/tests/unit/v2/test_tasks_resource.py | 2 +- glance/tests/utils.py | 2 +- setup.cfg | 2 +- 61 files changed, 71 insertions(+), 71 deletions(-) diff --git a/glance/api/middleware/context.py b/glance/api/middleware/context.py index 3a51e403df..dbbcfe69e8 100644 --- a/glance/api/middleware/context.py +++ b/glance/api/middleware/context.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils from oslo_config import cfg from oslo_log import log as logging +from oslo_serialization import jsonutils import webob.exc from glance.api import policy diff --git a/glance/api/v2/image_members.py b/glance/api/v2/image_members.py index 5f80edcae9..7e15171f33 100644 --- a/glance/api/v2/image_members.py +++ b/glance/api/v2/image_members.py @@ -16,8 +16,8 @@ import copy import glance_store -from oslo.serialization import jsonutils from oslo_log import log as logging +from oslo_serialization import jsonutils from oslo_utils import timeutils import six import webob diff --git a/glance/api/v2/images.py b/glance/api/v2/images.py index 589b25ff81..30c32bbb5c 100644 --- a/glance/api/v2/images.py +++ b/glance/api/v2/images.py @@ -16,9 +16,9 @@ import re import glance_store -from oslo.serialization import jsonutils as json from oslo_config import cfg from oslo_log import log as logging +from oslo_serialization import jsonutils as json from oslo_utils import timeutils import six import six.moves.urllib.parse as urlparse diff --git a/glance/api/v2/metadef_namespaces.py b/glance/api/v2/metadef_namespaces.py index 1d00b5f7d8..83e787c8b9 100644 --- a/glance/api/v2/metadef_namespaces.py +++ b/glance/api/v2/metadef_namespaces.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.serialization import jsonutils from oslo_config import cfg from oslo_log import log as logging +from oslo_serialization import jsonutils import six import six.moves.urllib.parse as urlparse import webob.exc diff --git a/glance/api/v2/metadef_objects.py b/glance/api/v2/metadef_objects.py index bad2c96e76..ac0d3853d9 100644 --- a/glance/api/v2/metadef_objects.py +++ b/glance/api/v2/metadef_objects.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.serialization import jsonutils from oslo_config import cfg from oslo_log import log as logging +from oslo_serialization import jsonutils import six import webob.exc from wsme.rest import json diff --git a/glance/api/v2/metadef_properties.py b/glance/api/v2/metadef_properties.py index 0889e2cbec..5e98ee1b5f 100644 --- a/glance/api/v2/metadef_properties.py +++ b/glance/api/v2/metadef_properties.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.serialization import jsonutils from oslo_log import log as logging +from oslo_serialization import jsonutils import six import webob.exc from wsme.rest import json diff --git a/glance/api/v2/metadef_resource_types.py b/glance/api/v2/metadef_resource_types.py index dd27004f3c..2360daac5b 100644 --- a/glance/api/v2/metadef_resource_types.py +++ b/glance/api/v2/metadef_resource_types.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.serialization import jsonutils from oslo_log import log as logging +from oslo_serialization import jsonutils import six import webob.exc from wsme.rest import json diff --git a/glance/api/v2/metadef_tags.py b/glance/api/v2/metadef_tags.py index 74517dfc55..239fdfb8e9 100644 --- a/glance/api/v2/metadef_tags.py +++ b/glance/api/v2/metadef_tags.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.serialization import jsonutils from oslo_config import cfg from oslo_log import log as logging +from oslo_serialization import jsonutils import six import webob.exc from wsme.rest import json diff --git a/glance/api/v2/tasks.py b/glance/api/v2/tasks.py index 1afec82f8c..1645d16185 100644 --- a/glance/api/v2/tasks.py +++ b/glance/api/v2/tasks.py @@ -17,9 +17,9 @@ import copy import glance_store -import oslo.serialization.jsonutils as json from oslo_config import cfg from oslo_log import log as logging +import oslo_serialization.jsonutils as json from oslo_utils import timeutils import six import six.moves.urllib.parse as urlparse diff --git a/glance/api/versions.py b/glance/api/versions.py index e721521368..718520e52f 100644 --- a/glance/api/versions.py +++ b/glance/api/versions.py @@ -15,8 +15,8 @@ import httplib -from oslo.serialization import jsonutils from oslo_config import cfg +from oslo_serialization import jsonutils import webob.dec from glance.common import wsgi diff --git a/glance/cmd/replicator.py b/glance/cmd/replicator.py index 5b85c6f5eb..2311e3bcc1 100755 --- a/glance/cmd/replicator.py +++ b/glance/cmd/replicator.py @@ -22,9 +22,9 @@ import httplib import os import sys -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg from oslo_log import log as logging +from oslo_serialization import jsonutils import six.moves.urllib.parse as urlparse from webob import exc diff --git a/glance/cmd/search.py b/glance/cmd/search.py index d0c04bab1d..5c30027daa 100755 --- a/glance/cmd/search.py +++ b/glance/cmd/search.py @@ -40,7 +40,7 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), 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_config import cfg from oslo_log import log as logging import osprofiler.notifier import osprofiler.web diff --git a/glance/common/artifacts/loader.py b/glance/common/artifacts/loader.py index 6c876ae22e..926e4c981f 100644 --- a/glance/common/artifacts/loader.py +++ b/glance/common/artifacts/loader.py @@ -15,7 +15,7 @@ import copy -from oslo.config import cfg +from oslo_config import cfg import semantic_version from stevedore import enabled diff --git a/glance/common/auth.py b/glance/common/auth.py index 7030600360..caed11b0f6 100644 --- a/glance/common/auth.py +++ b/glance/common/auth.py @@ -29,8 +29,8 @@ Keystone (an identity management system). http://service_endpoint/ """ import httplib2 -from oslo.serialization import jsonutils from oslo_log import log as logging +from oslo_serialization import jsonutils # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range import six.moves.urllib.parse as urlparse diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py index b2633c831e..3730cae1e1 100644 --- a/glance/common/wsgi.py +++ b/glance/common/wsgi.py @@ -34,11 +34,11 @@ from eventlet.green import ssl import eventlet.greenio import eventlet.wsgi import glance_store -from oslo.serialization import jsonutils from oslo_concurrency import processutils from oslo_config import cfg from oslo_log import log as logging from oslo_log import loggers +from oslo_serialization import jsonutils import routes import routes.middleware import six diff --git a/glance/db/sqlalchemy/artifacts.py b/glance/db/sqlalchemy/artifacts.py index 2a9779a16f..8ade68690d 100644 --- a/glance/db/sqlalchemy/artifacts.py +++ b/glance/db/sqlalchemy/artifacts.py @@ -17,8 +17,8 @@ import operator import uuid from enum import Enum -from oslo.config import cfg -from oslo.db import exception as db_exc +from oslo_config import cfg +from oslo_db import exception as db_exc from oslo_utils import timeutils import sqlalchemy from sqlalchemy import and_ diff --git a/glance/db/sqlalchemy/models.py b/glance/db/sqlalchemy/models.py index ee1d64d18d..5a8f7588dc 100644 --- a/glance/db/sqlalchemy/models.py +++ b/glance/db/sqlalchemy/models.py @@ -20,8 +20,8 @@ SQLAlchemy models for glance data import uuid -from oslo.serialization import jsonutils from oslo_db.sqlalchemy import models +from oslo_serialization import jsonutils from oslo_utils import timeutils from sqlalchemy import BigInteger from sqlalchemy import Boolean diff --git a/glance/i18n.py b/glance/i18n.py index d17b588252..7c1309225f 100644 --- a/glance/i18n.py +++ b/glance/i18n.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.i18n import * # noqa +from oslo_i18n import * # noqa _translators = TranslatorFactory(domain='glance') diff --git a/glance/image_cache/client.py b/glance/image_cache/client.py index fc3c773b79..329920672e 100644 --- a/glance/image_cache/client.py +++ b/glance/image_cache/client.py @@ -15,7 +15,7 @@ import os -from oslo.serialization import jsonutils as json +from oslo_serialization import jsonutils as json from glance.common import client as base_client from glance.common import exception diff --git a/glance/listener.py b/glance/listener.py index a9b790eedb..6cd5e113f4 100644 --- a/glance/listener.py +++ b/glance/listener.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg from oslo_log import log as logging +import oslo_messaging import stevedore from glance import i18n @@ -62,14 +62,14 @@ class ListenerService(os_service.Service): def start(self): super(ListenerService, self).start() - transport = messaging.get_transport(cfg.CONF) + transport = oslo_messaging.get_transport(cfg.CONF) targets = [ - messaging.Target(topic="notifications", exchange="glance") + oslo_messaging.Target(topic="notifications", exchange="glance") ] endpoints = [ NotificationEndpoint() ] - listener = messaging.get_notification_listener( + listener = oslo_messaging.get_notification_listener( transport, targets, endpoints) diff --git a/glance/registry/client/v1/api.py b/glance/registry/client/v1/api.py index a99e412d50..1d2c61416d 100644 --- a/glance/registry/client/v1/api.py +++ b/glance/registry/client/v1/api.py @@ -19,9 +19,9 @@ Registry's Client API import os -from oslo.serialization import jsonutils from oslo_config import cfg from oslo_log import log as logging +from oslo_serialization import jsonutils from glance.common import exception from glance import i18n diff --git a/glance/registry/client/v1/client.py b/glance/registry/client/v1/client.py index 26d038cc3c..94b15932de 100644 --- a/glance/registry/client/v1/client.py +++ b/glance/registry/client/v1/client.py @@ -18,8 +18,8 @@ Simple client class to speak with any RESTful service that implements the Glance Registry API """ -from oslo.serialization import jsonutils from oslo_log import log as logging +from oslo_serialization import jsonutils from oslo_utils import excutils from glance.common.client import BaseClient diff --git a/glance/search/api/v0_1/search.py b/glance/search/api/v0_1/search.py index f6aa4bf55d..e33e6eeda4 100755 --- a/glance/search/api/v0_1/search.py +++ b/glance/search/api/v0_1/search.py @@ -15,7 +15,7 @@ import json -from oslo.config import cfg +from oslo_config import cfg from oslo_log import log as logging import six import webob.exc diff --git a/glance/service.py b/glance/service.py index 12c62237f9..a0b1bf1b95 100644 --- a/glance/service.py +++ b/glance/service.py @@ -19,10 +19,10 @@ import os import socket import sys -from oslo.config import cfg -from oslo import i18n -import oslo.messaging +from oslo_config import cfg +import oslo_i18n from oslo_log import log +import oslo_messaging CONF = cfg.CONF @@ -97,11 +97,11 @@ def get_workers(name): def prepare_service(argv=None): - i18n.enable_lazy() + oslo_i18n.enable_lazy() log.set_defaults(_DEFAULT_LOG_LEVELS) log.register_options(CONF) if argv is None: argv = sys.argv CONF(argv[1:], project='glance-search') log.setup(cfg.CONF, 'glance-search') - oslo.messaging.set_transport_defaults('glance') + oslo_messaging.set_transport_defaults('glance') diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py index 0b83d150a8..04643745b4 100644 --- a/glance/tests/functional/__init__.py +++ b/glance/tests/functional/__init__.py @@ -33,7 +33,7 @@ import tempfile import time import fixtures -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range import six.moves.urllib.parse as urlparse diff --git a/glance/tests/functional/db/test_rpc_endpoint.py b/glance/tests/functional/db/test_rpc_endpoint.py index e532c53421..c6c81df13c 100644 --- a/glance/tests/functional/db/test_rpc_endpoint.py +++ b/glance/tests/functional/db/test_rpc_endpoint.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from glance.tests import functional diff --git a/glance/tests/functional/test_api.py b/glance/tests/functional/test_api.py index dc6f58b610..2c8e875feb 100644 --- a/glance/tests/functional/test_api.py +++ b/glance/tests/functional/test_api.py @@ -17,7 +17,7 @@ import httplib2 -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from glance.tests import functional diff --git a/glance/tests/functional/test_bin_glance_cache_manage.py b/glance/tests/functional/test_bin_glance_cache_manage.py index 3bef8f7ce4..de2af00c5b 100644 --- a/glance/tests/functional/test_bin_glance_cache_manage.py +++ b/glance/tests/functional/test_bin_glance_cache_manage.py @@ -21,7 +21,7 @@ import os import sys import httplib2 -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import units # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range diff --git a/glance/tests/functional/test_cache_middleware.py b/glance/tests/functional/test_cache_middleware.py index a403b40c47..2a88a7cc8f 100644 --- a/glance/tests/functional/test_cache_middleware.py +++ b/glance/tests/functional/test_cache_middleware.py @@ -27,7 +27,7 @@ import sys import time import httplib2 -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import units # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range diff --git a/glance/tests/functional/test_scrubber.py b/glance/tests/functional/test_scrubber.py index c0fa9ec35d..513818ec0a 100644 --- a/glance/tests/functional/test_scrubber.py +++ b/glance/tests/functional/test_scrubber.py @@ -19,7 +19,7 @@ import time import glance_store.location import httplib2 -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import units # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range diff --git a/glance/tests/functional/v1/test_api.py b/glance/tests/functional/v1/test_api.py index 9fba3bb5e4..d641992c28 100644 --- a/glance/tests/functional/v1/test_api.py +++ b/glance/tests/functional/v1/test_api.py @@ -18,7 +18,7 @@ import hashlib import httplib2 -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import units # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range diff --git a/glance/tests/functional/v1/test_copy_to_file.py b/glance/tests/functional/v1/test_copy_to_file.py index 921ed0d703..4ebc766afb 100644 --- a/glance/tests/functional/v1/test_copy_to_file.py +++ b/glance/tests/functional/v1/test_copy_to_file.py @@ -24,7 +24,7 @@ import tempfile import time import httplib2 -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import units # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range diff --git a/glance/tests/functional/v1/test_misc.py b/glance/tests/functional/v1/test_misc.py index 76e1988f4c..229885fe7b 100644 --- a/glance/tests/functional/v1/test_misc.py +++ b/glance/tests/functional/v1/test_misc.py @@ -16,7 +16,7 @@ import hashlib import os import httplib2 -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import units from glance.tests import functional diff --git a/glance/tests/functional/v2/test_images.py b/glance/tests/functional/v2/test_images.py index 0a1ab534ee..c134594acc 100644 --- a/glance/tests/functional/v2/test_images.py +++ b/glance/tests/functional/v2/test_images.py @@ -17,7 +17,7 @@ import os import signal import uuid -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests import six # NOTE(jokke): simplified transition to py3, behaves like py2 xrange diff --git a/glance/tests/functional/v2/test_metadef_namespaces.py b/glance/tests/functional/v2/test_metadef_namespaces.py index d871192b56..f1d6de0cdd 100644 --- a/glance/tests/functional/v2/test_metadef_namespaces.py +++ b/glance/tests/functional/v2/test_metadef_namespaces.py @@ -15,7 +15,7 @@ import uuid -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from glance.tests import functional diff --git a/glance/tests/functional/v2/test_metadef_objects.py b/glance/tests/functional/v2/test_metadef_objects.py index 857de8086d..d60ed5632a 100644 --- a/glance/tests/functional/v2/test_metadef_objects.py +++ b/glance/tests/functional/v2/test_metadef_objects.py @@ -15,7 +15,7 @@ import uuid -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from glance.tests import functional diff --git a/glance/tests/functional/v2/test_metadef_properties.py b/glance/tests/functional/v2/test_metadef_properties.py index af346b1add..d754b70faa 100644 --- a/glance/tests/functional/v2/test_metadef_properties.py +++ b/glance/tests/functional/v2/test_metadef_properties.py @@ -15,7 +15,7 @@ import uuid -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from glance.tests import functional diff --git a/glance/tests/functional/v2/test_metadef_resourcetypes.py b/glance/tests/functional/v2/test_metadef_resourcetypes.py index 843467c737..ad08d55c7f 100644 --- a/glance/tests/functional/v2/test_metadef_resourcetypes.py +++ b/glance/tests/functional/v2/test_metadef_resourcetypes.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.serialization import jsonutils from oslo_log import log as logging +from oslo_serialization import jsonutils import six import webob.exc from wsme.rest import json diff --git a/glance/tests/functional/v2/test_metadef_tags.py b/glance/tests/functional/v2/test_metadef_tags.py index 66f16127a3..3fba764ba8 100755 --- a/glance/tests/functional/v2/test_metadef_tags.py +++ b/glance/tests/functional/v2/test_metadef_tags.py @@ -15,7 +15,7 @@ import uuid -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from glance.tests import functional diff --git a/glance/tests/functional/v2/test_schemas.py b/glance/tests/functional/v2/test_schemas.py index d341424da4..63eb8d5047 100644 --- a/glance/tests/functional/v2/test_schemas.py +++ b/glance/tests/functional/v2/test_schemas.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from glance.tests import functional diff --git a/glance/tests/functional/v2/test_tasks.py b/glance/tests/functional/v2/test_tasks.py index ffc6a8600f..edaa360178 100644 --- a/glance/tests/functional/v2/test_tasks.py +++ b/glance/tests/functional/v2/test_tasks.py @@ -16,7 +16,7 @@ import uuid -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from glance.tests import functional diff --git a/glance/tests/integration/legacy_functional/test_v1_api.py b/glance/tests/integration/legacy_functional/test_v1_api.py index dff4364659..dd7017dbdc 100644 --- a/glance/tests/integration/legacy_functional/test_v1_api.py +++ b/glance/tests/integration/legacy_functional/test_v1_api.py @@ -15,7 +15,7 @@ import hashlib import os import tempfile -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import timeutils from oslo_utils import units import testtools diff --git a/glance/tests/integration/v2/test_property_quota_violations.py b/glance/tests/integration/v2/test_property_quota_violations.py index b772ab1f2e..8fdebd5cdb 100644 --- a/glance/tests/integration/v2/test_property_quota_violations.py +++ b/glance/tests/integration/v2/test_property_quota_violations.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils from oslo_config import cfg +from oslo_serialization import jsonutils # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range diff --git a/glance/tests/integration/v2/test_tasks_api.py b/glance/tests/integration/v2/test_tasks_api.py index 2f09956763..6fe606825c 100644 --- a/glance/tests/integration/v2/test_tasks_api.py +++ b/glance/tests/integration/v2/test_tasks_api.py @@ -15,7 +15,7 @@ import time -from oslo.serialization import jsonutils as json +from oslo_serialization import jsonutils as json from oslo_utils import timeutils from glance.api.v2 import tasks diff --git a/glance/tests/unit/async/test_taskflow_executor.py b/glance/tests/unit/async/test_taskflow_executor.py index 678291801e..403d870e63 100644 --- a/glance/tests/unit/async/test_taskflow_executor.py +++ b/glance/tests/unit/async/test_taskflow_executor.py @@ -16,7 +16,7 @@ import mock import glance_store -from oslo.config import cfg +from oslo_config import cfg from taskflow import engines from glance.async import taskflow_executor diff --git a/glance/tests/unit/base.py b/glance/tests/unit/base.py index 73e134e202..d919050d8b 100644 --- a/glance/tests/unit/base.py +++ b/glance/tests/unit/base.py @@ -17,10 +17,10 @@ import os import glance_store as store from glance_store import location -from oslo.serialization import jsonutils from oslo_concurrency import lockutils from oslo_config import cfg from oslo_db import options +from oslo_serialization import jsonutils from glance.tests import stubs from glance.tests import utils as test_utils diff --git a/glance/tests/unit/common/test_rpc.py b/glance/tests/unit/common/test_rpc.py index ec80891407..81b905224d 100644 --- a/glance/tests/unit/common/test_rpc.py +++ b/glance/tests/unit/common/test_rpc.py @@ -16,8 +16,8 @@ # under the License. import datetime -from oslo.serialization import jsonutils from oslo_config import cfg +from oslo_serialization import jsonutils import routes import webob diff --git a/glance/tests/unit/common/test_wsgi.py b/glance/tests/unit/common/test_wsgi.py index bc1d885241..1ea73e3f63 100644 --- a/glance/tests/unit/common/test_wsgi.py +++ b/glance/tests/unit/common/test_wsgi.py @@ -22,7 +22,7 @@ from babel import localedata import eventlet.patcher import fixtures import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import routes import six import webob diff --git a/glance/tests/unit/test_auth.py b/glance/tests/unit/test_auth.py index 032a3102fa..2fc15afaca 100644 --- a/glance/tests/unit/test_auth.py +++ b/glance/tests/unit/test_auth.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import timeutils from oslotest import moxstubout import webob diff --git a/glance/tests/unit/test_glance_replicator.py b/glance/tests/unit/test_glance_replicator.py index 988df1686c..767861afae 100644 --- a/glance/tests/unit/test_glance_replicator.py +++ b/glance/tests/unit/test_glance_replicator.py @@ -19,7 +19,7 @@ import UserDict import uuid import fixtures -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six import webob diff --git a/glance/tests/unit/test_migrations.py b/glance/tests/unit/test_migrations.py index 69418c433e..c59efe4a47 100644 --- a/glance/tests/unit/test_migrations.py +++ b/glance/tests/unit/test_migrations.py @@ -33,11 +33,11 @@ import uuid from migrate.versioning import api as migration_api from migrate.versioning.repository import Repository -from oslo.serialization import jsonutils from oslo_config import cfg 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 # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range diff --git a/glance/tests/unit/test_versions.py b/glance/tests/unit/test_versions.py index 2055d8bd20..08f52996e5 100644 --- a/glance/tests/unit/test_versions.py +++ b/glance/tests/unit/test_versions.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from glance.api.middleware import version_negotiation diff --git a/glance/tests/unit/v0_1/test_search.py b/glance/tests/unit/v0_1/test_search.py index 09a083cf6a..26610e8c35 100755 --- a/glance/tests/unit/v0_1/test_search.py +++ b/glance/tests/unit/v0_1/test_search.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob.exc from glance.common import exception diff --git a/glance/tests/unit/v1/test_api.py b/glance/tests/unit/v1/test_api.py index 5448bd5d3d..0a0b47fe3f 100644 --- a/glance/tests/unit/v1/test_api.py +++ b/glance/tests/unit/v1/test_api.py @@ -24,8 +24,8 @@ import uuid import glance_store as store import mock -from oslo.serialization import jsonutils from oslo_config import cfg +from oslo_serialization import jsonutils from oslo_utils import timeutils import routes import six diff --git a/glance/tests/unit/v1/test_registry_api.py b/glance/tests/unit/v1/test_registry_api.py index c77d8556b0..0936818991 100644 --- a/glance/tests/unit/v1/test_registry_api.py +++ b/glance/tests/unit/v1/test_registry_api.py @@ -19,8 +19,8 @@ import datetime import uuid import mock -from oslo.serialization import jsonutils from oslo_config import cfg +from oslo_serialization import jsonutils from oslo_utils import timeutils import routes import six diff --git a/glance/tests/unit/v2/test_image_members_resource.py b/glance/tests/unit/v2/test_image_members_resource.py index 97238a4510..7d4a4938d0 100644 --- a/glance/tests/unit/v2/test_image_members_resource.py +++ b/glance/tests/unit/v2/test_image_members_resource.py @@ -16,8 +16,8 @@ import datetime import glance_store -from oslo.serialization import jsonutils from oslo_config import cfg +from oslo_serialization import jsonutils import webob import glance.api.v2.image_members diff --git a/glance/tests/unit/v2/test_images_resource.py b/glance/tests/unit/v2/test_images_resource.py index 81cc8706cc..8eb032f511 100644 --- a/glance/tests/unit/v2/test_images_resource.py +++ b/glance/tests/unit/v2/test_images_resource.py @@ -19,8 +19,8 @@ import uuid import glance_store as store import mock -from oslo.serialization import jsonutils from oslo_config import cfg +from oslo_serialization import jsonutils import six # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range diff --git a/glance/tests/unit/v2/test_registry_api.py b/glance/tests/unit/v2/test_registry_api.py index f43a496aca..33c5654e81 100644 --- a/glance/tests/unit/v2/test_registry_api.py +++ b/glance/tests/unit/v2/test_registry_api.py @@ -18,8 +18,8 @@ import datetime import uuid -from oslo.serialization import jsonutils from oslo_config import cfg +from oslo_serialization import jsonutils from oslo_utils import timeutils import routes import six diff --git a/glance/tests/unit/v2/test_tasks_resource.py b/glance/tests/unit/v2/test_tasks_resource.py index 103b27c3f7..29ba8321ed 100644 --- a/glance/tests/unit/v2/test_tasks_resource.py +++ b/glance/tests/unit/v2/test_tasks_resource.py @@ -18,7 +18,7 @@ import datetime import uuid import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import timeutils # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range diff --git a/glance/tests/utils.py b/glance/tests/utils.py index 67dcccbe7e..164081e8b0 100644 --- a/glance/tests/utils.py +++ b/glance/tests/utils.py @@ -25,8 +25,8 @@ import socket import subprocess import fixtures -from oslo.serialization import jsonutils from oslo_config import cfg +from oslo_serialization import jsonutils from oslo_utils import timeutils from oslotest import moxstubout import six diff --git a/setup.cfg b/setup.cfg index 6539b5528c..af33e63458 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,7 +45,7 @@ oslo.config.opts = glance.cache= glance.opts:list_cache_opts glance.manage = glance.opts:list_manage_opts glance.database.migration_backend = - sqlalchemy = oslo.db.sqlalchemy.migration + sqlalchemy = oslo_db.sqlalchemy.migration glance.database.metadata_backend = sqlalchemy = glance.db.sqlalchemy.metadata glance.search.index_backend =