bring into trunk

[monitor.git] / nodebad.py

diff --git a/nodebad.py b/nodebad.py
index 3261f88..0130c3e 100755 (executable)
--- a/nodebad.py
+++ b/nodebad.py
@@ -16,7 +16,7 @@ from nodecommon import *
 import plc
 api = plc.getAuthAPI()
 from unified_model import *
-from monitor_policy import MINUP
+from const import MINUP
 
 round = 1
 externalState = {'round': round, 'nodes': {}}
@@ -32,10 +32,11 @@ def main(config):
        l_nodes = syncplcdb.create_plcdb()
        l_plcnodes = database.dbLoad("l_plcnodes")
 
-       if config.node:
-               l_nodes = [config.node]
-       else:
-               l_nodes = [node['hostname'] for node in l_plcnodes]
+       l_nodes = get_nodeset(config)
+       #if config.node:
+       #       l_nodes = [config.node]
+       ##else:
+       #       l_nodes = [node['hostname'] for node in l_plcnodes]
        
        checkAndRecordState(l_nodes, l_plcnodes)
 
@@ -64,7 +65,6 @@ def checkAndRecordState(l_nodes, l_plcnodes):
        database.dbDump(config.dbname, externalState)
 
 fb = database.dbLoad('findbad')
-hn2lb = database.dbLoad("plcdb_hn2lb")
 
 def getnodesup(nodelist):
        up = 0