X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodenetwork.py;h=baa64cd826dc5a27d40ac6922157797242fef9fb;hb=refs%2Fheads%2F1.0;hp=ec8d8697c72cad8f150b8758be056f32517175d8;hpb=c51ad794e8dc07072d705b508e79ba06849aa408;p=monitor.git

diff --git a/nodenetwork.py b/nodenetwork.py
index ec8d869..baa64cd 100755
--- a/nodenetwork.py
+++ b/nodenetwork.py
@@ -3,37 +3,37 @@
 import sys
 import plc
 api = plc.getAuthAPI()
-import config
+import util.file
 
 if len(sys.argv[1:]) > 0:
 	for host in sys.argv[1:]:
 		n = api.GetNodes(host)[0]
-		nn = api.GetNodeNetworks(n['nodenetwork_ids'])
+		nn = api.GetInterfaces(n['interface_ids'])
 		for nodenet in nn:
-			nnet2 = api.GetNodeNetworks({'ip': nodenet['ip']})
+			nnet2 = api.GetInterfaces({'ip': nodenet['ip']})
 			print "len of nn entries with ip: %s == %s " % ( nodenet['ip'], len(nnet2) )
 			for nn2 in nnet2:
 				n2 = api.GetNodes(nn2['node_id'])
-				print "\t%d node is attached to nodenetwork %s" % ( len(n2), nn2['nodenetwork_id'] )
+				print "\t%d node is attached to nodenetwork %s" % ( len(n2), nn2['interface_id'] )
 				if len(n2) != 0 :
 					n2 = n2[0]
 					print
 					#print "host %s : %s" % (n2['hostname'], n2['node_id'])
 				else:
 					pass
-					#print nn2['nodenetwork_id']
-					#api.DeleteNodeNetwork(nn2['nodenetwork_id'])
+					#print nn2['interface_id']
+					#api.DeleteNodeNetwork(nn2['interface_id'])
 else:
-	nnids = config.getListFromFile('nnids.txt')
+	nnids = util.file.getListFromFile('nnids.txt')
 	nnids = [ int(i) for i in nnids]
 	for id in nnids:
-		nnet2 = api.GetNodeNetworks(id)
+		nnet2 = api.GetInterfaces(id)
 		for nn2 in nnet2:
 			n2 = api.GetNodes(nn2['node_id'])
 			if len(n2) == 0 :
-				print "\t%d node is attached to nodenetwork %s %s" % ( len(n2), nn2['nodenetwork_id'] , nn2['ip']),
+				print "\t%d node is attached to nodenetwork %s %s" % ( len(n2), nn2['interface_id'] , nn2['ip']),
 
-				netlist = api.GetNodeNetworks({'ip' : nn2['ip']})
+				netlist = api.GetInterfaces({'ip' : nn2['ip']})
 				if len(netlist) != 1:
 					node_len = len([ n['node_id'] for n in netlist])
 					print "\t but, ip %s is used by %s nodenetwork entries" % (nn2['ip'], node_len)