From afd4ecfb420bcbf2e13a8808cc4a0092565d823b Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Sun, 5 Mar 2017 17:32:15 -0500
Subject: [PATCH] Remove old messaging notify driver alias
15cd99050c6d2714b90059e0faad9f9e3409eaaa added this alias
to workaround an issue with neutron using the internal
path in liberty. That was fixed in neutron in mitaka:
225663888e71d44e9732951f515da925b8799b74
The alias was left for liberty, but liberty is end of life
now so we can remove this.
Change-Id: I145921b98d48e03df38ebcbaebc1a4375911f9ff
---
oslo_messaging/notify/_impl_messaging.py | 24 ---------------
.../tests/notify/test_impl_messaging.py | 30 -------------------
2 files changed, 54 deletions(-)
delete mode 100644 oslo_messaging/notify/_impl_messaging.py
delete mode 100644 oslo_messaging/tests/notify/test_impl_messaging.py
diff --git a/oslo_messaging/notify/_impl_messaging.py b/oslo_messaging/notify/_impl_messaging.py
deleted file mode 100644
index 9f7c57113..000000000
--- a/oslo_messaging/notify/_impl_messaging.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2015 IBM Corp.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-from debtcollector import removals
-
-from oslo_messaging.notify.messaging import * # noqa
-
-
-# NOTE(mriedem): removal depends on how we can cap requirements in
-# stable/liberty such that neutron does not try to load this
-removals.removed_module(__name__,
- oslo_messaging.notify.messaging.__name__,
- removal_version='?')
diff --git a/oslo_messaging/tests/notify/test_impl_messaging.py b/oslo_messaging/tests/notify/test_impl_messaging.py
deleted file mode 100644
index 351410ad2..000000000
--- a/oslo_messaging/tests/notify/test_impl_messaging.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2015 IBM Corp.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-from six.moves import mock
-
-from oslo_messaging.tests import utils as test_utils
-
-
-class TestDeprecationWarning(test_utils.BaseTestCase):
-
- @mock.patch('warnings.warn')
- def test_impl_messaging_deprecation_warning(self, mock_warn):
- # Tests that we get a deprecation warning when loading a messaging
- # driver out of oslo_messaging.notify._impl_messaging.
- from oslo_messaging.notify import _impl_messaging as messaging
- driver = messaging.MessagingV2Driver( # noqa
- conf={}, topics=['notifications'], transport='rpc')
- # Make sure we got a deprecation warning by loading from the alias
- self.assertEqual(1, mock_warn.call_count)