Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix: Can't get sample through CeilometerHelper

Browse Source 
wrong parameter passing of function "query_sample"
the default parameter will be recognized as "user_id"

Change-Id: I293b130c3f709dc93cd4b1b7382ae8895a54765d
Closes-Bug: #1703297
This commit is contained in:
xiaoxue
2017-07-10 14:27:46 +08:00
committed by ZhongLuyao
parent 03569db6c3
commit 63c1aabdd2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
watcher/datasource/ceilometer.py
View File

@@ -162,9 +162,10 @@ class CeilometerHelper(object):
return item_value return item_value
def get_last_sample_values(self, resource_id, meter_name, limit=1): def get_last_sample_values(self, resource_id, meter_name, limit=1):
samples = self.query_sample(meter_name=meter_name, samples = self.query_sample(
query=self.build_query(resource_id), meter_name=meter_name,
limit=limit) query=self.build_query(resource_id=resource_id),
limit=limit)
values = [] values = []
for index, sample in enumerate(samples): for index, sample in enumerate(samples):
values.append( values.append(
@@ -174,8 +175,9 @@ class CeilometerHelper(object):
return values return values
def get_last_sample_value(self, resource_id, meter_name): def get_last_sample_value(self, resource_id, meter_name):
samples = self.query_sample(meter_name=meter_name, samples = self.query_sample(
query=self.build_query(resource_id)) meter_name=meter_name,
query=self.build_query(resource_id=resource_id))
if samples: if samples:
return samples[-1]._info['counter_volume'] return samples[-1]._info['counter_volume']
else: else: