X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sitebad.py;h=2c1628aace9752ba495b12508c1792374fb00f99;hb=da913fbd1629fc4669b186915df8ff3a340482d3;hp=48ac79c435abf050ad650a0e166108fe3de13337;hpb=6f2351e4b44590221425fa9b4bfa77c92db49b6a;p=monitor.git

diff --git a/sitebad.py b/sitebad.py
index 48ac79c..2c1628a 100755
--- a/sitebad.py
+++ b/sitebad.py
@@ -11,20 +11,19 @@ from monitor.pcu import reboot
 from monitor import parser as parsermodule
 from monitor import config
 from monitor.database import HistorySiteRecord, FindbadNodeRecord
-from monitor.wrapper import plc
+from monitor.wrapper import plc, plccache
 from monitor.const import MINUP
 
 from nodecommon import *
 from nodequery import verify,query_to_dict,node_select
-import syncplcdb
-from unified_model import *
+from monitor.model import *
 
 api = plc.getAuthAPI()
 
 def main(config):
 
-	l_nodes = syncplcdb.create_plcdb()
-	l_plcsites = database.dbLoad("l_plcsites")
+	l_nodes = plccache.l_nodes
+	l_plcsites = plccache.l_sites
 
 	if config.site:
 		l_sites = [config.site]
@@ -49,7 +48,7 @@ def getnodesup(nodelist):
 
 def checkAndRecordState(l_sites, l_plcsites):
 	count = 0
-	lb2hn = database.dbLoad("plcdb_lb2hn")
+	lb2hn = plccache.plcdb_lb2hn
 	for sitename in l_sites:
 		d_site = None
 		for site in l_plcsites: