From 7420915244651c2503dbc0ad7c626d1f99fa3088 Mon Sep 17 00:00:00 2001
From: licanwei <li.canwei2@zte.com.cn>
Date: Tue, 6 Aug 2019 19:39:42 +0800
Subject: [PATCH] update vm_workload_consolidation 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: I7872265b2378e5dc37aa2e086ff1f7fb9071db0b
---
 .../strategy/strategies/vm_workload_consolidation.py      | 3 ++-
 .../model/data/scenario_1_with_metrics.xml                | 4 ++--
 .../model/data/scenario_2_with_metrics.xml                | 8 ++++----
 .../model/data/scenario_3_with_metrics.xml                | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
index cef09fa80..01e3b5de9 100644
--- 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.
diff --git a/watcher/tests/decision_engine/model/data/scenario_1_with_metrics.xml b/watcher/tests/decision_engine/model/data/scenario_1_with_metrics.xml
index 0b21467f3..48f5b9778 100644
--- a/watcher/tests/decision_engine/model/data/scenario_1_with_metrics.xml
+++ b/watcher/tests/decision_engine/model/data/scenario_1_with_metrics.xml
@@ -1,8 +1,8 @@
 <ModelRoot>
-  <ComputeNode hostname="hostname_0" uuid="Node_0" id="0" state="up" status="enabled" vcpus="40" disk="250" disk_capacity="250" memory="64">
+  <ComputeNode hostname="hostname_0" uuid="Node_0" id="0" state="up" status="enabled" vcpus="40" vcpu_reserved="0" vcpu_ratio="1" disk="250" disk_gb_reserved="0" disk_ratio="1" disk_capacity="250" memory="64" memory_mb_reserved="0" memory_ratio="1">
     <Instance watcher_exclude="False" name="" state="active" uuid="INSTANCE_0" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
   </ComputeNode>
-  <ComputeNode hostname="hostname_1" uuid="Node_1" id="1" state="up" status="enabled" vcpus="40" disk="250" disk_capacity="250" memory="64">
+  <ComputeNode hostname="hostname_1" uuid="Node_1" id="1" state="up" status="enabled" vcpus="40" vcpu_reserved="0" vcpu_ratio="1" disk="250" disk_gb_reserved="0" disk_ratio="1" disk_capacity="250" memory="64" memory_mb_reserved="0" memory_ratio="1">
     <Instance watcher_exclude="False" name="" state="active" uuid="INSTANCE_1" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
   </ComputeNode>
 </ModelRoot>
diff --git a/watcher/tests/decision_engine/model/data/scenario_2_with_metrics.xml b/watcher/tests/decision_engine/model/data/scenario_2_with_metrics.xml
index 3be1130e0..bd1378291 100644
--- a/watcher/tests/decision_engine/model/data/scenario_2_with_metrics.xml
+++ b/watcher/tests/decision_engine/model/data/scenario_2_with_metrics.xml
@@ -1,5 +1,5 @@
 <ModelRoot>
-  <ComputeNode hostname="hostname_0" uuid="Node_0" id="0" state="up" status="enabled" vcpus="16" disk="250" disk_capacity="250" memory="64">
+  <ComputeNode hostname="hostname_0" uuid="Node_0" id="0" state="up" status="enabled" vcpus="16" vcpu_reserved="0" vcpu_ratio="1" disk="250" disk_gb_reserved="0" disk_ratio="1" disk_capacity="250" memory="64" memory_mb_reserved="0" memory_ratio="1">
     <Instance watcher_exclude="False" name="" state="active" uuid="INSTANCE_0" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
     <Instance watcher_exclude="False" name="" state="active" uuid="INSTANCE_1" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
     <Instance watcher_exclude="False" name="" state="active" uuid="INSTANCE_2" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
@@ -7,7 +7,7 @@
     <Instance watcher_exclude="False" name="" state="active" uuid="INSTANCE_4" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
     <Instance watcher_exclude="False" name="" state="active" uuid="INSTANCE_5" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
   </ComputeNode>
-  <ComputeNode hostname="hostname_1" uuid="Node_1" id="1" state="up" status="enabled" vcpus="16" disk="250" disk_capacity="250" memory="64"/>
-  <ComputeNode hostname="hostname_2" uuid="Node_2" id="2" state="up" status="enabled" vcpus="16" disk="250" disk_capacity="250" memory="64"/>
-  <ComputeNode hostname="hostname_3" uuid="Node_3" id="3" state="up" status="enabled" vcpus="16" disk="250" disk_capacity="250" memory="64"/>
+  <ComputeNode hostname="hostname_1" uuid="Node_1" id="1" state="up" status="enabled" vcpus="16" vcpu_reserved="0" vcpu_ratio="1" disk="250" disk_gb_reserved="0" disk_ratio="1" disk_capacity="250" memory="64" memory_mb_reserved="0" memory_ratio="1"/>
+  <ComputeNode hostname="hostname_2" uuid="Node_2" id="2" state="up" status="enabled" vcpus="16" vcpu_reserved="0" vcpu_ratio="1" disk="250" disk_gb_reserved="0" disk_ratio="1" disk_capacity="250" memory="64" memory_mb_reserved="0" memory_ratio="1"/>
+  <ComputeNode hostname="hostname_3" uuid="Node_3" id="3" state="up" status="enabled" vcpus="16" vcpu_reserved="0" vcpu_ratio="1" disk="250" disk_gb_reserved="0" disk_ratio="1" disk_capacity="250" memory="64" memory_mb_reserved="0" memory_ratio="1"/>
 </ModelRoot>
diff --git a/watcher/tests/decision_engine/model/data/scenario_3_with_metrics.xml b/watcher/tests/decision_engine/model/data/scenario_3_with_metrics.xml
index 192357d3a..b6f34e6e8 100644
--- a/watcher/tests/decision_engine/model/data/scenario_3_with_metrics.xml
+++ b/watcher/tests/decision_engine/model/data/scenario_3_with_metrics.xml
@@ -1,9 +1,9 @@
 <ModelRoot>
-  <ComputeNode hostname="hostname_0" uuid="Node_0" id="0" state="up" status="enabled" vcpus="10" disk="250" disk_capacity="250" memory="64">
+  <ComputeNode hostname="hostname_0" uuid="Node_0" id="0" state="up" status="enabled" vcpus="10" vcpu_reserved="0" vcpu_ratio="1" disk="250" disk_gb_reserved="0" disk_ratio="1" disk_capacity="250" memory="64" memory_mb_reserved="0" memory_ratio="1">
     <Instance watcher_exclude="False" name="" state="active" uuid="INSTANCE_6" vcpus="1" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
     <Instance watcher_exclude="False" name="" state="active" uuid="INSTANCE_7" vcpus="2" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
     <Instance watcher_exclude="False" name="" state="active" uuid="INSTANCE_8" vcpus="4" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
     <Instance watcher_exclude="False" name="" state="active" uuid="INSTANCE_9" vcpus="8" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
   </ComputeNode>
-  <ComputeNode hostname="hostname_1" uuid="Node_1" id="1" state="up" status="enabled" vcpus="10" disk="250" disk_capacity="250" memory="64"/>
+  <ComputeNode hostname="hostname_1" uuid="Node_1" id="1" state="up" status="enabled" vcpus="10" vcpu_reserved="0" vcpu_ratio="1" disk="250" disk_gb_reserved="0" disk_ratio="1" disk_capacity="250" memory="64" memory_mb_reserved="0" memory_ratio="1"/>
 </ModelRoot>