Index: tools/node-editor
===================================================================
--- tools/node-editor	(revision 11506)
+++ tools/node-editor	(revision 11510)
@@ -59,5 +59,4 @@
     
 
-rlinput_choices("Test", gformat.get_hostlist())
 
 
@@ -100,8 +99,19 @@
     ifname = rlinput("Interface name", "vr%i" % if_nr)
     if_nr = if_nr + 1
-    remote = rlinput("Remote Node", "Unused")
+    remote = rlinput_choices("Create interlink", gformat.get_hostlist(),'HybridCeTIM2')
+    remote_datadump = gformat.get_yaml(remote)
+    print "Available remote interfaces:"
+    for ifkey in remote_datadump['autogen_iface_keys']:
+      ifdump = remote_datadump[ifkey]
+      print " - %4s" % ifdump['autogen_ifbase'], '- %30s' % ifdump['comment'],
+      if ifdump.has_key('ssid'): 
+        print '-', ifdump['ssid']
+      else:
+        print ''
+    iface = rlinput_choices("Interface Used", remote_datadump['autogen_iface_keys'], "vr1")
     netmask = 28
     print "Generating the Interlink IP range..."
     link_network = getrange.get_ranges(True, netmask, 1)[0]
+
     datadump['iface_%s' % ifname] = {
       'comment': rlinput(" - Comment", "Link naar " + remote),