From 2f89f741cbb6c2d455b0542db6407d8d1246d178 Mon Sep 17 00:00:00 2001 From: LiuSheng Date: Mon, 22 Jun 2015 20:48:20 +0800 Subject: [PATCH] Remove unnecessary wrapping of transformer ExtentionManager Currently, the TransformerExtensionManager is used to wrap the ExtentionManager of stevedore.extension just to provide getting extension by name functionality, this is naturally supported by stevedore. This change remove the unnecessary code. Change-Id: I0b7bfa40e4131236b4adedc8b4bdcd70c14d5680 --- ceilometer/cmd/eventlet/sample.py | 7 ++----- ceilometer/notifier.py | 3 +-- ceilometer/pipeline.py | 7 ++++--- ceilometer/tests/agent/agentbase.py | 3 +-- ceilometer/tests/pipeline_base.py | 12 +++--------- ceilometer/tests/test_notifier.py | 4 ++-- ceilometer/transformer/__init__.py | 16 ---------------- 7 files changed, 13 insertions(+), 39 deletions(-) diff --git a/ceilometer/cmd/eventlet/sample.py b/ceilometer/cmd/eventlet/sample.py index c08212e61a..6f5794a74f 100644 --- a/ceilometer/cmd/eventlet/sample.py +++ b/ceilometer/cmd/eventlet/sample.py @@ -23,11 +23,11 @@ import sys from oslo_config import cfg from oslo_context import context from oslo_utils import timeutils +from stevedore import extension from ceilometer import pipeline from ceilometer import sample from ceilometer import service -from ceilometer import transformer def send_sample(): @@ -79,10 +79,7 @@ def send_sample(): root_logger.setLevel(logging.DEBUG) pipeline_manager = pipeline.setup_pipeline( - transformer.TransformerExtensionManager( - 'ceilometer.transformer', - ), - ) + extension.ExtensionManager('ceilometer.transformer')) with pipeline_manager.publisher(context.get_admin_context()) as p: p([sample.Sample( diff --git a/ceilometer/notifier.py b/ceilometer/notifier.py index 3490fcc6e9..f32406888b 100644 --- a/ceilometer/notifier.py +++ b/ceilometer/notifier.py @@ -19,7 +19,6 @@ from stevedore import extension from ceilometer.i18n import _ from ceilometer import pipeline -from ceilometer import transformer LOG = logging.getLogger(__name__) @@ -51,7 +50,7 @@ def _load_pipeline_manager(): global _pipeline_manager _pipeline_manager = pipeline.setup_pipeline( - transformer.TransformerExtensionManager( + extension.ExtensionManager( 'ceilometer.transformer', ), ) diff --git a/ceilometer/pipeline.py b/ceilometer/pipeline.py index 9026dfedd4..0b4bf82a65 100644 --- a/ceilometer/pipeline.py +++ b/ceilometer/pipeline.py @@ -25,14 +25,15 @@ from oslo_config import cfg from oslo_log import log from oslo_utils import timeutils import six +from stevedore import extension import yaml + from ceilometer.event.storage import models from ceilometer.i18n import _ from ceilometer import publisher from ceilometer.publisher import utils as publisher_utils from ceilometer import sample as sample_util -from ceilometer import transformer as xformer OPTS = [ @@ -376,7 +377,7 @@ class Sink(object): for transformer in self.transformer_cfg: parameter = transformer['parameters'] or {} try: - ext = transformer_manager.get_ext(transformer['name']) + ext = transformer_manager[transformer['name']] except KeyError: raise PipelineException( "No transformer named %s loaded" % transformer['name'], @@ -732,7 +733,7 @@ def _setup_pipeline_manager(cfg_file, transformer_manager, p_type=SAMPLE_TYPE): return PipelineManager(pipeline_cfg, transformer_manager or - xformer.TransformerExtensionManager( + extension.ExtensionManager( 'ceilometer.transformer', ), p_type) diff --git a/ceilometer/tests/agent/agentbase.py b/ceilometer/tests/agent/agentbase.py index 51217b1dfa..ce0face9c8 100644 --- a/ceilometer/tests/agent/agentbase.py +++ b/ceilometer/tests/agent/agentbase.py @@ -37,7 +37,6 @@ from ceilometer import publisher from ceilometer.publisher import test as test_publisher from ceilometer import sample from ceilometer.tests import base -from ceilometer import transformer from ceilometer import utils @@ -173,7 +172,7 @@ class BaseAgentManagerTestCase(base.BaseTestCase): params = [] def setup_pipeline(self): - self.transformer_manager = transformer.TransformerExtensionManager( + self.transformer_manager = extension.ExtensionManager( 'ceilometer.transformer', ) self.mgr.pipeline_manager = pipeline.PipelineManager( diff --git a/ceilometer/tests/pipeline_base.py b/ceilometer/tests/pipeline_base.py index 2e06dd4e8d..9f05ae7882 100644 --- a/ceilometer/tests/pipeline_base.py +++ b/ceilometer/tests/pipeline_base.py @@ -138,18 +138,12 @@ class BasePipelineTestCase(base.BaseTestCase): resource_metadata={} ) - self.useFixture(mockpatch.PatchObject( - transformer.TransformerExtensionManager, "__init__", - side_effect=self.fake_tem_init)) - - self.useFixture(mockpatch.PatchObject( - transformer.TransformerExtensionManager, "get_ext", - side_effect=self.fake_tem_get_ext)) - self.useFixture(mockpatch.PatchObject( publisher, 'get_publisher', side_effect=self.get_publisher)) - self.transformer_manager = transformer.TransformerExtensionManager() + self.transformer_manager = mock.MagicMock() + self.transformer_manager.__getitem__.side_effect = \ + self.fake_tem_get_ext self._setup_pipeline_cfg() diff --git a/ceilometer/tests/test_notifier.py b/ceilometer/tests/test_notifier.py index 0ccdb8ab99..fb40ec846f 100644 --- a/ceilometer/tests/test_notifier.py +++ b/ceilometer/tests/test_notifier.py @@ -15,10 +15,10 @@ """Tests for ceilometer/notifier.py """ from oslotest import base +from stevedore import extension from ceilometer import notifier from ceilometer import pipeline -from ceilometer import transformer MESSAGE = { @@ -64,7 +64,7 @@ MESSAGE = { class TestNotifier(base.BaseTestCase): def test_process_notification(self): - transformer_manager = transformer.TransformerExtensionManager( + transformer_manager = extension.ExtensionManager( 'ceilometer.transformer', ) notifier._pipeline_manager = pipeline.PipelineManager( diff --git a/ceilometer/transformer/__init__.py b/ceilometer/transformer/__init__.py index 3df6d7f3bc..c3124c2ed3 100644 --- a/ceilometer/transformer/__init__.py +++ b/ceilometer/transformer/__init__.py @@ -17,22 +17,6 @@ import abc import collections import six -from stevedore import extension - - -class TransformerExtensionManager(extension.ExtensionManager): - - def __init__(self, namespace): - super(TransformerExtensionManager, self).__init__( - namespace=namespace, - invoke_on_load=False, - invoke_args=(), - invoke_kwds={} - ) - self.by_name = dict((e.name, e) for e in self.extensions) - - def get_ext(self, name): - return self.by_name[name] @six.add_metaclass(abc.ABCMeta)