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
Cherry-picked from 3b6ca5b6de9e7964e1a3c41b5b0146e116b248ba

Change-Id: I05a408b76d4f31b803769a27759e91df770511bb

9 files changed, 10 insertions, 10 deletions

diff --git a/tests/drivers/test_impl_rabbit.py b/tests/drivers/test_impl_rabbit.py
index 515e49b..b2da4a8 100644
--- a/tests/drivers/test_impl_rabbit.py
+++ b/tests/drivers/test_impl_rabbit.py
@@ -23,14 +23,14 @@ import kombu
 from oslotest import mockpatch
 import testscenarios
 
-from oslo.config import cfg
 from oslo import messaging
-from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_messaging._drivers import amqp
 from oslo_messaging._drivers import amqpdriver
 from oslo_messaging._drivers import common as driver_common
 from oslo_messaging._drivers import impl_rabbit as rabbit_driver
 from oslo_messaging.tests import utils as test_utils
+from oslo_serialization import jsonutils
 from six.moves import mock
 
 load_tests = testscenarios.load_tests_apply_scenarios
diff --git a/tests/drivers/test_matchmaker.py b/tests/drivers/test_matchmaker.py
index 7674145..fe59fef 100644
--- a/tests/drivers/test_matchmaker.py
+++ b/tests/drivers/test_matchmaker.py
@@ -14,8 +14,8 @@
 
 import testtools
 
-from oslo.utils import importutils
 from oslo_messaging.tests import utils as test_utils
+from oslo_utils import importutils
 
 # NOTE(jamespage) matchmaker tied directly to eventlet
 # which is not yet py3 compatible - skip if import fails
diff --git a/tests/drivers/test_matchmaker_redis.py b/tests/drivers/test_matchmaker_redis.py
index a36e14a..35a8c14 100644
--- a/tests/drivers/test_matchmaker_redis.py
+++ b/tests/drivers/test_matchmaker_redis.py
@@ -14,8 +14,8 @@
 
 import testtools
 
-from oslo.utils import importutils
 from oslo_messaging.tests import utils as test_utils
+from oslo_utils import importutils
 
 redis = importutils.try_import('redis')
 matchmaker_redis = (
diff --git a/tests/drivers/test_matchmaker_ring.py b/tests/drivers/test_matchmaker_ring.py
index c3bc524..0107464 100644
--- a/tests/drivers/test_matchmaker_ring.py
+++ b/tests/drivers/test_matchmaker_ring.py
@@ -14,8 +14,8 @@
 
 import testtools
 
-from oslo.utils import importutils
 from oslo_messaging.tests import utils as test_utils
+from oslo_utils import importutils
 
 # NOTE(jamespage) matchmaker tied directly to eventlet
 # which is not yet py3 compatible - skip if import fails
diff --git a/tests/notify/test_listener.py b/tests/notify/test_listener.py
index 80c26a6..84e257d 100644
--- a/tests/notify/test_listener.py
+++ b/tests/notify/test_listener.py
@@ -18,9 +18,9 @@ import time
 
 import testscenarios
 
-from oslo.config import cfg
 from oslo import messaging
 from oslo.messaging.notify import dispatcher
+from oslo_config import cfg
 from oslo_messaging.tests import utils as test_utils
 from six.moves import mock
 
diff --git a/tests/rpc/test_client.py b/tests/rpc/test_client.py
index 5f13892..65c4f67 100644
--- a/tests/rpc/test_client.py
+++ b/tests/rpc/test_client.py
@@ -15,10 +15,10 @@
 
 import testscenarios
 
-from oslo.config import cfg
 from oslo import messaging
 from oslo.messaging import exceptions
 from oslo.messaging import serializer as msg_serializer
+from oslo_config import cfg
 from oslo_messaging.tests import utils as test_utils
 
 load_tests = testscenarios.load_tests_apply_scenarios
diff --git a/tests/rpc/test_server.py b/tests/rpc/test_server.py
index b429191..6e1ae16 100644
--- a/tests/rpc/test_server.py
+++ b/tests/rpc/test_server.py
@@ -17,8 +17,8 @@ import threading
 
 import testscenarios
 
-from oslo.config import cfg
 from oslo import messaging
+from oslo_config import cfg
 from oslo_messaging.tests import utils as test_utils
 from six.moves import mock
 
diff --git a/tests/test_exception_serialization.py b/tests/test_exception_serialization.py
index 74d808f..17e8ff1 100644
--- a/tests/test_exception_serialization.py
+++ b/tests/test_exception_serialization.py
@@ -19,9 +19,9 @@ import six
 import testscenarios
 
 from oslo import messaging
-from oslo.serialization import jsonutils
 from oslo_messaging._drivers import common as exceptions
 from oslo_messaging.tests import utils as test_utils
+from oslo_serialization import jsonutils
 
 load_tests = testscenarios.load_tests_apply_scenarios
 
diff --git a/tests/test_transport.py b/tests/test_transport.py
index 36f8db8..a3b5b91 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -19,9 +19,9 @@ import six
 from stevedore import driver
 import testscenarios
 
-from oslo.config import cfg
 from oslo import messaging
 from oslo.messaging import transport
+from oslo_config import cfg
 from oslo_messaging.tests import utils as test_utils
 from oslo_messaging import transport as private_transport