X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=inline;f=nagios%2Fplc2nagios.py;h=de74d424858535eab3f185caba592e036ba8e18a;hb=16b7bc48471b0695e72320fbcf761db695af032e;hp=b5023f26425a1a455948572646dcf82742a4f315;hpb=d5b0651a666c9a6b2deb4103ed15c3c06075395d;p=monitor.git

diff --git a/nagios/plc2nagios.py b/nagios/plc2nagios.py
index b5023f2..de74d42 100755
--- a/nagios/plc2nagios.py
+++ b/nagios/plc2nagios.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
-import soltesz
-import plc
+import database
 
 class NagiosObject(object):
 	trans = {'d2_coords': '2d_coords'}
@@ -69,9 +68,9 @@ globalhost = [Host(	name="planetlab-host",
 for obj in globalhost + globalservices:
 	print obj.toString()
 
-plcdb = soltesz.dbLoad("l_plcsites")
-netid2ip = soltesz.dbLoad("plcdb_netid2ip")
-lb2hn = soltesz.dbLoad("plcdb_lb2hn")
+plcdb = database.dbLoad("l_plcsites")
+netid2ip = database.dbLoad("plcdb_netid2ip")
+lb2hn = database.dbLoad("plcdb_lb2hn")
 
 for site in plcdb:
 	shortname = site['abbreviated_name']
@@ -87,7 +86,7 @@ for site in plcdb:
 		lat_y = int(180 - (lat + 90)) * scale
 
 	if site['login_base'] in lb2hn:
-		nodes = lb2hn[site['login_base']] # plc.getSiteNodes2(site['login_base'])
+		nodes = lb2hn[site['login_base']]
 	else:
 		continue
 
@@ -98,10 +97,10 @@ for site in plcdb:
 
 	for node in nodes:
 		hn = node['hostname']
-		if len(node['nodenetwork_ids']) == 0:
+		if len(node['interface_ids']) == 0:
 			continue
 
-		ip = netid2ip[node['nodenetwork_ids'][0]]
+		ip = netid2ip[node['interface_ids'][0]]
 
 		if lon_x is not -1 and lat_y is not -1:
 			coords="%s,%s" % (lon_x, lat_y)