Changeset 10907 in genesis

Timestamp:

May 18, 2012, 10:30:26 PM (13 years ago)

Author:

rick

Message:

Make the motd output look more pretty.

While here: Sync up motd processing quite a bit, by removing the heavy duplicate call to
rc_conf_local.

File:

• tools/gformat.py (modified) (3 diffs)

tools/gformat.py

@@ -526 +526 @@
 
 
+interface_list_cache = {}
+def make_interface_list(datadump):
+  if interface_list_cache.has_key(datadump['autogen_item']):
+    return (interface_list_cache[datadump['autogen_item']])
+  # lo0 configuration:
+  # - 172.32.255.1/32 is the proxy.wleiden.net deflector
+  # - masterip is special as it needs to be assigned to at
+  #   least one interface, so if not used assign to lo0
+  addrs_list = { 'lo0' : [("127.0.0.1/8", "LocalHost"), ("172.31.255.1/32","Proxy IP")] }
+  dhclient_if = {'lo0' : False}
+
+  # XXX: Find some way of send this output nicely
+  output = ''
+
+  masterip_used = False
+  for iface_key in datadump['autogen_iface_keys']:
+    if datadump[iface_key]['ip'].startswith(datadump['masterip']):
+      masterip_used = True
+      break
+  if not masterip_used:
+    addrs_list['lo0'].append((datadump['masterip'] + "/32", 'Master IP Not used in interface'))
+
+  for iface_key in datadump['autogen_iface_keys']:
+    ifacedump = datadump[iface_key]
+    ifname = ifacedump['autogen_ifname']
+
+    # Flag dhclient is possible
+    dhclient_if[ifname] = dhcp_type(ifacedump) == DHCP_CLIENT
+
+    # Add interface IP to list
+    item = (ifacedump['ip'], ifacedump['comment'])
+    if addrs_list.has_key(ifname):
+      addrs_list[ifname].append(item)
+    else:
+      addrs_list[ifname] = [item]
+
+    # Alias only needs IP assignment for now, this might change if we
+    # are going to use virtual accesspoints
+    if "alias" in iface_key:
+      continue
+
+    # XXX: Might want to deduct type directly from interface name
+    if ifacedump['type'] in ['11a', '11b', '11g', 'wireless']:
+      # Default to station (client) mode
+      ifacedump['autogen_wlanmode'] = "sta"
+      if ifacedump['mode'] in ['master', 'master-wds', 'ap', 'ap-wds']:
+        ifacedump['autogen_wlanmode'] = "ap"
+      # Default to 802.11b mode
+      ifacedump['mode'] = '11b'
+      if ifacedump['type'] in ['11a', '11b' '11g']:
+        ifacedump['mode'] = ifacedump['type']
+
+      if not ifacedump.has_key('channel'):
+        if ifacedump['type'] == '11a':
+          ifacedump['channel'] = 36
+        else:
+          ifacedump['channel'] = 1
+
+      # Allow special hacks at the back like wds and stuff
+      if not ifacedump.has_key('extra'):
+        ifacedump['autogen_extra'] = 'regdomain ETSI country NL'
+      else:
+        ifacedump['autogen_extra'] = ifacedump['extra']
+        
+      output += "wlans_%(autogen_ifbase)s='%(autogen_ifname)s'\n" % ifacedump
+      output += ("create_args_%(autogen_ifname)s='wlanmode %(autogen_wlanmode)s mode " +\
+        "%(mode)s ssid %(ssid)s %(autogen_extra)s channel %(channel)s'\n") % ifacedump
+
+    elif ifacedump['type'] in ['ethernet', 'eth']:
+      # No special config needed besides IP
+      pass
+    else:
+      assert False, "Unknown type " + ifacedump['type']
+
+  store = (addrs_list, dhclient_if, output)
+  interface_list_cache[datadump['autogen_item']] = store
+  return(store)
+
+
+
 ileiden_proxies = []
 normal_proxies = []
 rc_conf_local_cache = {}
-
 def generate_rc_conf_local(datadump):
   """ Generate configuration file '/etc/rc.conf.local' """
@@ -690 +769 @@
 """)
 
-  # lo0 configuration:
-  # - 172.32.255.1/32 is the proxy.wleiden.net deflector
-  # - masterip is special as it needs to be assigned to at
-  #   least one interface, so if not used assign to lo0
-  addrs_list = { 'lo0' : [("127.0.0.1/8", "LocalHost"), ("172.31.255.1/32","Proxy IP")] }
-  iface_map = {'lo0' : 'lo0'}
-  dhclient_if = {'lo0' : False}
-
-  masterip_used = False
-  for iface_key in datadump['autogen_iface_keys']:
-    if datadump[iface_key]['ip'].startswith(datadump['masterip']):
-      masterip_used = True
-      break
-  if not masterip_used:
-    addrs_list['lo0'].append((datadump['masterip'] + "/32", 'Master IP Not used in interface'))
-
-  for iface_key in datadump['autogen_iface_keys']:
-    ifacedump = datadump[iface_key]
-    ifname = ifacedump['autogen_ifname']
-
-    # Flag dhclient is possible
-    dhclient_if[ifname] = dhcp_type(ifacedump) == DHCP_CLIENT
-
-    # Add interface IP to list
-    item = (ifacedump['ip'], ifacedump['comment'])
-    if addrs_list.has_key(ifname):
-      addrs_list[ifname].append(item)
-    else:
-      addrs_list[ifname] = [item]
-
-    # Alias only needs IP assignment for now, this might change if we
-    # are going to use virtual accesspoints
-    if "alias" in iface_key:
-      continue
-
-    # XXX: Might want to deduct type directly from interface name
-    if ifacedump['type'] in ['11a', '11b', '11g', 'wireless']:
-      # Default to station (client) mode
-      ifacedump['autogen_wlanmode'] = "sta"
-      if ifacedump['mode'] in ['master', 'master-wds', 'ap', 'ap-wds']:
-        ifacedump['autogen_wlanmode'] = "ap"
-      # Default to 802.11b mode
-      ifacedump['mode'] = '11b'
-      if ifacedump['type'] in ['11a', '11b' '11g']:
-        ifacedump['mode'] = ifacedump['type']
-
-      if not ifacedump.has_key('channel'):
-        if ifacedump['type'] == '11a':
-          ifacedump['channel'] = 36
-        else:
-          ifacedump['channel'] = 1
-
-      # Allow special hacks at the back like wds and stuff
-      if not ifacedump.has_key('extra'):
-        ifacedump['autogen_extra'] = 'regdomain ETSI country NL'
-      else:
-        ifacedump['autogen_extra'] = ifacedump['extra']
-        
-
-      output += "wlans_%(autogen_ifbase)s='%(autogen_ifname)s'\n" % ifacedump
-      output += ("create_args_%(autogen_ifname)s='wlanmode %(autogen_wlanmode)s mode " +\
-        "%(mode)s ssid %(ssid)s %(autogen_extra)s channel %(channel)s'\n") % ifacedump
-
-    elif ifacedump['type'] in ['ethernet', 'eth']:
-      # No special config needed besides IP
-      pass
-    else:
-      assert False, "Unknown type " + ifacedump['type']
+  (addrs_list, dhclient_if, extra_ouput) = make_interface_list(datadump)
+  output += extra_ouput
 
   # Print IP address which needs to be assigned over here
@@ -927 +940 @@
 """).render(datadump)
 
-  # XXX: This is a hacky way to get the required data
-  for line in generate_rc_conf_local(datadump).split('\n'):
-    if '||' in line and not line[1:].split()[0] in ['lo0', 'ath0'] :
-      output += " - %s \n" % line[1:] 
+  (addrs_list, dhclient_if, extra_ouput) = make_interface_list(datadump)
+  # Just nasty hack to make the formatting looks nice
+  iface_len = max(map(len,addrs_list.keys()))
+  addr_len = max(map(len,[x[0] for x in [x[0] for x in addrs_list.values()]]))
+  for iface,addrs in sorted(addrs_list.iteritems()):
+    if iface in ['lo0']:
+      continue
+    for addr, comment in sorted(addrs,key=lambda x: parseaddr(x[0].split('/')[0])):
+      output += " - %s || %s || %s\n" % (iface.ljust(iface_len), addr.ljust(addr_len), comment)
+
+  output += '\n'
   output += """\
 Attached bridges:
 """
+  has_item = False
   for iface_key in datadump['autogen_iface_keys']:
     ifacedump = datadump[iface_key]
     if ifacedump.has_key('ns_ip'):
+      has_item = True
       output += " - %(autogen_ifname)s || %(mode)s || %(ns_ip)s\n" % ifacedump
+  if not has_item:
+    output += " - none\n"
 
   return output