From 33d7de12efbed88f43f961406cd255f8713aa3b2 Mon Sep 17 00:00:00 2001
From: licanwei
Date: Mon, 29 Jul 2019 10:54:40 +0800
Subject: [PATCH] update node resource capacity for basic_consolidation
For Compute node, when calculating resource(VCPU, memory and disk)
capacity, we need to consider reserved resource and allocation ratio.
Partially Implements: blueprint improve-compute-data-model
Depends-on: I3f9a3279a26f3df444117d9265e74cca57b38d6e
Change-Id: I70257dd5fb342a67a3ffda1055eddc54b8360ca3
---
.../strategy/strategies/basic_consolidation.py | 6 +++---
.../model/data/scenario_3_with_2_nodes.xml | 4 ++--
.../model/data/scenario_8_with_4_nodes.xml | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
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_3_with_2_nodes.xml b/watcher/tests/decision_engine/model/data/scenario_3_with_2_nodes.xml
index ea90081bc..9a00e3109 100644
--- a/watcher/tests/decision_engine/model/data/scenario_3_with_2_nodes.xml
+++ b/watcher/tests/decision_engine/model/data/scenario_3_with_2_nodes.xml
@@ -1,8 +1,8 @@
-
+
-
+
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 @@
-
+
-
+
-
+
-
+