merges from v2

[monitor.git] / tests / nodenetwork.py

diff --git a/tests/nodenetwork.py b/tests/nodenetwork.py
index 63d1700..baa64cd 100755 (executable)
--- a/tests/nodenetwork.py
+++ b/tests/nodenetwork.py
@@ -14,15 +14,15 @@ if len(sys.argv[1:]) > 0:
                        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 = util.file.getListFromFile('nnids.txt')
        nnids = [ int(i) for i in nnids]
@@ -31,7 +31,7 @@ else:
                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.GetInterfaces({'ip' : nn2['ip']})
                                if len(netlist) != 1: