changes for 3.0

[monitor.git] / syncplcdb.py

diff --git a/syncplcdb.py b/syncplcdb.py
index b0e42a6..6d28e34 100755 (executable)
--- a/syncplcdb.py
+++ b/syncplcdb.py
@@ -1,12 +1,10 @@
 #!/usr/bin/python
 
 import plc
-from config import config
-import soltesz
+import config
+import database
 import sys
 
-config = config()
-
 def dsites_from_lsites(l_sites):
        d_sites = {}
        id2lb = {}
@@ -53,10 +51,10 @@ def dsn_from_dsln(d_sites, id2lb, l_nodes):
 def create_netid2ip(l_nodes, l_nodenetworks):
        netid2ip = {}
        for node in l_nodes:
-               for netid in node['nodenetwork_ids']:
+               for netid in node['interface_ids']:
                        found = False
                        for nn in l_nodenetworks:
-                               if nn['nodenetwork_id'] == netid:
+                               if nn['interface_id'] == netid:
                                        found = True
                                        netid2ip[netid] = nn['ip']
                        if not found:
@@ -75,7 +73,7 @@ def create_plcdb():
 
        # get nodes at each site, and 
        l_nodes = plc.getNodes({'peer_id':None}, ['hostname', 'node_id', 'ports', 'site_id', 'version', 
-                                                 'last_updated', 'date_created', 'last_contact', 'pcu_ids', 'nodenetwork_ids'])
+                                                 'last_updated', 'date_created', 'last_contact', 'pcu_ids', 'interface_ids'])
 
        l_nodenetworks = plc.getNodeNetworks()
        (plcdb, hn2lb, lb2hn) = dsn_from_dsln(d_sites, id2lb, l_nodes)
@@ -88,12 +86,12 @@ def create_plcdb():
 
        if ('cachenodes' in dir(config) and config.cachenodes) or \
                'cachenodes' not in dir(config):
-               soltesz.dbDump("plcdb_hn2lb", hn2lb)
-               soltesz.dbDump("plcdb_lb2hn", lb2hn)
-               soltesz.dbDump("plcdb_netid2ip", netid2ip)
-               soltesz.dbDump("l_plcnodenetworks", l_nodenetworks)
-               soltesz.dbDump("l_plcnodes", l_nodes)
-               soltesz.dbDump("l_plcsites", l_sites)
+               database.dbDump("plcdb_hn2lb", hn2lb)
+               database.dbDump("plcdb_lb2hn", lb2hn)
+               database.dbDump("plcdb_netid2ip", netid2ip)
+               database.dbDump("l_plcnodenetworks", l_nodenetworks)
+               database.dbDump("l_plcnodes", l_nodes)
+               database.dbDump("l_plcsites", l_sites)
        
        return l_nodes