From 43202e9af47a6844313a217837b1899516f4eb87 Mon Sep 17 00:00:00 2001 From: Alex Brett Date: Thu, 12 Nov 2015 17:20:00 +0000 Subject: [PATCH] Simplify logic --- server/app/api/schedule.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/server/app/api/schedule.py b/server/app/api/schedule.py index a09d0efa9..120492b9a 100755 --- a/server/app/api/schedule.py +++ b/server/app/api/schedule.py @@ -166,15 +166,13 @@ class XenRTSchedule(XenRTAPIPage): continue # Any remaining machines have cluster ignored schedulable = True + availablemachines = machines.copy() + availablemachines.update(leasedmachines) for mx in mxs[1:]: if len(selected) == machines_required: break - if machines.has_key(mx) or leasedmachines.has_key(mx): - if machines.has_key(mx): - m = machines[mx] - else: - m = leasedmachines[mx] - if m[1] != site: + if availablemachines.has_key(mx): + if availablemachines[mx][1] != site: verbose.write(" wants %s, but it's in a different site\n" % (mx)) schedulable = False else: -- 2.39.5