openstack/aodh
Code Issues Proposed changes

Merge "Fixes aggregator transformer timestamp and user input handling"

Browse Source
This commit is contained in:
Jenkins 2014-07-18 21:28:07 +00:00 committed by Gerrit Code Review
commit 5a0f043377
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ceilometer/tests/pipeline_base.py
View File

@ -1205,6 +1205,15 @@ class BasePipelineTestCase(test.BaseTestCase):
self.assertEqual(expected_length, len(publisher.samples)) self.assertEqual(expected_length, len(publisher.samples))
return sorted(publisher.samples, key=lambda s: s.volume) return sorted(publisher.samples, key=lambda s: s.volume)
def test_aggregator_input_validation(self):
aggregator = conversions.AggregatorTransformer("1", "15", None,
None, None)
self.assertEqual(1, aggregator.size)
self.assertEqual(15, aggregator.retention_time)
self.assertRaises(ValueError, conversions.AggregatorTransformer,
"abc", "cde", None, None, None)
def test_aggregator_metadata(self): def test_aggregator_metadata(self):
for conf, expected_version in [('last', '2.0'), ('first', '1.0')]: for conf, expected_version in [('last', '2.0'), ('first', '1.0')]:
samples = self._do_test_aggregator({ samples = self._do_test_aggregator({

7
ceilometer/transformer/conversions.py
View File

@ -188,8 +188,8 @@ class AggregatorTransformer(ScalingTransformer):
**kwargs): **kwargs):
super(AggregatorTransformer, self).__init__(**kwargs) super(AggregatorTransformer, self).__init__(**kwargs)
self.samples = {} self.samples = {}
self.size = size self.size = int(size) if size else None
self.retention_time = retention_time self.retention_time = float(retention_time) if retention_time else None
self.initial_timestamp = None self.initial_timestamp = None
self.aggregated_samples = 0 self.aggregated_samples = 0
@ -225,8 +225,7 @@ class AggregatorTransformer(ScalingTransformer):
def handle_sample(self, context, sample): def handle_sample(self, context, sample):
if not self.initial_timestamp: if not self.initial_timestamp:
self.initial_timestamp = timeutils.parse_strtime( self.initial_timestamp = timeutils.parse_isotime(sample.timestamp)
sample.timestamp)
self.aggregated_samples += 1 self.aggregated_samples += 1
key = self._get_unique_key(sample) key = self._get_unique_key(sample)