doesn't belong in svn any more.

[monitor.git] / unified_model.py

diff --git a/unified_model.py b/unified_model.py
index 602c902..2fbb6e2 100755 (executable)
--- a/unified_model.py
+++ b/unified_model.py
@@ -3,18 +3,18 @@
 import database
 
 import plc
-import auth
-api = plc.PLC(auth.auth, auth.plc)
+api = plc.getAuthAPI()
 
 import mailer
 import time
 from nodecommon import *
 
 from const import *
+import util.file
+import config
 
 def gethostlist(hostlist_file):
-       import config
-       return config.getListFromFile(hostlist_file)
+       return util.file.getListFromFile(hostlist_file)
        
        #nodes = api.GetNodes({'peer_id' : None}, ['hostname'])
        #return [ n['hostname'] for n in nodes ]
@@ -533,10 +533,6 @@ class Record(object):
                return message
        
        def getContacts(self):
-               from config import config
-               #print "policy"
-               config = config()
-
                roles = self.data['email']
 
                if not config.mail and not config.debug and config.bcc: