Merge "update vm_workload_consolidation strategy"

2019-08-12 02:10:16 +00:00
parent 44cd2a7421 7420915244
commit 6d5a6b73e4
4 changed files with 10 additions and 9 deletions
--- a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
+++ b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
@@ -318,7 +318,8 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
        :param node: node object
        :return: dict(cpu(cores), ram(MB), disk(B))
        """
-        return dict(cpu=node.vcpus, ram=node.memory, disk=node.disk)
+        return dict(cpu=node.vcpu_capacity, ram=node.memory_mb_capacity,
+                    disk=node.disk_gb_capacity)

    def get_relative_node_utilization(self, node):
        """Return relative node utilization.