Change the time args format from timestamp to date/time when total-get

The begin and end args format is timestamp in total-get command, which
is less convenient than date/time format(YYYY-MM-DDTHH:MM:SS). So this
patch make it easy to use.

Change-Id: Id83e132e6b8a090d1abfa3002d53de1b678fc9f2
This commit is contained in:
zhangguoqing
2016-11-24 14:53:06 +00:00
parent 9a9399f284
commit 708aeff9b7
2 changed files with 12 additions and 4 deletions

View File

@@ -23,6 +23,7 @@ import uuid
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import encodeutils from oslo_utils import encodeutils
from oslo_utils import importutils from oslo_utils import importutils
from oslo_utils import timeutils
import prettytable import prettytable
import six import six
@@ -31,6 +32,13 @@ from cloudkittyclient import exc
from cloudkittyclient.i18n import _ from cloudkittyclient.i18n import _
def iso2dt(iso_date):
"""iso8601 format to datetime."""
iso_dt = timeutils.parse_isotime(iso_date)
trans_dt = timeutils.normalize_time(iso_dt)
return trans_dt
def import_versioned_module(version, submodule=None): def import_versioned_module(version, submodule=None):
module = 'cloudkittyclient.v%s' % version module = 'cloudkittyclient.v%s' % version
if submodule: if submodule:

View File

@@ -31,18 +31,18 @@ def do_report_tenant_list(cc, args):
required=False, required=False,
dest='total_tenant_id') dest='total_tenant_id')
@utils.arg('-b', '--begin', @utils.arg('-b', '--begin',
help='Begin timestamp', help='Starting date/time (YYYY-MM-DDTHH:MM:SS)',
required=False) required=False)
@utils.arg('-e', '--end', @utils.arg('-e', '--end',
help='End timestamp', help='Ending date/time (YYYY-MM-DDTHH:MM:SS)',
required=False) required=False)
@utils.arg('-s', '--service', @utils.arg('-s', '--service',
help='Service Type', help='Service Type',
required=False) required=False)
def do_total_get(cc, args): def do_total_get(cc, args):
"""Get total reports.""" """Get total reports."""
begin = utils.ts2dt(args.begin) if args.begin else None begin = utils.iso2dt(args.begin) if args.begin else None
end = utils.ts2dt(args.end) if args.end else None end = utils.iso2dt(args.end) if args.end else None
total = cc.reports.get_total(tenant_id=args.total_tenant_id, total = cc.reports.get_total(tenant_id=args.total_tenant_id,
begin=begin, begin=begin,
end=end, end=end,