X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeaction.py;h=ad5827944a3f2676ea2993e2dc516048effb9f24;hb=5772ce036b96297a23f834ea34ce4466ef4d522c;hp=62095d13cc068d1ec6da83f6704833781d9f9b16;hpb=c51ad794e8dc07072d705b508e79ba06849aa408;p=monitor.git

diff --git a/nodeaction.py b/nodeaction.py
index 62095d1..ad58279 100755
--- a/nodeaction.py
+++ b/nodeaction.py
@@ -6,12 +6,11 @@ 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.")
@@ -19,22 +18,19 @@ 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})
 
 	if config.rins:
 		print "Setting %s to rins" % node
-		api.UpdateNode(node, {'boot_state' : 'rins'})
+		api.UpdateNode(node, {'boot_state' : 'reinstall'})
 
 	if config.backoff:
 		print "Enabling Slices & Slice Creation for %s" % node