From ba4f5569d1a954f98a95a7f0845fb0dfb6110b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Antal?= Date: Thu, 10 Dec 2015 18:51:46 +0100 Subject: [PATCH] Removed unnecessary code from basic_consolidation In basic_consolidation.py has a method, called calculate_score_vm(). This method used to get vm's id as a parameter, but it was replaced and now it gets the vm as a parameter. So we don't need to get the vm from our vm's id, as we already have the vm. Change-Id: I96af7fbdbe85eda8d4fc44b4b162e8ba9d4967fa --- watcher/decision_engine/strategy/basic_consolidation.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/watcher/decision_engine/strategy/basic_consolidation.py b/watcher/decision_engine/strategy/basic_consolidation.py index 4db16ad2e..2501d4ab1 100644 --- a/watcher/decision_engine/strategy/basic_consolidation.py +++ b/watcher/decision_engine/strategy/basic_consolidation.py @@ -292,15 +292,13 @@ class BasicConsolidation(BaseStrategy): def calculate_score_vm(self, vm, model): """Calculate Score of virtual machine - :param vm_id: the id of virtual machine + :param vm: the virtual machine :param model: the model :return: score """ if model is None: raise ClusteStateNotDefined() - vm = model.get_vm_from_id(vm.uuid) - vm_cpu_utilization = self.ceilometer. \ statistic_aggregation(resource_id=vm.uuid, meter_name='cpu_util',