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

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

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

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

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

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

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

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

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

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

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

glance/cmd/replicator.py

@@ -22,9 +22,9 @@ import httplib
 import os
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
-from oslo.serialization import jsonutils
 from oslo_log import log as logging
+from oslo_serialization import jsonutils
 import six.moves.urllib.parse as urlparse
 from webob import exc
 

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

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
 

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

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

glance/db/sqlalchemy/artifacts.py

@@ -17,8 +17,8 @@ import operator
 import uuid
 
 from enum import Enum
-from oslo.config import cfg
+from oslo_config import cfg
-from oslo.db import exception as db_exc
+from oslo_db import exception as db_exc
 from oslo_utils import timeutils
 import sqlalchemy
 from sqlalchemy import and_

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

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

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

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_config import cfg
-from oslo import messaging
 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)

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

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

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

glance/service.py

@@ -19,10 +19,10 @@ import os
 import socket
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
-from oslo import i18n
+import oslo_i18n
-import oslo.messaging
 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')

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

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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

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

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

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
 

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

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

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
 

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

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

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

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

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

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

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

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

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

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

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 =