handle hostname changes

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

diff --git a/monitor/wrapper/plccache.py b/monitor/wrapper/plccache.py
index de054dc..dbfb7e0 100755 (executable)
--- a/monitor/wrapper/plccache.py
+++ b/monitor/wrapper/plccache.py
@@ -31,7 +31,7 @@ def dsn_from_dsln(d_sites, id2lb, l_nodes):
                if node['site_id'] in id2lb.keys():
                        login_base = id2lb[node['site_id']]
                else:
-                       print "%s has a foreign site_id %s" % (node['hostname'], 
+                       print >>sys.stderr, "%s has a foreign site_id %s" % (node['hostname'], 
                                                                                                        node['site_id'])
                        continue
                        for i in id2lb:
@@ -62,28 +62,39 @@ plcdb_lb2hn = None
 plcdb_id2lb = None
 
 def init():
+       import traceback
+       #print "IMPORTING PLCCACHE: ",
+       #traceback.print_stack()
        global l_sites
        global l_nodes
        global l_pcus
        global plcdb_hn2lb
        global plcdb_lb2hn
        global plcdb_id2lb
-       print "initing plccache"
+       print >>sys.stderr, "initing plccache"
 
+       print >>sys.stderr, "collecting plcsites"
        dbsites = PlcSite.query.all()
        l_sites = [ s.plc_site_stats for s in dbsites ]
 
-       print "plcnode"
+       print >>sys.stderr, "collecting plcnodes"
        dbnodes = PlcNode.query.all()
        l_nodes = [ s.plc_node_stats for s in dbnodes ]
 
-       print "plcpcu"
-       dbpcus = PlcPCU.query.all()
-       l_pcus = [ s.plc_pcu_stats for s in dbpcus ]
-
-       print "dsites_from_lsites"
+       print >>sys.stderr, "collecting plcpcus"
+       dbpcus = PlcPCU2.query.all()
+       l_pcus = []
+       for s in dbpcus:
+               pcu = {}
+               for k in ['username', 'protocol', 'node_ids', 'ip', 
+                                 'pcu_id', 'hostname', 'site_id', 'notes', 
+                                 'model', 'password', 'ports']:
+                       pcu[k] = getattr(s, k)
+               l_pcus.append(pcu)
+
+       print >>sys.stderr, "building id2lb"
        (d_sites,id2lb) = dsites_from_lsites(l_sites)
-       print "dsn_from_dsln"
+       print >>sys.stderr, "building lb2hn"
        (plcdb, hn2lb, lb2hn) = dsn_from_dsln(d_sites, id2lb, l_nodes)
 
        plcdb_hn2lb = hn2lb
@@ -127,7 +138,7 @@ def deleteExtra(l_plc, objectClass=PlcSite, dbKey='loginbase', plcKey='login_bas
        plcobj_key = [ s[plcKey] for s in l_plc ]
        extra_key = set(dbobj_key) - set(plcobj_key)
        for obj in extra_key:
-               print "deleting %s" % obj
+               print >>sys.stderr, "deleting %s" % obj
                dbobj = objectClass.get_by(**{dbKey : obj})
                dbobj.delete()
 
@@ -137,12 +148,12 @@ def sync():
                                                'longitude', 'max_slices', 'slice_ids', 'node_ids', 
                                                'enabled', 'date_created' ])
        l_nodes = plc.api.GetNodes({'peer_id':None}, 
-                                               ['hostname', 'node_id', 'ports', 'site_id', 'boot_state',
+                                               ['hostname', 'node_id', 'ports', 'site_id', 'boot_state', 'run_level',
                                                 'version', 'last_updated', 'date_created', 'key',
                                                 'last_contact', 'pcu_ids', 'interface_ids'])
        l_pcus = plc.api.GetPCUs()
 
-       print "sync sites"
+       print >>sys.stderr, "sync sites"
        for site in l_sites:
                dbsite = PlcSite.findby_or_create(site_id=site['site_id'])
                dbsite.loginbase = site['login_base']
@@ -152,23 +163,28 @@ def sync():
        deleteExtra(l_sites, HistorySiteRecord, 'loginbase', 'login_base')
        session.flush()
 
-       print "sync pcus"
+       print >>sys.stderr, "sync pcus"
        for pcu in l_pcus:
-               dbpcu = PlcPCU.findby_or_create(pcu_id=pcu['pcu_id'])
+               dbpcu = PlcPCU2.findby_or_create(pcu_id=pcu['pcu_id'])
                dbpcu.date_checked = datetime.now()
-               dbpcu.plc_pcu_stats = pcu
-       deleteExtra(l_pcus, PlcPCU, 'pcu_id', 'pcu_id')
+               for key in pcu.keys():
+                       print >>sys.stderr, "setting %s  = %s" % (key, pcu[key])
+                       setattr(dbpcu, key, pcu[key])
+
+       deleteExtra(l_pcus, PlcPCU2, 'pcu_id', 'pcu_id')
        deleteExtra(l_pcus, HistoryPCURecord, 'plc_pcuid', 'pcu_id')
        deleteExtra(l_pcus, FindbadPCURecord, 'plc_pcuid', 'pcu_id')
        session.flush()
 
-       print "sync nodes"
+       print >>sys.stderr, "sync nodes"
        for node in l_nodes:
                dbnode = PlcNode.findby_or_create(node_id=node['node_id'])
                dbnode.hostname = node['hostname']
                dbnode.date_checked = datetime.now()
                dbnode.plc_node_stats = node
-       deleteExtra(l_nodes, PlcNode, 'hostname', 'hostname')
+       deleteExtra(l_nodes, PlcNode, 'node_id', 'node_id')
+       deleteExtra(l_nodes, HistoryNodeRecord, 'plc_nodeid', 'node_id')
+        deleteExtra(l_nodes, PlcNode, 'hostname', 'hostname')
        deleteExtra(l_nodes, HistoryNodeRecord, 'hostname', 'hostname')
        deleteExtra(l_nodes, FindbadNodeRecord, 'hostname', 'hostname')
        session.flush()