openstack/python-cloudkittyclient
Code Issues Proposed changes

Fixed bug with report total

Browse Source 
The tenant filter was always sent even if not tenant filtering was used
for total retrieving.

Change-Id: I55565a30389b94f559e16d349d6aa3ef56053ea2
Closes-Bug: #1516484
This commit is contained in:
Stéphane Albert
2015-11-16 16:22:00 +01:00
parent 9428ab38aa
commit def167f77a
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,11 +30,15 @@ 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, begin=None, end=None): def get_total(self, tenant_id=None, begin=None, end=None):
url = self.base_url + "/total?tenant_id=%s" % tenant_id url = self.base_url + "/total"
filter = [url] filters = list()
if tenant_id:
filters.append("tenant_id=%s" % tenant_id)
if begin: if begin:
filter.append("begin=%s" % begin.isoformat()) filters.append("begin=%s" % begin.isoformat())
if end: if end:
filter.append("end=%s" % end.isoformat()) filters.append("end=%s" % end.isoformat())
return self.client.get("&".join(filter)).json() if filters:
url += "?%s" % ('&'.join(filters))
return self.client.get(url).json()

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

@@ -13,6 +13,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from __future__ import print_function
from cloudkittyclient.common import utils from cloudkittyclient.common import utils
@@ -26,7 +27,8 @@ def do_report_tenant_list(cc, args):
@utils.arg('-t', '--tenant-id', @utils.arg('-t', '--tenant-id',
help='Tenant id', help='Tenant id',
required=False, dest='total_tenant_id') required=False,
dest='total_tenant_id')
@utils.arg('-b', '--begin', @utils.arg('-b', '--begin',
help='Begin timestamp', help='Begin timestamp',
required=False) required=False)
@@ -36,7 +38,7 @@ def do_report_tenant_list(cc, args):
def do_total_get(cc, args): def do_total_get(cc, args):
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(args.total_tenant_id, total = cc.reports.get_total(tenant_id=args.total_tenant_id,
begin=begin, begin=begin,
end=end) end=end)
utils.print_dict({'Total': total or 0.0}) utils.print_dict({'Total': total or 0.0})