x/terracotta
Code Issues Proposed changes

Fixed vm_mhz_to_percentage to correctly handle 0 filling

Browse Source
This commit is contained in:
Anton Beloglazov 2012-10-23 16:34:44 +11:00
parent 269ce0c065
commit 010e416d3c
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neat/locals/manager.py
View File

@ -410,8 +410,9 @@ def vm_mhz_to_percentage(vm_mhz_history, host_mhz_history, physical_cpu_mhz):
:return: The history of the host's CPU utilization in percentages.
:rtype: list(float)
"""
host_mhz_history = [0] * (len(vm_mhz_history) -
len(host_mhz_history)) + host_mhz_history
data = itertools.izip_longest(*(vm_mhz_history + [host_mhz_history]),
fillvalue=0)
return [float(sum(x)) / physical_cpu_mhz for x in data]
max_len = max(len(x) for x in vm_mhz_history)
if len(host_mhz_history) > max_len:
host_mhz_history = host_mhz_history[-max_len:]
mhz_history = [[0] * (max_len - len(x)) + x
for x in vm_mhz_history + [host_mhz_history]]
return [float(sum(x)) / physical_cpu_mhz for x in zip(*mhz_history)]

13
tests/locals/test_manager.py
View File

@ -161,11 +161,11 @@ class LocalManager(TestCase):
def test_vm_mhz_to_percentage(self):
self.assertEqual(manager.vm_mhz_to_percentage(
[[100, 200, 300],
[100, 300, 200],
[300, 100, 300, 200],
[100, 100, 700]],
[300, 0, 300],
3000),
[0.2, 0.2, 0.5])
[0.1, 0.2, 0.2, 0.5])
self.assertEqual(manager.vm_mhz_to_percentage(
[[100, 200, 300],
@ -174,3 +174,12 @@ class LocalManager(TestCase):
[0, 300],
3000),
[0.1, 0.2, 0.5])
self.assertEqual(manager.vm_mhz_to_percentage(
[[100, 200, 300],
[300, 100, 300, 200],
[100, 100, 700]],
[300, 0, 300, 0, 300],
3000),
[0.1, 0.2, 0.2, 0.5])