Merge "Remove deprecated Grizzly features"

3 files changed, 2 insertions, 35 deletions

diff --git a/openstack/common/notifier/api.py b/openstack/common/notifier/api.py
index 0b18df6..13ac394 100644
--- a/openstack/common/notifier/api.py
+++ b/openstack/common/notifier/api.py
@@ -30,7 +30,6 @@ LOG = logging.getLogger(__name__)
 notifier_opts = [
     cfg.MultiStrOpt('notification_driver',
                     default=[],
-                    deprecated_name='list_notifier_drivers',
                     help='Driver or drivers to handle sending notifications'),
     cfg.StrOpt('default_notification_level',
                default='INFO',
diff --git a/openstack/common/notifier/rabbit_notifier.py b/openstack/common/notifier/rabbit_notifier.py
deleted file mode 100644
index 56a37e4..0000000
--- a/openstack/common/notifier/rabbit_notifier.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# All Rights Reserved.
-#
-#    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 openstack.common.gettextutils import _
-from openstack.common import log as logging
-from openstack.common.notifier import rpc_notifier
-
-LOG = logging.getLogger(__name__)
-
-
-def notify(context, message):
-    """Deprecated in Grizzly. Please use rpc_notifier instead."""
-
-    LOG.deprecated(_("The rabbit_notifier is now deprecated."
-                     " Please use rpc_notifier instead."))
-    rpc_notifier.notify(context, message)
diff --git a/tests/unit/test_notifier.py b/tests/unit/test_notifier.py
index f2aa3a0..90d811f 100644
--- a/tests/unit/test_notifier.py
+++ b/tests/unit/test_notifier.py
@@ -88,9 +88,6 @@ class NotifierTestCase(test_utils.BaseTestCase):
         self.assertEqual(self.mock_notify, True)
         self.assertEqual(self.envelope, envelope)
 
-    def test_rabbit_notifier(self):
-        self._test_rpc_notify('openstack.common.notifier.rabbit_notifier')
-
     def test_rpc_notifier(self):
         self._test_rpc_notify('openstack.common.notifier.rpc_notifier')
 
@@ -102,9 +99,9 @@ class NotifierTestCase(test_utils.BaseTestCase):
                           notifier_api.notify, ctxt, 'publisher_id',
                           'event_type', 'not a priority', dict(a=3))
 
-    def test_rabbit_priority_queue(self):
+    def test_rpc_priority_queue(self):
         self.stubs.Set(cfg.CONF, 'notification_driver',
-                       ['openstack.common.notifier.rabbit_notifier'])
+                       ['openstack.common.notifier.rpc_notifier'])
         self.stubs.Set(cfg.CONF, 'notification_topics',
                        ['testnotify', ])