Move oslo.messaging to the oslo_messaging namespace

This is the sixth in a series of changes to move to using
the new oslo_<library> namespace that is being used for
oslo libraries.

There is currently a shim in place that is allowing the old
oslo.<library> imports to work, but we need to be prepared for
when the shims go away.  Thus we need patches like this one to
move to the new namespace.

This patch also updates our hacking check to ensure that no
instances of oslo.messaging sneak back in.

Change-Id: Id028f8968717bed49386864081cf150397a6ec5f
Partial-bug: 1409733

diff --git a/cinder/api/contrib/volume_actions.py b/cinder/api/contrib/volume_actions.py
index 93fd046611a70a058f8e97f35c3b47c55406fa92..b3b8a3d9d6e0c8f255207ab52ff568b47664f2de 100644 (file)
--- a/cinder/api/contrib/volume_actions.py
+++ b/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
 

diff --git a/cinder/backup/manager.py b/cinder/backup/manager.py
index 89c1408236403010680b92c894b60c99c2277c5f..f473f6f25756bac74f474881f7dee43abfd38223 100644 (file)
--- a/cinder/backup/manager.py
+++ b/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
 

diff --git a/cinder/backup/rpcapi.py b/cinder/backup/rpcapi.py
index 7f8d807decb2fcb1f019fe991923d054371226ee..6d25bcdadc610a7d60e63df15a5dfd18706478b3 100644 (file)
--- a/cinder/backup/rpcapi.py
+++ b/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

diff --git a/cinder/cmd/manage.py b/cinder/cmd/manage.py
index 6b433471c4391656ecc3cf2bbf4db76a1d612d73..721d5c54adcb115d18718a898c64dfa32afdcfda 100644 (file)
--- a/cinder/cmd/manage.py
+++ b/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

diff --git a/cinder/manager.py b/cinder/manager.py
index 2ebf91e3c0088057b0df7308e3381e77fad20da4..7bd679bb17d6abbc35772e1bdfe2e568cbdca6d3 100644 (file)
--- a/cinder/manager.py
+++ b/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

diff --git a/cinder/rpc.py b/cinder/rpc.py
index 432741a321fa4bbb66fe4dfc44b943b0ad1d7d0a..de8cf135664d97a859a4e4b8292b25d497ea95db 100644 (file)
--- a/cinder/rpc.py
+++ b/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
 

diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py
index 0790bcdbf493e3abf670d77ef65c186d955d4d41..c07a1268af63085f45f7b425c2864579699db771 100644 (file)
--- a/cinder/scheduler/manager.py
+++ b/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
 

diff --git a/cinder/scheduler/rpcapi.py b/cinder/scheduler/rpcapi.py
index bd61dbd4c3a193a42c8eff7079d0b49b320ae9c9..b342ef62fedf363e723d4be3b45c317392f0bcaa 100644 (file)
--- a/cinder/scheduler/rpcapi.py
+++ b/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

diff --git a/cinder/service.py b/cinder/service.py
index 89ece8a328d01531c35cea2f17341bddbbcd483e..4d74db81cd1f875bfb2fb4e6b431ceec207ac3b9 100644 (file)
--- a/cinder/service.py
+++ b/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

diff --git a/cinder/test.py b/cinder/test.py
index ca1fa839429ea4c274b9073b4a623987c42a4c31..0bd74584dc24f5816fd6d8840438f7bc481af1e6 100644 (file)
--- a/cinder/test.py
+++ b/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

diff --git a/cinder/tests/api/contrib/test_volume_actions.py b/cinder/tests/api/contrib/test_volume_actions.py
index 3110681f54d903fe436510a0033fc98be6c3cfdf..0593a5b23aebb1dff65438c31207dd8226a1eff9 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_actions.py
+++ b/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
 

diff --git a/cinder/tests/fake_notifier.py b/cinder/tests/fake_notifier.py
index 19998ebe2d698f38c4f4ba3c81a3f4d7be91685e..f90f7c51babc9676b54c31562631b267160585d7 100644 (file)
--- a/cinder/tests/fake_notifier.py
+++ b/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
 

diff --git a/cinder/tests/test_cmd.py b/cinder/tests/test_cmd.py
index b0abc57f45d52e7564c498b5c4424a0d597d5a24..dda3b076159401198b782f974f02729c3f624e1c 100644 (file)
--- a/cinder/tests/test_cmd.py
+++ b/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')

diff --git a/cinder/tests/test_test.py b/cinder/tests/test_test.py
index 3c53bf4762ff326f5580bd3c90571e252511b1e8..0286edff7e8434ca3e5d9301509035ad8509aa3f 100644 (file)
--- a/cinder/tests/test_test.py
+++ b/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

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 08b6bdf4a7d15a9940b4b3f6d6156ab30d4ba864..b0d97bbcb27d3978223e35b7a99e9ead01b2515a 100644 (file)
--- a/cinder/volume/manager.py
+++ b/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

diff --git a/cinder/volume/rpcapi.py b/cinder/volume/rpcapi.py
index 93cd177e718164c87803b5f5934d0a683f65f9d9..cc22f99fb05b2daf71a1308545973e92a0468c14 100644 (file)
--- a/cinder/volume/rpcapi.py
+++ b/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

diff --git a/setup.cfg b/setup.cfg
index 9c56be70f41c947ee0e9bff811684be393f65cca..f6f0bf6aba9278ff963f6903a49f47959f914ded 100644 (file)
--- a/setup.cfg
+++ b/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