From dc1249a462f131b65d416c552fd6b69fdb4b37bb Mon Sep 17 00:00:00 2001 From: Luka Peschke Date: Thu, 8 Feb 2018 17:44:32 +0100 Subject: [PATCH] Pass project_id in dimensions rather than query parameter This changes resource_id to a resource dimension rather than a function parameter in monasca collector. Change-Id: I57e0cecf71743d4c7d66b5210fe831c676d195e1 --- cloudkitty/collector/monasca.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cloudkitty/collector/monasca.py b/cloudkitty/collector/monasca.py index 89533dbf..6c77960d 100644 --- a/cloudkitty/collector/monasca.py +++ b/cloudkitty/collector/monasca.py @@ -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: