Merge "Removed unnecessary code from basic_consolidation"

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',