changes for 3.0

[monitor.git] / action.py

diff --git a/action.py b/action.py
index 269007e..dad6227 100755 (executable)
--- a/action.py
+++ b/action.py
@@ -15,9 +15,9 @@ import Queue
 from sets import Set
 
 # Global config options
-from config import config
-from optparse import OptionParser
-parser = OptionParser()
+import parser as parsermodule
+
+parser = parsermodule.getParser()
 
 parser.set_defaults(nodelist=None, 
                                        cachert=False, 
@@ -36,8 +36,7 @@ parser.add_option("", "--ticketlist", dest="ticketlist",
 parser.add_option("", "--blacklist", dest="blacklist",
                                        help="Blacklist all nodes in this file")
 
-config = config(parser)
-config.parse_args()
+config = parsermodule.parse_args(parser)
 
 # daemonize and *pid
 #from util.process import * 
@@ -46,7 +45,7 @@ config.parse_args()
 import rt
 # Correlates input with policy to form actions
 import policy
-import soltesz
+import database
 import plc
 
 # Log to what 
@@ -140,7 +139,7 @@ def main():
        #########  GET NODES    ########################################
        logger.info('Get Nodes from PLC')
        print "getnode from plc"
-       l_plcnodes = soltesz.if_cached_else(True,
+       l_plcnodes = database.if_cached_else(True,
                                                                "l_plcnodes", 
                                                                lambda : plc.getNodes({'peer_id':None}))
 
@@ -168,15 +167,15 @@ def main():
 
        print "len of l_nodes: %d" % len(l_nodes)
        # Minus blacklisted ones..
-       l_ticket_blacklist = soltesz.if_cached_else(1,"l_ticket_blacklist",lambda : [])
+       l_ticket_blacklist = database.if_cached_else(1,"l_ticket_blacklist",lambda : [])
 
-       l_blacklist = soltesz.if_cached_else(1, "l_blacklist", lambda : [])
+       l_blacklist = database.if_cached_else(1, "l_blacklist", lambda : [])
        l_nodes  = filter(lambda x : not x['hostname'] in l_blacklist, l_nodes)
 
        #######  Get RT tickets    #########################################
        #logger.info('Get Tickets from RT')
-       #t = soltesz.MyTimer()
-       #ad_dbTickets = soltesz.if_cached_else(config.cachert, "ad_dbTickets", rt.rt_tickets)
+       #t = commands.MyTimer()
+       #ad_dbTickets = database.if_cached_else(config.cachert, "ad_dbTickets", rt.rt_tickets)
        #print "Getting tickets from RT took: %f sec" % t.diff() ; del t
 
        logger.info('Start Action thread')