x
/
distil
Code Issues Proposed changes

Merge "Ensure using UTC for /quotations"

This commit is contained in:
Jenkins 2017-08-09 05:03:23 +00:00 committed by Gerrit Code Review
parent a8716fb3bc 153986f38a
commit fcbb7add49
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distil/service/api/v2/quotations.py
View File

@ -30,21 +30,21 @@ CONF = cfg.CONF
def get_quotations(project_id, detailed=False):
"""Get real time cost of current month."""
today = date.today()
start = datetime(today.year, today.month, 1)
end = datetime(today.year, today.month, today.day)
# NOTE(flwang): Use UTC time to avoid timezone conflict
end = datetime.utcnow()
start = datetime(end.year, end.month, 1)
region_name = CONF.keystone_authtoken.region_name
project = db_api.project_get(project_id)
LOG.info(
'Get quotations for %s(%s) from %s to %s for current region: %s',
project.id, project.name, start, end, region_name
project.id, project.name, start, end.strftime("%Y-%m-%d"), region_name
)
# Same format with get_invoices output.
output = {
'start': str(start),
'end': str(end),
'end': str(end.strftime("%Y-%m-%d 00:00:00")),
'project_id': project.id,
'project_name': project.name,
}