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

Merge "Removed unnecessary code from basic_consolidation"

Browse Source
This commit is contained in:
Jenkins
2015-12-11 08:07:28 +00:00
committed by Gerrit Code Review
parent d5ba40530f ba4f5569d1
commit 91c14e4eda
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/decision_engine/strategy/basic_consolidation.py
View File

@@ -292,15 +292,13 @@ class BasicConsolidation(BaseStrategy):
def calculate_score_vm(self, vm, model): def calculate_score_vm(self, vm, model):
"""Calculate Score of virtual machine """Calculate Score of virtual machine
:param vm_id: the id of virtual machine :param vm: the virtual machine
:param model: the model :param model: the model
:return: score :return: score
""" """
if model is None: if model is None:
raise ClusteStateNotDefined() raise ClusteStateNotDefined()
vm = model.get_vm_from_id(vm.uuid)
vm_cpu_utilization = self.ceilometer. \ vm_cpu_utilization = self.ceilometer. \
statistic_aggregation(resource_id=vm.uuid, statistic_aggregation(resource_id=vm.uuid,
meter_name='cpu_util', meter_name='cpu_util',