From 965aca8a374ad36d2661b28cd6aec25e7d0e04d3 Mon Sep 17 00:00:00 2001 From: gordon chung Date: Wed, 24 Jun 2015 16:10:12 -0400 Subject: [PATCH] remove unused notifier there's a notifier in our code. it doesn't seem to be connected to anything and is not accessible via setup.cfg. this appears to be residual workaround from pre-oslo.messaging days Change-Id: I50c8e97219da387362aef9d1ef4c53aea0c27142 --- ceilometer/notifier.py | 68 ------------------------- ceilometer/tests/test_notifier.py | 85 ------------------------------- tox.ini | 1 - 3 files changed, 154 deletions(-) delete mode 100644 ceilometer/notifier.py delete mode 100644 ceilometer/tests/test_notifier.py diff --git a/ceilometer/notifier.py b/ceilometer/notifier.py deleted file mode 100644 index f3240688..00000000 --- a/ceilometer/notifier.py +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright 2013 eNovance -# -# 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 oslo_context import context as req_context -from oslo_log import log as logging -from stevedore import extension - -from ceilometer.i18n import _ -from ceilometer import pipeline - - -LOG = logging.getLogger(__name__) - - -_notification_manager = None -_pipeline_manager = None - - -def _load_notification_manager(): - global _notification_manager, _pipeline_manager - - namespace = 'ceilometer.notification' - - LOG.debug(_('loading notification handlers from %s'), namespace) - - _notification_manager = extension.ExtensionManager( - namespace=namespace, - invoke_on_load=True, - invoke_args=(_pipeline_manager, ) - ) - - if not list(_notification_manager): - LOG.warning(_('Failed to load any notification handlers for %s'), - namespace) - - -def _load_pipeline_manager(): - global _pipeline_manager - - _pipeline_manager = pipeline.setup_pipeline( - extension.ExtensionManager( - 'ceilometer.transformer', - ), - ) - - -def notify(context, message): - """Sends a notification as a meter using Ceilometer pipelines.""" - if not _pipeline_manager: - _load_pipeline_manager() - if not _notification_manager: - _load_notification_manager() - _notification_manager.map_method( - 'to_samples_and_publish', - context=context or req_context.get_admin_context(), - notification=message) diff --git a/ceilometer/tests/test_notifier.py b/ceilometer/tests/test_notifier.py deleted file mode 100644 index fb40ec84..00000000 --- a/ceilometer/tests/test_notifier.py +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright 2013 eNovance -# -# 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. -"""Tests for ceilometer/notifier.py -""" -from oslotest import base -from stevedore import extension - -from ceilometer import notifier -from ceilometer import pipeline - - -MESSAGE = { - u'event_type': u'compute.instance.create.end', - u'message_id': u'dae6f69c-00e0-41c0-b371-41ec3b7f4451', - u'payload': {u'created_at': u'2012-05-08 20:23:41', - u'deleted_at': u'', - u'disk_gb': 0, - u'display_name': u'testme', - u'fixed_ips': [{u'address': u'10.0.0.2', - u'floating_ips': [], - u'meta': {}, - u'type': u'fixed', - u'version': 4}], - u'image_ref_url': u'http://10.0.2.15:9292/images/UUID', - u'instance_id': u'9f9d01b9-4a58-4271-9e27-398b21ab20d1', - u'instance_type': u'm1.tiny', - u'instance_type_id': 2, - u'launched_at': u'2012-05-08 20:23:47.985999', - u'memory_mb': 512, - u'state': u'active', - u'state_description': u'', - u'tenant_id': u'7c150a59fe714e6f9263774af9688f0e', - u'user_id': u'1e3ce043029547f1a61c1996d1a531a2', - u'reservation_id': u'1e3ce043029547f1a61c1996d1a531a3', - u'vcpus': 1, - u'root_gb': 0, - u'ephemeral_gb': 0, - u'host': u'compute-host-name', - u'availability_zone': u'1e3ce043029547f1a61c1996d1a531a4', - u'os_type': u'linux?', - u'architecture': u'x86', - u'image_ref': u'UUID', - u'kernel_id': u'1e3ce043029547f1a61c1996d1a531a5', - u'ramdisk_id': u'1e3ce043029547f1a61c1996d1a531a6', - }, - u'priority': u'INFO', - u'publisher_id': u'compute.vagrant-precise', - u'timestamp': u'2012-05-08 20:23:48.028195', -} - - -class TestNotifier(base.BaseTestCase): - - def test_process_notification(self): - transformer_manager = extension.ExtensionManager( - 'ceilometer.transformer', - ) - notifier._pipeline_manager = pipeline.PipelineManager( - [{ - 'name': "test_pipeline", - 'interval': 60, - 'counters': ['*'], - 'transformers': [], - 'publishers': ["test"], - }], - transformer_manager) - - pub = notifier._pipeline_manager.pipelines[0].publishers[0] - self.assertEqual(0, len(pub.samples)) - notifier.notify(None, MESSAGE) - self.assertTrue(len(pub.samples) > 0) - self.assertIn('disk.ephemeral.size', - [c.name for c in pub.samples]) diff --git a/tox.ini b/tox.ini index b50bc829..12bb4e35 100644 --- a/tox.ini +++ b/tox.ini @@ -88,7 +88,6 @@ commands = python -m testtools.run \ ceilometer.tests.test_middleware \ ceilometer.tests.test_neutronclient \ ceilometer.tests.test_notification \ - ceilometer.tests.test_notifier \ ceilometer.tests.test_novaclient \ ceilometer.tests.test_sample \ ceilometer.tests.test_utils \