diff --git a/watcher/decision_engine/strategy/strategies/basic_consolidation.py b/watcher/decision_engine/strategy/strategies/basic_consolidation.py index c84c3e9de..6f1eb2578 100644 --- a/watcher/decision_engine/strategy/strategies/basic_consolidation.py +++ b/watcher/decision_engine/strategy/strategies/basic_consolidation.py @@ -232,9 +232,9 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy): :param total_mem: total memory used by the virtual machine :return: True if the threshold is not exceed """ - cpu_capacity = destination_node.vcpus - disk_capacity = destination_node.disk - memory_capacity = destination_node.memory + cpu_capacity = destination_node.vcpu_capacity + disk_capacity = destination_node.disk_gb_capacity + memory_capacity = destination_node.memory_mb_capacity return (cpu_capacity >= total_cores * self.threshold_cores and disk_capacity >= total_disk * self.threshold_disk and diff --git a/watcher/tests/decision_engine/model/data/scenario_8_with_4_nodes.xml b/watcher/tests/decision_engine/model/data/scenario_8_with_4_nodes.xml index 91bf4bf56..d971337a1 100644 --- a/watcher/tests/decision_engine/model/data/scenario_8_with_4_nodes.xml +++ b/watcher/tests/decision_engine/model/data/scenario_8_with_4_nodes.xml @@ -1,16 +1,16 @@ - + - + - + - +