changes for 3.0

[monitor.git] / nodeaction.py

diff --git a/nodeaction.py b/nodeaction.py
index 62095d1..b130396 100755 (executable)
--- a/nodeaction.py
+++ b/nodeaction.py
@@ -8,10 +8,9 @@ import reboot
 import time
 from 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