openstack
/
cloudkitty
Code Issues Proposed changes

Merge "Pass project_id in dimensions rather than query parameter"

This commit is contained in:
Zuul 2018-02-09 08:55:45 +00:00 committed by Gerrit Code Review
parent 16e26151aa dc1249a462
commit dfb5d048ad
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cloudkitty/collector/monasca.py
View File

@ -249,14 +249,11 @@ class MonascaCollector(collector.BaseCollector):
if not meter:
return {}
dimensions = {}
dimensions.update(kwargs)
if project_id:
resources = self._conn.metrics.list(name=meter,
tenant_id=project_id,
**dimensions)
else:
resources = self._conn.metrics.list(name=meter,
**dimensions)
dimensions['project_id'] = project_id
dimensions.update(kwargs)
resources = self._conn.metrics.list(name=meter,
**dimensions)
resource_ids = []
for resource in resources:
try: