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

cloudkittyclient/common/utils.py

@@ -23,6 +23,7 @@ import uuid
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
 from oslo_utils import importutils
+from oslo_utils import timeutils
 import prettytable
 import six
 
@@ -31,6 +32,13 @@ from cloudkittyclient import exc
 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):
     module = 'cloudkittyclient.v%s' % version
     if submodule:

cloudkittyclient/v1/report/shell.py

@@ -31,18 +31,18 @@ def do_report_tenant_list(cc, args):
            required=False,
            dest='total_tenant_id')
 @utils.arg('-b', '--begin',
-           help='Begin timestamp',
+           help='Starting date/time (YYYY-MM-DDTHH:MM:SS)',
            required=False)
 @utils.arg('-e', '--end',
-           help='End timestamp',
+           help='Ending date/time (YYYY-MM-DDTHH:MM:SS)',
            required=False)
 @utils.arg('-s', '--service',
            help='Service Type',
            required=False)
 def do_total_get(cc, args):
     """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,
                                  begin=begin,
                                  end=end,