X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fplccache.py;h=3ddf6f24e20a180aef41c197ef6d6e44ead36ef1;hb=82a17d43e5329fea99340b25dfda4ec646ea1095;hp=fea4c7234a8425230c54bd29d637260eff00a73c;hpb=3f2acbd8b7761dae4bb02fedd3557e1003cafb43;p=monitor.git diff --git a/monitor/wrapper/plccache.py b/monitor/wrapper/plccache.py index fea4c72..3ddf6f2 100755 --- 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 "%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 @@ -63,24 +17,25 @@ plcdb_id2lb = None def init(): import traceback - print "IMPORTING PLCCACHE: ", - traceback.print_stack() + #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" + print >>sys.stderr, "collecting plcpcus" dbpcus = PlcPCU2.query.all() l_pcus = [] for s in dbpcus: @@ -90,11 +45,10 @@ def init(): 'model', 'password', 'ports']: pcu[k] = getattr(s, k) l_pcus.append(pcu) - #l_pcus = [ s.plc_pcu_stats for s in dbpcus ] - print "dsites_from_lsites" - (d_sites,id2lb) = dsites_from_lsites(l_sites) - print "dsn_from_dsln" + print >>sys.stderr, "building id2lb" + (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) plcdb_hn2lb = hn2lb @@ -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 @@ -138,7 +93,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() @@ -148,12 +103,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'] @@ -163,12 +118,12 @@ 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 = PlcPCU2.findby_or_create(pcu_id=pcu['pcu_id']) dbpcu.date_checked = datetime.now() for key in pcu.keys(): - print "setting %s = %s" % (key, pcu[key]) + print >>sys.stderr, "setting %s = %s" % (key, pcu[key]) setattr(dbpcu, key, pcu[key]) deleteExtra(l_pcus, PlcPCU2, 'pcu_id', 'pcu_id') @@ -176,13 +131,15 @@ def sync(): 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()