From 5c7b4abe1bf40fe4162477b5eaf8acb237c0d0d6 Mon Sep 17 00:00:00 2001
From: Ryan Brandt <ryan.brandt@hp.com>
Date: Wed, 25 Nov 2015 17:05:08 -0700
Subject: [PATCH] Always return 3 decimal places in measurement timestamp

Change-Id: I706dd21e7a275c37508d915e7dfb596324d20c95
---
 AUTHORS                                             |  1 +
 .../repositories/influxdb/metrics_repository.py     |  4 +++-
 monasca_api/tests/test_repositories.py              | 13 ++++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d7a06e386..a67ae0fb4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ Ryan Bak <ryan.bak@twcable.com>
 Ryan Brandt <ryan.brandt@hp.com>
 SamKirsch10 <sam.kirsch@hp.com>
 Shinya Kawabata <s-kawabata@wx.jp.nec.com>
+Srinivas Sakhamuri <srini.openstack@gmail.com>
 Thomas Graichen <thomas.graichen@sap.com>
 Tim Kuhlman <tim.kuhlman@hp.com>
 Tomasz Trębski <tomasz.trebski@ts.fujitsu.com>
diff --git a/monasca_api/common/repositories/influxdb/metrics_repository.py b/monasca_api/common/repositories/influxdb/metrics_repository.py
index 13b279cbe..bc677aef6 100644
--- a/monasca_api/common/repositories/influxdb/metrics_repository.py
+++ b/monasca_api/common/repositories/influxdb/metrics_repository.py
@@ -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])
 
diff --git a/monasca_api/tests/test_repositories.py b/monasca_api/tests/test_repositories.py
index e18536f9d..c3a9fdb42 100644
--- a/monasca_api/tests/test_repositories.py
+++ b/monasca_api/tests/test_repositories.py
@@ -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
         )