for field in ['cpuspeed', 'memsize', 'disksize']:
if field not in cstat: cstat[field] = "null"
for field in ['cpuspeed', 'memsize', 'disksize']:
if field not in cstat: cstat[field] = "null"
return "BAD" # "disk_small",
if cstat['disksize'] == "null" and \
return "BAD" # "disk_small",
if cstat['disksize'] == "null" and \
- if float(cstat['cpuspeed']) >= 2.4 and \
- float(cstat['memsize']) >= 2.9 and \
- (cstat['disksize'] == "null" or float(cstat['disksize']) >= 320.0):
+ if float(cstat['cpuspeed']) >= 2.2 and \
+ float(cstat['memsize']) >= 2.8 and \
+ (cstat['disksize'] == "null" or float(cstat['disksize']) >= 300.0):
- fbstr = get_filefromglob(d, "production.findbad")
- fbpcustr = get_filefromglob(d, "production.findbadpcus")
+ fbstr = get_filefromglob(d, "production.findbad")[0]
+ fbpcustr = get_filefromglob(d, "production.findbadpcus")[0]
- l_plcnodes = database.dbLoad("l_plcnodes")
- l_plcsites = database.dbLoad("l_plcsites")
- lb2hn = database.dbLoad("plcdb_lb2hn")
+ l_plcnodes = plccache.l_nodes
+ l_plcsites = plccache.l_sites
+ lb2hn = plccache.plcdb_lb2hn