Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "replace disk_capacity by disk"

Browse Source
This commit is contained in:
Zuul
2019-07-29 03:43:52 +00:00
committed by Gerrit Code Review
parent 0b25c884e6 86ea9c8e7b
commit c0bba3ecf3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/decision_engine/model/element/node.py
View File

@@ -75,7 +75,7 @@ class ComputeNode(compute_resource.ComputeResource):
@property @property
def disk_gb_free(self): 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 return total-self.disk_gb_used
@property @property

2
watcher/decision_engine/strategy/strategies/host_maintenance.py
View File

@@ -135,7 +135,7 @@ class HostMaintenance(base.HostMaintenanceBaseStrategy):
""" """
return dict(cpu=node.vcpus, return dict(cpu=node.vcpus,
ram=node.memory, ram=node.memory,
disk=node.disk_capacity) disk=node.disk)
def get_node_used(self, node): def get_node_used(self, node):
"""Collect cpu, ram and disk used of a node. """Collect cpu, ram and disk used of a node.

2
watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
View File

@@ -318,7 +318,7 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
:param node: node object :param node: node object
:return: dict(cpu(cores), ram(MB), disk(B)) :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): def get_relative_node_utilization(self, node):
"""Return relative node utilization. """Return relative node utilization.