X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeaction.py;h=a5bd3eab18b33a2997ee4b93caff43e015cd88c6;hb=da913fbd1629fc4669b186915df8ff3a340482d3;hp=00d28107d1f302307ca6c4b88b2562b6767c13b6;hpb=6496f5b4a0220e4055fee76c97f92293f9559117;p=monitor.git

diff --git a/nodeaction.py b/nodeaction.py
index 00d2810..a5bd3ea 100755
--- a/nodeaction.py
+++ b/nodeaction.py
@@ -1,18 +1,16 @@
 #!/usr/bin/python
 
 import plc
-import auth
-api = plc.PLC(auth.auth, auth.plc)
+api = plc.getAuthAPI()
 
 import reboot
 
 import time
-from model import *
+from monitor.model import *
 
-from config import config
-from optparse import OptionParser
+import parser as parsermodule
 
-parser = OptionParser()
+parser = parsermodule.getParser()
 parser.set_defaults(node=None, rins=False, bootstate=None, endrecord=False)
 parser.add_option("", "--backoff", dest="backoff", action="store_true",
 					help="Back off all penalties applied to a site.")
@@ -20,15 +18,12 @@ parser.add_option("", "--rins", dest="rins", action="store_true",
 					help="Back off all penalties applied to a site.")
 parser.add_option("", "--bootstate", dest="bootstate", 
 					help="set the bootstate for a node.")
-config = config(parser)
-config.parse_args()
+parser = parsermodule.getParser(['defaults'], parser)
+config = parsermodule.parse_args(parser)
 
 for node in config.args:
 	config.node = node
 
-	#plc_nodeinfo = api.GetNodes({'hostname': config.node}, None)[0]
-	#fb_nodeinfo  = fb['nodes'][config.node]['values']
-
 	if config.bootstate:
 		print "Setting %s to bootstate %s" % ( node, config.bootstate )
 		api.UpdateNode(node, {'boot_state' : config.bootstate})