X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pcucontrol%2Freboot.py;h=9d171a298a1b14b3d2320ee7b168eb0a20d43ab6;hb=4df3989d4aee44cb6e36169ac69ba097436f7b15;hp=3ad6438abf70676879e26c3851379253b73f2cef;hpb=9655fab4df8855f5d87af6f211333f599abe78c5;p=monitor.git

diff --git a/pcucontrol/reboot.py b/pcucontrol/reboot.py
index 3ad6438..9d171a2 100755
--- a/pcucontrol/reboot.py
+++ b/pcucontrol/reboot.py
@@ -27,7 +27,6 @@ sys.path.insert(0, os.path.dirname(sys.argv[0]) + "/pyssh")
 import pcucontrol.transports.pyssh as pyssh
 from monitor import config
 
-from monitor.database.info.model import FindbadPCURecord
 
 # Event class ID from pcu events
 #NODE_POWER_CONTROL = 3
@@ -336,6 +335,7 @@ def pcu_name(pcu):
 		return None
 
 def get_pcu_values(pcu_id):
+	from monitor.database.info.model import FindbadPCURecord
 	print "pcuid: %s" % pcu_id
 	try:
 		pcurec = FindbadPCURecord.get_latest_by(plc_pcuid=pcu_id).first()
@@ -471,6 +471,8 @@ def reboot_test_new(nodename, values, verbose, dryrun):
 		# TODO: how to handle the weird, georgetown pcus, the drac faults, and ilo faults
 	except ExceptionPort, err:
 		rb_ret = str(err)
+	except NameError, err:
+		rb_ret = str(err)
 
 	return rb_ret
 
@@ -503,3 +505,6 @@ def main():
 if __name__ == '__main__':
 	logger = logging.getLogger("monitor")
 	main()
+	f = open("/tmp/rebootlog", 'a')
+	f.write("reboot %s\n" % sys.argv)
+	f.close()