openstack
/
gnocchi
Code Issues Proposed changes

Merge "Pass aggregation when create AggregatedTimeSerie"

This commit is contained in:
Jenkins 2016-03-04 19:30:24 +00:00 committed by Gerrit Code Review
parent eb1ff24688 2326282068
commit fab85e79e4
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnocchi/storage/_carbonara.py
View File

@ -195,6 +195,7 @@ class CarbonaraBasedStorage(storage.StorageDriver):
return carbonara.AggregatedTimeSerie.from_timeseries(
timeseries,
aggregation_method=aggregation,
sampling=granularity,
max_size=points)

37
gnocchi/tests/test_storage.py
View File

@ -163,6 +163,43 @@ class TestStorageDriver(tests_base.TestCase):
(utils.datetime_utc(2015, 1, 1, 12), 300.0, 69),
], self.storage.get_measures(self.metric))
def test_updated_measures(self):
self.storage.add_measures(self.metric, [
storage.Measure(datetime.datetime(2014, 1, 1, 12, 0, 1), 69),
storage.Measure(datetime.datetime(2014, 1, 1, 12, 7, 31), 42),
])
self.storage.process_background_tasks(self.index, sync=True)
self.storage.add_measures(self.metric, [
storage.Measure(datetime.datetime(2014, 1, 1, 12, 9, 31), 4),
storage.Measure(datetime.datetime(2014, 1, 1, 12, 12, 45), 44),
])
self.storage.process_background_tasks(self.index, sync=True)
self.assertEqual([
(utils.datetime_utc(2014, 1, 1), 86400.0, 39.75),
(utils.datetime_utc(2014, 1, 1, 12), 3600.0, 39.75),
(utils.datetime_utc(2014, 1, 1, 12), 300.0, 69.0),
(utils.datetime_utc(2014, 1, 1, 12, 5), 300.0, 23.0),
(utils.datetime_utc(2014, 1, 1, 12, 10), 300.0, 44.0),
], self.storage.get_measures(self.metric))
self.assertEqual([
(utils.datetime_utc(2014, 1, 1), 86400.0, 69),
(utils.datetime_utc(2014, 1, 1, 12), 3600.0, 69.0),
(utils.datetime_utc(2014, 1, 1, 12), 300.0, 69.0),
(utils.datetime_utc(2014, 1, 1, 12, 5), 300.0, 42.0),
(utils.datetime_utc(2014, 1, 1, 12, 10), 300.0, 44.0),
], self.storage.get_measures(self.metric, aggregation='max'))
self.assertEqual([
(utils.datetime_utc(2014, 1, 1), 86400.0, 4),
(utils.datetime_utc(2014, 1, 1, 12), 3600.0, 4),
(utils.datetime_utc(2014, 1, 1, 12), 300.0, 69.0),
(utils.datetime_utc(2014, 1, 1, 12, 5), 300.0, 4.0),
(utils.datetime_utc(2014, 1, 1, 12, 10), 300.0, 44.0),
], self.storage.get_measures(self.metric, aggregation='min'))
def test_add_and_get_measures(self):
self.storage.add_measures(self.metric, [
storage.Measure(datetime.datetime(2014, 1, 1, 12, 0, 1), 69),