Merge "Move oslo.messaging to the oslo_messaging namespace"

cinder/api/contrib/volume_actions.py

@@ -13,7 +13,7 @@
 #   under the License.
 
 
-from oslo import messaging
+import oslo_messaging as messaging
 from oslo_utils import strutils
 import webob
 

cinder/backup/manager.py

@@ -33,8 +33,8 @@ Volume backups can be created, restored, deleted and listed.
 
 """
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 from oslo_utils import excutils
 from oslo_utils import importutils
 

cinder/backup/rpcapi.py

@@ -18,8 +18,8 @@ Client side of the volume backup RPC API.
 """
 
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 
 from cinder.openstack.common import log as logging
 from cinder import rpc

cinder/cmd/manage.py

@@ -61,9 +61,9 @@ import warnings
 
 warnings.simplefilter('once', DeprecationWarning)
 
-from oslo import messaging
 from oslo_config import cfg
 from oslo_db.sqlalchemy import migration
+import oslo_messaging as messaging
 from oslo_utils import uuidutils
 
 from cinder import i18n

cinder/manager.py

@@ -52,8 +52,8 @@ This module provides Manager, a base class for managers.
 """
 
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 
 from cinder.db import base
 from cinder.openstack.common import log as logging

cinder/rpc.py

@@ -26,8 +26,8 @@ __all__ = [
     'TRANSPORT_ALIASES',
 ]
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 from osprofiler import profiler
 

cinder/scheduler/manager.py

@@ -19,8 +19,8 @@
 Scheduler Service
 """
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 from oslo_utils import excutils
 from oslo_utils import importutils
 

cinder/scheduler/rpcapi.py

@@ -16,8 +16,8 @@
 Client side of the scheduler manager RPC API.
 """
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 
 from cinder.objects import base as objects_base

cinder/service.py

@@ -22,10 +22,10 @@ import inspect
 import os
 import random
 
-from oslo import messaging
 from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_db import exception as db_exc
+import oslo_messaging as messaging
 from oslo_utils import importutils
 import osprofiler.notifier
 from osprofiler import profiler

cinder/test.py

@@ -29,10 +29,10 @@ import uuid
 import fixtures
 import mock
 import mox
-from oslo.messaging import conffixture as messaging_conffixture
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
+from oslo_messaging import conffixture as messaging_conffixture
 from oslo_utils import strutils
 from oslo_utils import timeutils
 import stubout

cinder/tests/api/contrib/test_volume_actions.py

@@ -17,8 +17,8 @@ import json
 import uuid
 
 import mock
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 import webob
 

cinder/tests/fake_notifier.py

@@ -16,7 +16,7 @@ import collections
 import functools
 
 import anyjson
-from oslo import messaging
+import oslo_messaging as messaging
 
 from cinder import rpc
 

cinder/tests/test_cmd.py

@@ -402,7 +402,7 @@ class TestCinderManageCmd(test.TestCase):
     @mock.patch('cinder.rpc.get_client')
     @mock.patch('cinder.rpc.init')
     @mock.patch('cinder.rpc.initialized', return_value=False)
-    @mock.patch('oslo.messaging.Target')
+    @mock.patch('oslo_messaging.Target')
     def test_volume_commands_init(self, messaging_target, rpc_initialized,
                                   rpc_init, get_client, object_serializer):
         CONF.set_override('volume_topic', 'fake-topic')

cinder/tests/test_test.py

@@ -17,8 +17,8 @@
 
 """Tests for the testing base code."""
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 
 from cinder import rpc
 from cinder import test

cinder/volume/manager.py

@@ -39,8 +39,8 @@ intact.
 
 import time
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 from oslo_utils import excutils
 from oslo_utils import importutils

cinder/volume/rpcapi.py

@@ -16,8 +16,8 @@
 Client side of the volume RPC API.
 """
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 
 from cinder.objects import base as objects_base

setup.cfg

@@ -53,12 +53,12 @@ console_scripts =
     cinder-volume = cinder.cmd.volume:main
     cinder-volume-usage-audit = cinder.cmd.volume_usage_audit:main
 # These are for backwards compat with Havana notification_driver configuration values
-oslo.messaging.notify.drivers =
-    cinder.openstack.common.notifier.log_notifier = oslo.messaging.notify._impl_log:LogDriver
-    cinder.openstack.common.notifier.no_op_notifier = oslo.messaging.notify._impl_noop:NoOpDriver
-    cinder.openstack.common.notifier.rpc_notifier2 = oslo.messaging.notify._impl_messaging:MessagingV2Driver
-    cinder.openstack.common.notifier.rpc_notifier = oslo.messaging.notify._impl_messaging:MessagingDriver
-    cinder.openstack.common.notifier.test_notifier = oslo.messaging.notify._impl_test:TestDriver
+oslo_messaging.notify.drivers =
+    cinder.openstack.common.notifier.log_notifier = oslo_messaging.notify._impl_log:LogDriver
+    cinder.openstack.common.notifier.no_op_notifier = oslo_messaging.notify._impl_noop:NoOpDriver
+    cinder.openstack.common.notifier.rpc_notifier2 = oslo_messaging.notify._impl_messaging:MessagingV2Driver
+    cinder.openstack.common.notifier.rpc_notifier = oslo_messaging.notify._impl_messaging:MessagingDriver
+    cinder.openstack.common.notifier.test_notifier = oslo_messaging.notify._impl_test:TestDriver
 
 cinder.database.migration_backend =
     sqlalchemy = oslo_db.sqlalchemy.migration