From 3d0b48133984d35a6a07c5e9963792faf961cc72 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 18 Sep 2018 11:09:06 +0200 Subject: [PATCH] event: remove deprecated method Change-Id: Iadda5e51d61c44c4dd11d7fc82bc7938f74baa5c --- ceilometer/event/trait_plugins.py | 19 +++++---------- .../tests/unit/meter/test_meter_plugins.py | 24 +++++++++---------- requirements.txt | 1 - 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/ceilometer/event/trait_plugins.py b/ceilometer/event/trait_plugins.py index 3dac17667e..6961ea9301 100644 --- a/ceilometer/event/trait_plugins.py +++ b/ceilometer/event/trait_plugins.py @@ -15,7 +15,6 @@ import abc -from debtcollector import moves from oslo_log import log from oslo_utils import timeutils import six @@ -49,10 +48,7 @@ class TraitPluginBase(object): """ super(TraitPluginBase, self).__init__() - @moves.moved_method('trait_values', version=6.0, removal_version="?") - def trait_value(self, match_list): - pass - + @abc.abstractmethod def trait_values(self, match_list): """Convert a set of fields to one or multiple Trait values. @@ -99,15 +95,12 @@ class TraitPluginBase(object): def __init__(self, **kw): super(DefaultPlugin, self).__init__() - def trait_value(self, match_list): + def trait_values(self, match_list): if not match_list: return None return [ match[1] for match in match_list] """ - # For backwards compatibility for the renamed method. - return [self.trait_value(match_list)] - class SplitterTraitPlugin(TraitPluginBase): """Plugin that splits a piece off of a string value.""" @@ -209,11 +202,11 @@ class TimedeltaPlugin(TraitPluginBase): # TODO(idegtiarov): refactor code to have meter_plugins separate from # trait_plugins - def trait_value(self, match_list): + def trait_values(self, match_list): if len(match_list) != 2: LOG.warning('Timedelta plugin is required two timestamp fields' ' to create timedelta value.') - return + return [None] start, end = match_list try: start_time = timeutils.parse_isotime(start[1]) @@ -224,5 +217,5 @@ class TimedeltaPlugin(TraitPluginBase): '%(err)s' % dict(start=start[0], end=end[0], err=err) ) - return - return abs((end_time - start_time).total_seconds()) + return [None] + return [abs((end_time - start_time).total_seconds())] diff --git a/ceilometer/tests/unit/meter/test_meter_plugins.py b/ceilometer/tests/unit/meter/test_meter_plugins.py index 4d8d04d9be..d91b49061c 100644 --- a/ceilometer/tests/unit/meter/test_meter_plugins.py +++ b/ceilometer/tests/unit/meter/test_meter_plugins.py @@ -27,13 +27,13 @@ class TestTimedeltaPlugin(base.BaseTestCase): def test_timedelta_transformation(self): match_list = [('test.timestamp1', '2016-03-02T15:04:32'), ('test.timestamp2', '2016-03-02T16:04:32')] - value = self.plugin.trait_value(match_list) - self.assertEqual(3600, value) + value = self.plugin.trait_values(match_list) + self.assertEqual([3600], value) def test_timedelta_missing_field(self): match_list = [('test.timestamp1', '2016-03-02T15:04:32')] - with mock.patch('%s.LOG' % self.plugin.trait_value.__module__) as log: - self.assertIsNone(self.plugin.trait_value(match_list)) + with mock.patch('%s.LOG' % self.plugin.trait_values.__module__) as log: + self.assertEqual([None], self.plugin.trait_values(match_list)) log.warning.assert_called_once_with( 'Timedelta plugin is required two timestamp fields to create ' 'timedelta value.') @@ -42,8 +42,8 @@ class TestTimedeltaPlugin(base.BaseTestCase): match_list = [('test.timestamp1', '2016-03-02T15:04:32'), ('test.timestamp2', '2016-03-02T16:04:32'), ('test.timestamp3', '2016-03-02T16:10:32')] - with mock.patch('%s.LOG' % self.plugin.trait_value.__module__) as log: - self.assertIsNone(self.plugin.trait_value(match_list)) + with mock.patch('%s.LOG' % self.plugin.trait_values.__module__) as log: + self.assertEqual([None], self.plugin.trait_values(match_list)) log.warning.assert_called_once_with( 'Timedelta plugin is required two timestamp fields to create ' 'timedelta value.') @@ -51,8 +51,8 @@ class TestTimedeltaPlugin(base.BaseTestCase): def test_timedelta_invalid_timestamp(self): match_list = [('test.timestamp1', '2016-03-02T15:04:32'), ('test.timestamp2', '2016-03-02T15:004:32')] - with mock.patch('%s.LOG' % self.plugin.trait_value.__module__) as log: - self.assertIsNone(self.plugin.trait_value(match_list)) + with mock.patch('%s.LOG' % self.plugin.trait_values.__module__) as log: + self.assertEqual([None], self.plugin.trait_values(match_list)) msg = log.warning._mock_call_args[0][0] self.assertTrue(msg.startswith('Failed to parse date from set ' 'fields, both fields ') @@ -61,11 +61,11 @@ class TestTimedeltaPlugin(base.BaseTestCase): def test_timedelta_reverse_timestamp_order(self): match_list = [('test.timestamp1', '2016-03-02T15:15:32'), ('test.timestamp2', '2016-03-02T15:10:32')] - value = self.plugin.trait_value(match_list) - self.assertEqual(300, value) + value = self.plugin.trait_values(match_list) + self.assertEqual([300], value) def test_timedelta_precise_difference(self): match_list = [('test.timestamp1', '2016-03-02T15:10:32.786893'), ('test.timestamp2', '2016-03-02T15:10:32.786899')] - value = self.plugin.trait_value(match_list) - self.assertEqual(0.000006, value) + value = self.plugin.trait_values(match_list) + self.assertEqual([0.000006], value) diff --git a/requirements.txt b/requirements.txt index d730da3f47..0315698208 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,6 @@ cachetools>=1.1.0 # MIT License cotyledon>=1.3.0 #Apache-2.0 futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD futurist>=0.11.0 # Apache-2.0 -debtcollector>=1.2.0 # Apache-2.0 jsonpath-rw-ext>=0.1.9 # Apache-2.0 lxml>=2.3 # BSD monotonic