X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=nodequery.py;h=c3f7ab8a7b327ccd864a6c4bca48018af27a0d21;hp=b0303440e7f7b1a0c6e7723d3f21d38974f5ead0;hb=944d143a6528c4157b71f51ed480aec806cbaa06;hpb=94cd174f6ce0bb3b2c8bceda0346e332037c6d8a

diff --git a/nodequery.py b/nodequery.py
index b030344..c3f7ab8 100755
--- a/nodequery.py
+++ b/nodequery.py
@@ -11,13 +11,14 @@ from unified_model import Record
 import glob
 import os
 from reboot import pcu_name
+import reboot
 import util.file
 
 import time
 import re
 
 #fb = {}
-fb = database.dbLoad("findbad")
+fb = {}
 fbpcu = {}
 
 class NoKeyException(Exception): pass
@@ -202,13 +203,14 @@ def pcu_select(str_query, nodelist=None):
 	return (nodenames, pcunames)
 
 def node_select(str_query, nodelist=None, fbdb=None):
+	global fb
+
 	hostnames = []
 	if str_query is None: return hostnames
 
 	#print str_query
 	dict_query = query_to_dict(str_query)
 	#print dict_query
-	global fb
 
 	if fbdb is not None:
 		fb = fbdb
@@ -280,6 +282,7 @@ def main():
 		fb = database.dbLoad("findbad")
 
 	fbpcu = database.dbLoad("findbadpcus")
+	reboot.fb = fbpcu
 
 	if config.nodelist:
 		nodelist = util.file.getListFromFile(config.nodelist)
@@ -288,10 +291,10 @@ def main():
 
 	pculist = None
 	if config.select is not None and config.pcuselect is not None:
-		nodelist = node_select(config.select, nodelist)
+		nodelist = node_select(config.select, nodelist, fb)
 		nodelist, pculist = pcu_select(config.pcuselect, nodelist)
 	elif config.select is not None:
-		nodelist = node_select(config.select, nodelist)
+		nodelist = node_select(config.select, nodelist, fb)
 	elif config.pcuselect is not None:
 		nodelist, pculist = pcu_select(config.pcuselect, nodelist)