X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fplccache.py;h=0645b186840161674f878bf1606fcf9500c5e0f7;hb=1aa6b24594dc485d7232649c50e9773956a1492f;hp=db71b16917b709cddc76394c957b557530e86606;hpb=924b7e5c530ecf25d4c5b002fa89ff73ef11f53c;p=monitor.git

diff --git a/monitor/wrapper/plccache.py b/monitor/wrapper/plccache.py
index db71b16..0645b18 100755
--- a/monitor/wrapper/plccache.py
+++ b/monitor/wrapper/plccache.py
@@ -2,8 +2,7 @@
 
 import sys
 from monitor.wrapper import plc
-from monitor import database
-from monitor import config
+from monitor.database.info.model import *
 
 def dsites_from_lsites(l_sites):
 	d_sites = {}
@@ -53,98 +52,107 @@ def dsn_from_dsln(d_sites, id2lb, l_nodes):
 		hn2lb[hostname] = login_base
 	return (dsn, hn2lb, lb2hn)
 
-def create_netid2ip(l_nodes, l_nodenetworks):
-	netid2ip = {}
-	for node in l_nodes:
-		for netid in node['nodenetwork_ids']:
-			found = False
-			for nn in l_nodenetworks:
-				if nn['nodenetwork_id'] == netid:
-					found = True
-					netid2ip[netid] = nn['ip']
-			if not found:
-				print "ERROR! %s" % node
-
-	return netid2ip
-
 l_sites = None
 l_nodes = None
 l_pcus = None
-l_nodenetworks = None
 
 plcdb_hn2lb = None
 plcdb_lb2hn = None
-plcdb_netid2ip = None
 plcdb_id2lb = None
 
 def init():
 	global l_sites
 	global l_nodes
 	global l_pcus
-	global l_nodenetworks
 	global plcdb_hn2lb
 	global plcdb_lb2hn
-	global plcdb_netid2ip
 	global plcdb_id2lb
 
-	api = plc.getCachedAuthAPI()
-	l_sites = api.GetSites({'peer_id':None}, 
-							['login_base', 'site_id', 'abbreviated_name', 'latitude', 
-							'longitude', 'max_slices', 'slice_ids', 'node_ids', 'enabled', 'date_created' ])
-	l_nodes = api.GetNodes({'peer_id':None}, 
-							['hostname', 'node_id', 'ports', 'site_id', 'version', 'last_updated', 
-							 'date_created', 'last_contact', 'pcu_ids', 'nodenetwork_ids'])
-	l_pcus = api.GetPCUs()
-	l_nodenetworks = api.GetNodeNetworks()
+	dbsites = PlcSite.query.all()
+	l_sites = [ s.plc_site_stats for s in dbsites ]
+
+	dbnodes = PlcNode.query.all()
+	l_nodes = [ s.plc_node_stats for s in dbnodes ]
+
+	dbpcus = PlcPCU.query.all()
+	l_pcus = [ s.plc_pcu_stats for s in dbpcus ]
 
 	(d_sites,id2lb) = dsites_from_lsites(l_sites)
 	(plcdb, hn2lb, lb2hn) = dsn_from_dsln(d_sites, id2lb, l_nodes)
-	netid2ip = create_netid2ip(l_nodes, l_nodenetworks)
 
 	plcdb_hn2lb = hn2lb
 	plcdb_lb2hn = lb2hn
-	plcdb_netid2ip = netid2ip
 	plcdb_id2lb = id2lb
 	
-	return l_nodes
-
-
-def create_plcdb():
-
-	# get sites, and stats
-	l_sites = plc.getSites({'peer_id':None}, ['login_base', 'site_id', 'abbreviated_name', 'latitude', 'longitude', 
-											  'max_slices', 'slice_ids', 'node_ids' ])
-	if len(l_sites) == 0:
-		print "no sites! exiting..."
-		sys.exit(1)
-	(d_sites,id2lb) = dsites_from_lsites(l_sites)
+	return
+
+def GetNodesByIds(ids):
+	ret = []
+	for node_id in ids:
+		node = PlcNode.get_by(node_id=node_id)
+		ret.append(node.plc_node_stats)
+	return ret
+
+def GetNodesBySite(loginbase):
+	site = PlcSite.get_by(loginbase=loginbase)
+	return GetNodesByIds(site.plc_site_stats['node_ids'])
+
+def GetNodeByName(hostname):
+	node = PlcNode.get_by(hostname=hostname)
+	return node.plc_node_stats
+
+def GetSitesByName(sitelist):
+	ret = []
+	for site in sitelist:
+		site = PlcSite.get_by(loginbase=site)
+		ret.append(site.plc_site_stats)
+	return ret
+
+def sync():
+	l_sites = plc.api.GetSites({'peer_id':None}, 
+						['login_base', 'site_id', 'abbreviated_name', 'latitude', 
+						'longitude', 'max_slices', 'slice_ids', 'node_ids', 
+						'enabled', 'date_created' ])
+	l_nodes = plc.api.GetNodes({'peer_id':None}, 
+						['hostname', 'node_id', 'ports', 'site_id', 
+						 'version', 'last_updated', 'date_created', 
+						 'last_contact', 'pcu_ids', 'nodenetwork_ids'])
+	l_pcus = plc.api.GetPCUs()
+
+	print "sync sites"
+	for site in l_sites:
+		dbsite = PlcSite.findby_or_create(site_id=site['site_id'])
+		dbsite.loginbase = site['login_base']
+		dbsite.date_checked = datetime.now()
+		dbsite.plc_site_stats = site
+		#dbsite.flush()
+	# TODO: delete old records.
+	session.flush()
+
+	print "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
+		#dbnode.flush()
+	# TODO: delete old records.
+	session.flush()
+
+	print "sync pcus"
+	for pcu in l_pcus:
+		dbpcu = PlcPCU.findby_or_create(pcu_id=pcu['pcu_id'])
+		dbpcu.date_checked = datetime.now()
+		dbpcu.plc_pcu_stats = pcu
+		#dbpcu.flush()
+	# TODO: delete old records.
+	session.flush()
 
-	# 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'])
+	init()
 
-	l_nodenetworks = plc.getNodeNetworks()
-	(plcdb, hn2lb, lb2hn) = dsn_from_dsln(d_sites, id2lb, l_nodes)
-	netid2ip = create_netid2ip(l_nodes, l_nodenetworks)
-
-	# save information for future.
-	id2lb = id2lb
-	hn2lb = hn2lb
-	db = plcdb
-
-	if ('cachenodes' in dir(config) and config.cachenodes) or \
-		'cachenodes' not in dir(config):
-		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
+	return
 
 if __name__ == '__main__':
-	create_plcdb()
+	sync()
 else:
-	#print "calling plccache init()"
 	init()