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

diff --git a/monitor/wrapper/plccache.py b/monitor/wrapper/plccache.py
index 75ca49b..78e0500 100755
--- a/monitor/wrapper/plccache.py
+++ b/monitor/wrapper/plccache.py
@@ -62,6 +62,9 @@ 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
@@ -70,20 +73,28 @@ def init():
 	global plcdb_id2lb
 	print "initing plccache"
 
+	print "collecting plcsites"
 	dbsites = PlcSite.query.all()
 	l_sites = [ s.plc_site_stats for s in dbsites ]
 
-	print "plcnode"
+	print "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 "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 "building id2lb"
 	(d_sites,id2lb) = dsites_from_lsites(l_sites)
-	print "dsn_from_dsln"
+	print "building lb2hn"
 	(plcdb, hn2lb, lb2hn) = dsn_from_dsln(d_sites, id2lb, l_nodes)
 
 	plcdb_hn2lb = hn2lb
@@ -137,9 +148,9 @@ 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"
@@ -154,11 +165,15 @@ def sync():
 
 	print "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 "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"
@@ -169,6 +184,7 @@ def sync():
 		dbnode.plc_node_stats = node
 	deleteExtra(l_nodes, PlcNode, 'hostname', 'hostname')
 	deleteExtra(l_nodes, HistoryNodeRecord, 'hostname', 'hostname')
+	deleteExtra(l_nodes, FindbadNodeRecord, 'hostname', 'hostname')
 	session.flush()
 
 	init()
@@ -176,6 +192,6 @@ def sync():
 	return
 
 if __name__ == '__main__':
-	profile.run('sync()')
+	sync()
 else:
 	init()