X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=monitor%2Fbootman.py;h=eac27613ec2408f1c7db6fb18292090cf3868669;hp=b7ec58cf7aeae507b2410b665ce90ba33d5e14d0;hb=e637272100e8e03884188cb2118b21158e739bb0;hpb=328ee7b92f4e23570d8a33ad9244413ae3aee6bf

diff --git a/monitor/bootman.py b/monitor/bootman.py
index b7ec58c..eac2761 100755
--- a/monitor/bootman.py
+++ b/monitor/bootman.py
@@ -11,7 +11,7 @@ import traceback
 import subprocess
 from sets import Set
 
-from monitor.getsshkeys import SSHKnownHosts
+from monitor.util.sshknownhosts import SSHKnownHosts
 from monitor.Rpyc import SocketConnection, Async
 from monitor.Rpyc.Utils import *
 
@@ -825,46 +825,5 @@ def restore_basic(sitehist, hostname, config=None, forced_action=None):
 	return bootman_action
 	
 
-# MAIN -------------------------------------------------------------------
-
-def main():
-	from monitor import parser as parsermodule
-	parser = parsermodule.getParser()
-
-	parser.set_defaults(child=False, collect=False, nosetup=False, verbose=False, 
-						force=None, quiet=False)
-	parser.add_option("", "--child", dest="child", action="store_true", 
-						help="This is the child mode of this process.")
-	parser.add_option("", "--force", dest="force", metavar="boot_state",
-						help="Force a boot state passed to BootManager.py.")
-	parser.add_option("", "--quiet", dest="quiet", action="store_true", 
-						help="Extra quiet output messages.")
-	parser.add_option("", "--verbose", dest="verbose", action="store_true", 
-						help="Extra debug output messages.")
-	parser.add_option("", "--nonet", dest="nonet", action="store_true", 
-						help="Do not setup the network, use existing log files to re-run a test pass.")
-	parser.add_option("", "--collect", dest="collect", action="store_true", 
-						help="No action, just collect dmesg, and bm.log")
-	parser.add_option("", "--nosetup", dest="nosetup", action="store_true", 
-						help="Do not perform the orginary setup phase.")
-
-	parser = parsermodule.getParser(['nodesets', 'defaults'], parser)
-	config = parsermodule.parse_args(parser)
-
-	if config.nodelist:
-		nodes = config.getListFromFile(config.nodelist)
-	elif config.node:
-		nodes = [ config.node ]
-	else:
-		parser.print_help()
-		sys.exit(1)
-
-	for node in nodes:
-		# get sitehist
-		lb = plccache.plcdb_hn2lb[node]
-		sitehist = SiteInterface.get_or_make(loginbase=lb)
-		#reboot(node, config)
-		restore(sitehist, node, config=None, forced_action=None)
-
 if __name__ == "__main__":
-	main()
+	print "ERROR: Can not execute module as a command! Please use commands/%s.py" % os.path.splitext(__file__)[0]