Merge "event: remove deprecated method"

This commit is contained in:
Zuul 2018-09-19 06:45:48 +00:00 committed by Gerrit Code Review
commit bf4237e5cd
3 changed files with 18 additions and 26 deletions

View File

@ -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())]

View File

@ -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)

View File

@ -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