openstack/python-cloudkittyclient
Code Issues Proposed changes

Merge "Add support for query cost by service"

Browse Source
This commit is contained in:
Jenkins
2016-03-04 11:04:01 +00:00
committed by Gerrit Code Review
parent 778782c3c9 c6e23ab770
commit 5b6fd6c529
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cloudkittyclient/v1/report/__init__.py
View File

@@ -30,7 +30,7 @@ class ReportManager(base.Manager):
def list_tenants(self): def list_tenants(self):
return self.client.get(self.base_url + "/tenants").json() return self.client.get(self.base_url + "/tenants").json()
def get_total(self, tenant_id=None, begin=None, end=None): def get_total(self, tenant_id=None, begin=None, end=None, service=None):
url = self.base_url + "/total" url = self.base_url + "/total"
filters = list() filters = list()
if tenant_id: if tenant_id:
@@ -39,6 +39,8 @@ class ReportManager(base.Manager):
filters.append("begin=%s" % begin.isoformat()) filters.append("begin=%s" % begin.isoformat())
if end: if end:
filters.append("end=%s" % end.isoformat()) filters.append("end=%s" % end.isoformat())
if service:
filters.append("service=%s" % service)
if filters: if filters:
url += "?%s" % ('&'.join(filters)) url += "?%s" % ('&'.join(filters))
return self.client.get(url).json() return self.client.get(url).json()

6
cloudkittyclient/v1/report/shell.py
View File

@@ -36,11 +36,15 @@ def do_report_tenant_list(cc, args):
@utils.arg('-e', '--end', @utils.arg('-e', '--end',
help='End timestamp', help='End timestamp',
required=False) required=False)
@utils.arg('-s', '--service',
help='Service Type',
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.ts2dt(args.begin) if args.begin else None
end = utils.ts2dt(args.end) if args.end else None end = utils.ts2dt(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,
service=args.service)
utils.print_dict({'Total': total or 0.0}) utils.print_dict({'Total': total or 0.0})