From 86ea9c8e7b49d9440279e50a3673f344ca5af54a Mon Sep 17 00:00:00 2001
From: licanwei <li.canwei2@zte.com.cn>
Date: Sat, 27 Jul 2019 10:23:21 +0800
Subject: [PATCH] replace disk_capacity by disk

Partially Implements: blueprint improve-compute-data-model

Change-Id: I9af8d3e5ad3288d56f9ef5ef998b56f9a3e6622d
---
 watcher/decision_engine/model/element/node.py                   | 2 +-
 watcher/decision_engine/strategy/strategies/host_maintenance.py | 2 +-
 .../strategy/strategies/vm_workload_consolidation.py            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/watcher/decision_engine/model/element/node.py b/watcher/decision_engine/model/element/node.py
index 0e52ae35a..5ab25bdf3 100644
--- a/watcher/decision_engine/model/element/node.py
+++ b/watcher/decision_engine/model/element/node.py
@@ -63,7 +63,7 @@ class ComputeNode(compute_resource.ComputeResource):
 
     @property
     def disk_gb_free(self):
-        total = (self.disk_capacity-self.disk_gb_reserved)*self.disk_ratio
+        total = (self.disk-self.disk_gb_reserved)*self.disk_ratio
         return total-self.disk_gb_used
 
     @property
diff --git a/watcher/decision_engine/strategy/strategies/host_maintenance.py b/watcher/decision_engine/strategy/strategies/host_maintenance.py
index a60978478..ccd3a306b 100644
--- a/watcher/decision_engine/strategy/strategies/host_maintenance.py
+++ b/watcher/decision_engine/strategy/strategies/host_maintenance.py
@@ -135,7 +135,7 @@ class HostMaintenance(base.HostMaintenanceBaseStrategy):
         """
         return dict(cpu=node.vcpus,
                     ram=node.memory,
-                    disk=node.disk_capacity)
+                    disk=node.disk)
 
     def get_node_used(self, node):
         """Collect cpu, ram and disk used of a node.
diff --git a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
index 1818a083c..cef09fa80 100644
--- a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
+++ b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
@@ -318,7 +318,7 @@ 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_capacity)
+        return dict(cpu=node.vcpus, ram=node.memory, disk=node.disk)
 
     def get_relative_node_utilization(self, node):
         """Return relative node utilization.