openstack/monasca-api
Code Issues Proposed changes

Merge "Always return 3 decimal places in measurement timestamp"

Browse Source
This commit is contained in:
Jenkins
2015-12-04 00:43:36 +00:00
committed by Gerrit Code Review
parent 4948269742 5c7b4abe1b
commit 3490f8443c
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
monasca_api/common/repositories/influxdb/metrics_repository.py
View File

@@ -276,7 +276,9 @@ class MetricsRepository(metrics_repository.MetricsRepository):
measurements_list = []
for point in serie['values']:
value_meta = json.loads(point[2]) if point[2] else {}
measurements_list.append([point[0],
timestamp = point[0][:19] + '.' + point[0][20:-1].ljust(3, '0') + 'Z'
measurements_list.append([timestamp,
point[1],
value_meta])

13
monasca_api/tests/test_repositories.py
View File

@@ -35,10 +35,10 @@ class TestRepoMetricsInfluxDB(unittest.TestCase):
{
"name": "dummy.series",
"values": [
[1, 2, None],
[2, 2.5, ''],
[3, 4.0, '{}'],
[4, 4, '{"key": "value"}']
["2015-03-14T09:26:53.59Z", 2, None],
["2015-03-14T09:26:53.591Z", 2.5, ''],
["2015-03-14T09:26:53.6Z", 4.0, '{}'],
["2015-03-14T09:26:54Z", 4, '{"key": "value"}']
]
}
]
@@ -65,7 +65,10 @@ class TestRepoMetricsInfluxDB(unittest.TestCase):
measurements = result[0]['measurements']
self.assertEqual(
[[1, 2, {}], [2, 2.5, {}], [3, 4.0, {}], [4, 4, {"key": "value"}]],
[["2015-03-14T09:26:53.590Z", 2, {}],
["2015-03-14T09:26:53.591Z", 2.5, {}],
["2015-03-14T09:26:53.600Z", 4.0, {}],
["2015-03-14T09:26:54.000Z", 4, {"key": "value"}]],
measurements
)