x/terracotta
Code Issues Proposed changes

Fixed tests of minimum_migration_time_max_cpu

Browse Source
This commit is contained in:
Anton Beloglazov 2012-12-05 15:46:45 +11:00
parent c92e8e29ed
commit d9fea23c98
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neat/locals/vm_selection/algorithms.py
View File

@ -173,7 +173,7 @@ def minimum_migration_time_max_cpu(last_n, vms_cpu, vms_ram):
if vms_ram[vm] > min_ram:
continue
vals = cpu[-last_n:]
avg = sum(vals) / len(vals)
avg = float(sum(vals)) / len(vals)
if max_cpu < avg:
max_cpu = avg
selected_vm = vm

12
tests/locals/vm_selection/test_algorithms.py
View File

@ -85,7 +85,7 @@ class Selection(TestCase):
vms_cpu = dict((k, v[0]) for k, v in x.items())
vms_ram = dict((k, v[1]) for k, v in x.items())
min_ram = min(vms_ram.values())
min_ram_vms_cpu = dict((k, sum(v[-last_n:]) / len(v[-last_n:]))
min_ram_vms_cpu = dict((k, float(sum(v[-last_n:])) / len(v[-last_n:]))
for k, v in vms_cpu.items()
if vms_ram[k] == min_ram and len(v[-last_n:]) > 0)
values = min_ram_vms_cpu.values()
@ -108,7 +108,7 @@ class Selection(TestCase):
300, 20., {'last_n': last_n})
vms_ram = dict((k, ram) for k, _ in vms_cpu.items())
min_ram = min(vms_ram.values())
min_ram_vms_cpu = dict((k, sum(v[-last_n:]) / len(v[-last_n:]))
min_ram_vms_cpu = dict((k, float(sum(v[-last_n:])) / len(v[-last_n:]))
for k, v in vms_cpu.items()
if vms_ram[k] == min_ram and len(v[-last_n:]) > 0)
values = min_ram_vms_cpu.values()
@ -159,7 +159,7 @@ class Selection(TestCase):
expect(selection).choice(x.keys()).and_return(vm).once()
assert selection.random(x) == vm
@qc
@qc(10)
def minimum_migration_time_max_cpu(
x=dict_(
keys=str_(of='abc123-', min_length=36, max_length=36),
@ -173,7 +173,7 @@ class Selection(TestCase):
vms_cpu = dict((k, v[0]) for k, v in x.items())
vms_ram = dict((k, v[1]) for k, v in x.items())
min_ram = min(vms_ram.values())
min_ram_vms_cpu = dict((k, sum(v[-last_n:]) / len(v[-last_n:]))
min_ram_vms_cpu = dict((k, float(sum(v[-last_n:])) / len(v[-last_n:]))
for k, v in vms_cpu.items()
if vms_ram[k] == min_ram and len(v[-last_n:]) > 0)
values = min_ram_vms_cpu.values()
@ -182,7 +182,7 @@ class Selection(TestCase):
assert selection.minimum_migration_time_max_cpu(
last_n, vms_cpu, vms_ram) == vm
@qc(1)
@qc(10)
def minimum_migration_time_max_cpu_equal_ram(
vms_cpu=dict_(
keys=str_(of='abc123-', min_length=36, max_length=36),
@ -195,7 +195,7 @@ class Selection(TestCase):
):
vms_ram = dict((k, ram) for k, _ in vms_cpu.items())
min_ram = min(vms_ram.values())
min_ram_vms_cpu = dict((k, sum(v[-last_n:]) / len(v[-last_n:]))
min_ram_vms_cpu = dict((k, float(sum(v[-last_n:])) / len(v[-last_n:]))
for k, v in vms_cpu.items()
if vms_ram[k] == min_ram and len(v[-last_n:]) > 0)
values = min_ram_vms_cpu.values()