From 63c1aabdd29ffbb9e0204337a0e69241e5aa3588 Mon Sep 17 00:00:00 2001 From: xiaoxue Date: Mon, 10 Jul 2017 14:27:46 +0800 Subject: [PATCH] bug fix: Can't get sample through CeilometerHelper wrong parameter passing of function "query_sample" the default parameter will be recognized as "user_id" Change-Id: I293b130c3f709dc93cd4b1b7382ae8895a54765d Closes-Bug: #1703297 --- watcher/datasource/ceilometer.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/watcher/datasource/ceilometer.py b/watcher/datasource/ceilometer.py index 2ee89ba84..a71fb3fab 100644 --- a/watcher/datasource/ceilometer.py +++ b/watcher/datasource/ceilometer.py @@ -162,9 +162,10 @@ class CeilometerHelper(object): return item_value def get_last_sample_values(self, resource_id, meter_name, limit=1): - samples = self.query_sample(meter_name=meter_name, - query=self.build_query(resource_id), - limit=limit) + samples = self.query_sample( + meter_name=meter_name, + query=self.build_query(resource_id=resource_id), + limit=limit) values = [] for index, sample in enumerate(samples): values.append( @@ -174,8 +175,9 @@ class CeilometerHelper(object): return values def get_last_sample_value(self, resource_id, meter_name): - samples = self.query_sample(meter_name=meter_name, - query=self.build_query(resource_id)) + samples = self.query_sample( + meter_name=meter_name, + query=self.build_query(resource_id=resource_id)) if samples: return samples[-1]._info['counter_volume'] else: