Changeset 11513 in genesis

Timestamp:

Sep 30, 2012, 7:12:43 PM (12 years ago)

Author:

rick

Message:

Try to standardize interface creating and editing via CLI.

File:

• tools/node-editor (modified) (5 diffs)

tools/node-editor

@@ -20 +20 @@
 def rlprompt(prompt, prefill=''):
    ''' Get line with some boring default '''
+   prompt = "%s [%s]: " % (prompt, prefill)
    if DEBUG:
+     print prompt 
      return prefill
-   return raw_input("%s%s: " % (prompt, ' [' + str(prefill) + ']' if prefill else '')) or prefill
+   return raw_input(prompt) or prefill
 
 def rlinput(prompt, prefill=''):
    ''' Get line with some editable boring default '''
    if DEBUG:
+     print "%s [%s]:" % (prompt, prefill)
      return prefill
    readline.set_startup_hook(lambda: readline.insert_text(prefill))
@@ -45 +48 @@
 def rlinput_choices(prompt, choices, prefill=''):
   if DEBUG:
+    print '%s [%s]:' % (prompt, prefill)
     return prefill
   while True:
-    filtered_choices = [x for x in choices if (str(prefill).lower() in str(x).lower())]
+    filtered_choices = sorted(list(set([x for x in choices if (str(prefill).lower() in str(x).lower())])))
     if len(filtered_choices) == 1:
       return filtered_choices[0]
@@ -81 +85 @@
   datadump['master_ip'] = master_ip
 
-  if rlprompt("Add ath0 Accesspoint", "yes") == "yes":
+  def new_access_point():
     ifname = rlinput("Interface name", "ath0")
     datadump['iface_' + ifname] = {
@@ -95 +99 @@
     }
 
-  if_nr = 0
-  while rlprompt("Add Interlink", "yes") == "yes":
-    ifname = rlinput("Interface name", "vr%i" % if_nr)
-    if_nr = if_nr + 1
-    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")
+  newNode.if_nr = 0
+  def new_interlink(link_type='wireless', link_mode='station'):
+    ifname = rlinput("Interface name", "vr%i" % newNode.if_nr)
+    newNode.if_nr = newNode.if_nr + 1
     netmask = 28
-    print "Generating the Interlink IP range..."
-    link_network = getrange.get_ranges(True, netmask, 1)[0]
-
+    if link_mode == 'station':
+      remote = rlinput_choices("Create interlink with (remote host)", gformat.get_hostlist(),'Hybrid')
+      remote_datadump = gformat.get_yaml(remote)
+      print "Available remote interfaces:"
+      if_choices = []
+      for ifkey in remote_datadump['autogen_iface_keys']:
+        ifdump = remote_datadump[ifkey]
+        # Could only do this if all meta information is correct
+        #if link_type == 'wireless' and link_mode == 'station':
+        #  basedump = remote_datadump['iface_' + ifdump['autogen_ifbase']]
+        #  if not basedump.has_key('mode') or basedump['mode'] != 'ap-wds':
+        #    continue
+        if_choices.append(ifdump['autogen_ifbase'])
+        print " - %4s" % ifdump['autogen_ifbase'], '- %20s' % ifdump['ip'], '- %30s' % ifdump['comment'],
+        if ifdump.has_key('ssid'): 
+          print '-', ifdump['ssid']
+        else:
+          print ''
+      iface = rlinput_choices("Remote interface", if_choices)
+      ifdump = remote_datadump['iface_%s' % iface]
+
+      #make_alias = rlprompt("Create Alias", "no") == "yes"
+      link_network = gformat.network(ifdump['ip'])
+    elif link_mode == 'master':
+      remote = rlinput("Interlink is planned for (remote host)", 'Unused%s' % newNode.if_nr)
+      print "Generating the Interlink IP range..."
+      link_network = getrange.get_ranges(True, netmask, 1)[0]
+
+    print "Using Network %s/%s" % (gformat.showaddr(link_network), netmask) 
+
+    # XXX: Create remote linking
+    # XXX: This does not handle IP pools
+
+    # Common part
     datadump['iface_%s' % ifname] = {
       'comment': rlinput(" - Comment", "Link naar " + remote),
       'sdesc': rlinput(" - Short Description", "2" + remote),
-      'ssid': rlinput(" - SSID", 'il-X.wleiden.net'),
+      'type': "eth",
+      'status': 'up',
       'dhcp': 'False',
-      'mode': "ap-wds",
-      'ip': rlinput(" - IP", getrange.showaddr(link_network + 1) + "/" + str(netmask)),
-      'type': "eth",
-      'ns_ip': rlinput(" - NS IP", getrange.showaddr(link_network + 2) + "/" + str(netmask)),
-      'ns_mac': rlinput(" - NS MAC", "00:27:22:"),
-      'bridge_type': rlinput(' - Bridge Type', 'NanoStation5M'),
-      'status': 'up',
     }
-    break
-
+    if link_type == 'wireless':
+      compass = rlprompt("Compass direction", 'n')
+      datadump['iface_%s' % ifname].update({
+        'ns_mac': rlinput(" - NS MAC", "00:27:22:"),
+        'bridge_type': rlinput(' - Bridge Type', 'NanoStation5M'),
+        'compass': compass,
+      })
+      if link_mode == 'master':
+        datadump['iface_%s' % ifname].update({
+          'ssid': rlinput(" - SSID", 'il-%s.%s.wleiden.net' % (compass, datadump['nodename'])),
+          'ip': rlinput(" - IP", getrange.showaddr(link_network + 1) + "/" + str(netmask)),
+          'ns_ip': rlinput(" - NS IP", getrange.showaddr(link_network + 2) + "/" + str(netmask)),
+          'mode': "ap-wds",
+        })
+      elif link_mode == 'station':
+        datadump['iface_%s' % ifname].update({
+          'ssid': rlinput(" - SSID", ifdump['ssid']),
+          'ip': rlinput(" - IP", getrange.showaddr(link_network + 3) + "/" + str(netmask)),
+          'ns_ip': rlinput(" - NS IP", getrange.showaddr(link_network + 4) + "/" + str(netmask)),
+          'mode': "station-wds",
+        })
+    elif link_type == 'wired':
+      if link_mode == 'master':
+        datadump['iface_%s' % ifname].update({
+          'ip': rlinput(" - IP", getrange.showaddr(link_network + 1) + "/" + str(netmask)),
+        })
+      elif link_mode == 'station':
+        datadump['iface_%s' % ifname].update({
+          'ip': rlinput(" - IP", getrange.showaddr(link_network + 2) + "/" + str(netmask)),
+        })
+
+  def printMenu(): 
+    print '''\
+==========================================
+ Create Interfaces
+  
+  1) New Accesspoint (ath0)
+  2) New Wired Interlink (station)
+  3) New Wired Interlink (master)
+  4) New Wireless Interlink (station)
+  5) New Wireless Interlink (master)
+  9) Finish and Save
+==========================================
+  '''
+
+  choice = 5
+  while choice != 9:
+    printMenu()
+    choice = int(rlprompt("Choice", choice))
+    if choice == 1:
+      new_access_point()
+    elif choice == 2:
+      new_interlink('wired', 'station')
+    elif choice == 3:
+      new_interlink('wired', 'master')
+    elif choice == 4:
+      new_interlink('wireless', 'station')
+    elif choice == 5:
+      new_interlink('wireless', 'master')
+    else:
+      print "Invalid choice!"
+
+  # Output final result
   print datadump
+
   #os.mkdir(datadump['autogen_item'])
   #gformat.store_yaml(datadump)
@@ -137 +217 @@
 if __name__ == '__main__':
   def printMenu(): 
-    print '''Node File Editor by Rick van der Zwet
+    print '''\
+==========================================
+Node File Editor by Rick van der Zwet
   
   1) New Node
   9) Quit
+==========================================
   '''