X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fplccache.py;h=524b045fbf7d300b497736a98aac62fd9fd40794;hb=1b7c976ee5db56ce00ee045768283db1a07f3571;hp=75ca49b35ce19e07bcd33b86d55637deca7b4d3a;hpb=6a452e8ece2ca8a47105c128eaebc38507bc76c5;p=monitor.git

diff --git a/monitor/wrapper/plccache.py b/monitor/wrapper/plccache.py
index 75ca49b..524b045 100755
--- a/monitor/wrapper/plccache.py
+++ b/monitor/wrapper/plccache.py
@@ -5,7 +5,29 @@ from monitor.wrapper import plc
 from monitor.database.info.model import *
 import profile
 
+def d_from_l(l, key):
+	d = {}
+	for obj in l:
+		if not str(obj[key]) in d:
+			d[str(obj[key])] = obj
+		else:
+			print "Two objects have the same %s key %s!" % (key, obj[key])
+			continue
+	return d
+
+def dpcus_from_lpcus(l_pcus):
+	d_pcus = d_from_l(l_pcus, 'pcu_id')
+	return d_pcus
+
+def dnodes_from_lnodes(l_nodes):
+	d_nodes = d_from_l(l_nodes, 'hostname')
+	return d_nodes
+
 def dsites_from_lsites(l_sites):
+	d_sites = d_from_l(l_sites, 'login_base')
+	return d_sites 
+
+def dsites_from_lsites_id(l_sites):
 	d_sites = {}
 	id2lb = {}
 	for site in l_sites:
@@ -31,7 +53,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 +84,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"
-	(d_sites,id2lb) = dsites_from_lsites(l_sites)
-	print "dsn_from_dsln"
+	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_id(l_sites)
+	print >>sys.stderr, "building lb2hn"
 	(plcdb, hn2lb, lb2hn) = dsn_from_dsln(d_sites, id2lb, l_nodes)
 
 	plcdb_hn2lb = hn2lb
@@ -104,6 +137,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
 
@@ -127,7 +161,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 +171,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', 'nodenetwork_ids'])
+						 '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 +186,30 @@ 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()
 
 	init()
@@ -176,6 +217,6 @@ def sync():
 	return
 
 if __name__ == '__main__':
-	profile.run('sync()')
+	sync()
 else:
 	init()