move some routines from plccache to generic to avoid pulling in db routines

[monitor.git] / monitor / wrapper / plccache.py

diff --git a/monitor/wrapper/plccache.py b/monitor/wrapper/plccache.py
index dbfb7e0..3ddf6f2 100755 (executable)
--- a/monitor/wrapper/plccache.py
+++ b/monitor/wrapper/plccache.py
@@ -2,56 +2,10 @@
 
 import sys
 from monitor.wrapper import plc
+from monitor.generic import *
 from monitor.database.info.model import *
 import profile
 
-def dsites_from_lsites(l_sites):
-       d_sites = {}
-       id2lb = {}
-       for site in l_sites:
-               if not site['login_base'] in d_sites:
-                       d_sites[site['login_base']] = site
-                       id2lb[site['site_id']] = site['login_base']
-               else:
-                       #print "Two sites have the same login_base value %s!" % site['login_base']
-                       #sys.exit(1)
-                       continue
-       return (d_sites, id2lb)
-
-def dsn_from_dsln(d_sites, id2lb, l_nodes):
-       lb2hn = {}
-       dsn = {}
-       hn2lb = {}
-       for id in id2lb:
-               if id2lb[id] not in lb2hn:
-                       lb2hn[id2lb[id]] = []
-
-       for node in l_nodes:
-               # this won't reach sites without nodes, which I guess isn't a problem.
-               if node['site_id'] in id2lb.keys():
-                       login_base = id2lb[node['site_id']]
-               else:
-                       print >>sys.stderr, "%s has a foreign site_id %s" % (node['hostname'], 
-                                                                                                       node['site_id'])
-                       continue
-                       for i in id2lb:
-                               print i, " ", id2lb[i]
-                       raise Exception, "Node has missing site id!! %s %d" %(node['hostname'], node['site_id'])
-               if not login_base in dsn:
-                       lb2hn[login_base] = []
-                       dsn[login_base] = {}
-                       dsn[login_base]['plc'] = d_sites[login_base]
-                       dsn[login_base]['monitor'] = {} # event log, or something
-
-               hostname = node['hostname']
-               lb2hn[login_base].append(node)
-               dsn[login_base][hostname] = {}
-               dsn[login_base][hostname]['plc'] = node
-               dsn[login_base][hostname]['comon'] = {}
-               dsn[login_base][hostname]['monitor'] = {}
-
-               hn2lb[hostname] = login_base
-       return (dsn, hn2lb, lb2hn)
 
 l_sites = None
 l_nodes = None
@@ -93,7 +47,7 @@ def init():
                l_pcus.append(pcu)
 
        print >>sys.stderr, "building id2lb"
-       (d_sites,id2lb) = dsites_from_lsites(l_sites)
+       (d_sites,id2lb) = dsites_from_lsites_id(l_sites)
        print >>sys.stderr, "building lb2hn"
        (plcdb, hn2lb, lb2hn) = dsn_from_dsln(d_sites, id2lb, l_nodes)
 
@@ -115,6 +69,7 @@ def GetNodesBySite(loginbase):
        return GetNodesByIds(site.plc_site_stats['node_ids'])
 
 def GetNodeByName(hostname):
+       print "GetNodeByName %s" % hostname
        node = PlcNode.get_by(hostname=hostname)
        return node.plc_node_stats