move clean_policy.py into monitor package

[monitor.git] / sitebad.py

diff --git a/sitebad.py b/sitebad.py
index 48ac79c..2c1628a 100755 (executable)
--- 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 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
 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):
 
 
 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]
 
        if config.site:
                l_sites = [config.site]


@@ -49,7 +48,7 @@ def getnodesup(nodelist):
 
 def checkAndRecordState(l_sites, l_plcsites):
        count = 0
 
 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:
        for sitename in l_sites:
                d_site = None
                for site in l_plcsites: