Changeset 10281 in genesis

Timestamp:

Mar 27, 2012, 7:19:06 AM (13 years ago)

Author:

rick

Message:

Make the default node page a bit more usefull for daily usage.

File:

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

tools/gformat.py

@@ -32 +32 @@
 import rdnap
 from pprint import pprint
+from collections import defaultdict
 try:
   import yaml
@@ -75 +76 @@
 
 
-def make_graph():
+def make_relations():
   """ Process _ALL_ yaml files to get connection relations """
   errors = ""
-  poel = {}
+  poel = defaultdict(list)
   for host in get_hostlist():
     try:
@@ -92 +93 @@
         addr = parseaddr(addr)
         mask = int(mask)
-        addr = addr & ~((1 << (32 - mask)) - 1)
-        if poel.has_key(addr): 
-          poel[addr] += [host]
-        else: 
-          poel[addr] = [host]
+        network = addr & ~((1 << (32 - mask)) - 1)
+        poel[network] += [(host,datadump[iface_key])]
     except (KeyError, ValueError), e:
       errors += "[FOUT] in '%s' interface '%s'" % (host,iface_key) 
@@ -234 +232 @@
   # Generate and connection listing
   output += "<h2>Connected To:</h2><ul>"
-  (poel, errors) = make_graph()
-  for addr, hosts in poel.iteritems():
-    if host in hosts and len(hosts) > 1:
-      for remote in [x for x in hosts if x != host]:
-        params = { 'remote': remote}
-        output += '<li><a href="%(remote)s">%(remote)s</a></li>\n' % params
+  (poel, errors) = make_relations()
+  for network, hosts in poel.iteritems():
+    if host in [x[0] for x in hosts]:
+      if len(hosts) == 1:
+        # Single not connected interface
+        continue
+      for remote,ifacedump in hosts:
+        if remote == host: 
+          # This side of the interface
+          continue
+        params = { 'remote': remote, 'remote_ip' : ifacedump['ip'] }
+        output += '<li><a href="%(remote)s">%(remote)s</a> -- %(remote_ip)s</li>\n' % params
   output += "</ul>"
+  output += "<h2>MOTD details:</h2><pre>" + generate_motd(datadump) + "</pre>"
 
   output += "<hr /><em><a href='..'>Back to overview</a></em>"
@@ -305 +310 @@
   \n""" % datadump
 
-  for iface_key in datadump['iface_keys']:
+  for iface_key in datadump['autogen_iface_keys']:
     if not datadump[iface_key].has_key('comment'):
       datadump[iface_key]['comment'] = None
@@ -408 +413 @@
 
   masterip_used = False
-  for iface_key in datadump['iface_keys']:
+  for iface_key in datadump['autogen_iface_keys']:
     if datadump[iface_key]['ip'].startswith(datadump['masterip']):
       masterip_used = True
@@ -415 +420 @@
     addrs_list['lo0'].append((datadump['masterip'] + "/32", 'Master IP Not used in interface'))
 
-  for iface_key in datadump['iface_keys']:
+  for iface_key in datadump['autogen_iface_keys']:
     ifacedump = datadump[iface_key]
     ifname = ifacedump['autogen_ifname']
@@ -479 +484 @@
   f = open(gfile, 'r')
   datadump = yaml.load(f,Loader=Loader)
+  f.close()
+
+  # Preformat certain needed variables for formatting and push those into special object
   datadump['autogen_iface_keys'] = get_interface_keys(datadump)
 
@@ -489 +497 @@
       datadump[key]['autogen_ifname'] = datadump[key]['interface'].split(':')[0]
 
-
   dhcp_interfaces = [datadump[key]['autogen_ifname'] for key in datadump['autogen_iface_keys'] if datadump[key]['dhcp'] != 'no']
   datadump['autogen_dhcp_interfaces'] = ' '.join(dhcp_interfaces)
   datadump['autogen_item'] = item
   datadump['autogen_fqdn'] = get_fqdn(datadump)
-  f.close()
-
+
+  datadump['autogen_domain'] = datadump['domain'] if datadump.has_key('domain') else 'wleiden.net'
+  datadump['autogen_nodename_lower'] = datadump['nodename'].lower()
   return datadump
+
 
 def store_yaml(datadump, header=False):
@@ -665 +674 @@
       datadump = get_yaml(node)
 
-    # Preformat certain needed variables for formatting and push those into special object
-    datadump_extra = copy.deepcopy(datadump)
-    if not datadump_extra.has_key('domain'):
-      datadump_extra['domain'] = 'wleiden.net'
-    datadump_extra['nodename_lower'] = datadump_extra['nodename'].lower()
-    datadump_extra['iface_keys'] = sorted([elem for elem in datadump.keys() if elem.startswith('iface_')])
-
     if config == 'wleiden.yaml':
       output += generate_wleiden_yaml(datadump)
@@ -679 +681 @@
       f.close()
     elif config == 'dnsmasq.conf':
-      output += generate_dnsmasq_conf(datadump_extra)
+      output += generate_dnsmasq_conf(datadump)
     elif config == 'rc.conf.local':
-      output += generate_rc_conf_local(datadump_extra)
+      output += generate_rc_conf_local(datadump)
     elif config == 'resolv.conf':
-      output += generate_resolv_conf(datadump_extra)
+      output += generate_resolv_conf(datadump)
     elif config == 'motd':
-      output += generate_motd(datadump_extra)
+      output += generate_motd(datadump)
     else:
       assert False, "Config not found!"