From 00cb3734aed8236c03f067aae9c72616001d89f6 Mon Sep 17 00:00:00 2001 From: "Jay S. Bryant" Date: Mon, 2 Mar 2015 21:31:46 -0600 Subject: [PATCH] Move oslo.messaging to the oslo_messaging namespace This is the sixth in a series of changes to move to using the new oslo_ namespace that is being used for oslo libraries. There is currently a shim in place that is allowing the old oslo. 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 --- cinder/api/contrib/volume_actions.py | 2 +- cinder/backup/manager.py | 2 +- cinder/backup/rpcapi.py | 2 +- cinder/cmd/manage.py | 2 +- cinder/manager.py | 2 +- cinder/rpc.py | 2 +- cinder/scheduler/manager.py | 2 +- cinder/scheduler/rpcapi.py | 2 +- cinder/service.py | 2 +- cinder/test.py | 2 +- cinder/tests/api/contrib/test_volume_actions.py | 2 +- cinder/tests/fake_notifier.py | 2 +- cinder/tests/test_cmd.py | 2 +- cinder/tests/test_test.py | 2 +- cinder/volume/manager.py | 2 +- cinder/volume/rpcapi.py | 2 +- setup.cfg | 12 ++++++------ 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cinder/api/contrib/volume_actions.py b/cinder/api/contrib/volume_actions.py index 93fd046611a..b3b8a3d9d6e 100644 --- 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 89c14082364..f473f6f2575 100644 --- 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 7f8d807decb..6d25bcdadc6 100644 --- 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 6b433471c43..721d5c54adc 100644 --- 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 2ebf91e3c00..7bd679bb17d 100644 --- 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 432741a321f..de8cf135664 100644 --- 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 0790bcdbf49..c07a1268af6 100644 --- 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 bd61dbd4c3a..b342ef62fed 100644 --- 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 89ece8a328d..4d74db81cd1 100644 --- 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 ca1fa839429..0bd74584dc2 100644 --- 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 3110681f54d..0593a5b23ae 100644 --- 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 19998ebe2d6..f90f7c51bab 100644 --- 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 b0abc57f45d..dda3b076159 100644 --- 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 3c53bf4762f..0286edff7e8 100644 --- 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 08b6bdf4a7d..b0d97bbcb27 100644 --- 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 93cd177e718..cc22f99fb05 100644 --- 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 9c56be70f41..f6f0bf6aba9 100644 --- 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