Changed 'import auth' statements to use plc.py or monitorconfig.py

[monitor.git] / grouprins.py

diff --git a/grouprins.py b/grouprins.py
index 95d0fc5..ffb4f85 100755 (executable)
--- a/grouprins.py
+++ b/grouprins.py
@@ -13,8 +13,7 @@
 # 
 
 import plc
-import auth
-api = plc.PLC(auth.auth, auth.plc)
+api = plc.getAuthAPI()
 
 import policy
 import traceback
@@ -24,7 +23,7 @@ from optparse import OptionParser
 
 from nodecommon import *
 from nodequery import verify,query_to_dict,node_select
-import soltesz
+import database
 from unified_model import *
 import os
 
@@ -156,7 +155,7 @@ def set_node_to_rins(host, fb):
 
 
 try:
-       rebootlog = soltesz.dbLoad("rebootlog")
+       rebootlog = database.dbLoad("rebootlog")
 except:
        rebootlog = LogRoll()
 
@@ -235,7 +234,7 @@ if config.findbad:
        configmodule.setFileFromList(file, hostnames)
        os.system("./findbad.py --cachenodes --debug=0 --dbname=findbad --increment --nodelist %s" % file)
 
-fb = soltesz.dbLoad("findbad")
+fb = database.dbLoad("findbad")
 # commands:
 i = 1
 count = 1
@@ -346,7 +345,7 @@ for host in hostnames:
        time.sleep(1)
        if count % 10 == 0:
                print "Saving rebootlog"
-               soltesz.dbDump("rebootlog", rebootlog)
+               database.dbDump("rebootlog", rebootlog)
                wait_time = int(config.timewait)
                print "Sleeping %d minutes" % wait_time
                ti = 0
@@ -361,4 +360,4 @@ for host in hostnames:
        count = count + 1
 
 print "Saving rebootlog"
-soltesz.dbDump("rebootlog", rebootlog)
+database.dbDump("rebootlog", rebootlog)