openstack
/
monasca-api
Code Issues Proposed changes

Merge "Change timstamp matching to always use 3 digits"

This commit is contained in:
Jenkins 2015-12-04 19:17:10 +00:00 committed by Gerrit Code Review
parent b71f57313e fbc0f6a245
commit d5738788a3
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -7,6 +7,7 @@ Deklan Dieterly <dieterly@gmail.com>
Derrick Johnson <derrick.johnson@hp.com>
Derrick Johnson <johnson.derrick@gmail.com>
Dexter Fryar <dexter.fryar@outlook.com>
Haiwei Xu <xu-haiwei@mxw.nes.nec.co.jp>
Jeremy Stanley <fungi@yuggoth.org>
Joe Keen <joe.keen@hp.com>
Jonathan Halterman <jhalterman@gmail.com>

11
monasca_tempest_tests/tests/api/helpers.py
View File

@ -108,14 +108,7 @@ def timestamp_to_iso(timestamp):
def timestamp_to_iso_millis(timestamp):
time_utc = datetime.datetime.utcfromtimestamp(timestamp / 1000.0)
time_iso_base = time_utc.strftime("%Y-%m-%dT%H:%M")
time_iso_base = time_utc.strftime("%Y-%m-%dT%H:%M:%S")
time_iso_microsecond = time_utc.strftime(".%f")
time_iso_second = time_utc.strftime("%S")
if float(time_iso_microsecond[0:4]) == 0.0:
time_iso_millisecond = time_utc.strftime("%Y-%m-%dT%H:%M:%S") + 'Z'
else:
millisecond = str(int(time_iso_second[1]) +
float(time_iso_microsecond[0:4]))
time_iso_new = time_iso_base + ':' + time_iso_second[0] + millisecond
time_iso_millisecond = time_iso_new + 'Z'
time_iso_millisecond = time_iso_base + time_iso_microsecond[0:4] + 'Z'
return time_iso_millisecond