X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fplccache.py;h=fea4c7234a8425230c54bd29d637260eff00a73c;hb=3f2acbd8b7761dae4bb02fedd3557e1003cafb43;hp=dc62d0dddb9149bb1cd9572d87d6a1b271967bf3;hpb=334378a14103c3fd02332b6ce3767553f1fe11d2;p=monitor.git

diff --git a/monitor/wrapper/plccache.py b/monitor/wrapper/plccache.py
index dc62d0d..fea4c72 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
@@ -78,8 +81,16 @@ def init():
 	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 ]
+	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)
+	#l_pcus = [ s.plc_pcu_stats for s in dbpcus ]
 
 	print "dsites_from_lsites"
 	(d_sites,id2lb) = dsites_from_lsites(l_sites)
@@ -139,7 +150,7 @@ def sync():
 	l_nodes = plc.api.GetNodes({'peer_id':None}, 
 						['hostname', 'node_id', 'ports', 'site_id', 'boot_state',
 						 '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,10 +165,13 @@ 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()