From 60ef87762605f252b2f988c9b0d7853e9832203f Mon Sep 17 00:00:00 2001 From: licanwei Date: Wed, 7 Aug 2019 14:38:20 +0800 Subject: [PATCH] update noisy_neighbor strategy For Compute node, we can use the new property to calculate resource(VCPU, memory and disk). Partially Implements: blueprint improve-compute-data-model Depends-on: I3f9a3279a26f3df444117d9265e74cca57b38d6e Change-Id: I4f041ad25353d575c276fce87fe13c5e6705754f --- .../decision_engine/strategy/strategies/noisy_neighbor.py | 6 +++--- .../decision_engine/model/data/scenario_7_with_2_nodes.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/watcher/decision_engine/strategy/strategies/noisy_neighbor.py b/watcher/decision_engine/strategy/strategies/noisy_neighbor.py index b0ccd4e11..0ed1b7516 100644 --- a/watcher/decision_engine/strategy/strategies/noisy_neighbor.py +++ b/watcher/decision_engine/strategy/strategies/noisy_neighbor.py @@ -229,9 +229,9 @@ class NoisyNeighbor(base.NoisyNeighborBaseStrategy): dest_servers = [] for host in hosts: cores_used, mem_used, disk_used = self.calc_used_resource(host) - cores_available = host.vcpus - cores_used - disk_available = host.disk - disk_used - mem_available = host.memory - mem_used + cores_available = host.vcpu_capacity - cores_used + disk_available = host.disk_gb_capacity - disk_used + mem_available = host.memory_mb_capacity - mem_used if (cores_available >= required_cores and disk_available >= required_disk and mem_available >= required_memory): dest_servers.append(host) diff --git a/watcher/tests/decision_engine/model/data/scenario_7_with_2_nodes.xml b/watcher/tests/decision_engine/model/data/scenario_7_with_2_nodes.xml index 66cd8da01..afe6d2c8c 100644 --- a/watcher/tests/decision_engine/model/data/scenario_7_with_2_nodes.xml +++ b/watcher/tests/decision_engine/model/data/scenario_7_with_2_nodes.xml @@ -1,9 +1,9 @@ - + - +