Changeset 13403 in genesis

Timestamp:

Sep 20, 2015, 7:02:20 PM (9 years ago)

Author:

rick

Message:

Innitial support for vlan configurations, while here get rid of a) deprecated
ipv4_addrs_ notation and b) make debugging more easy on test runs.

File:

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

tools/gformat.py

@@ -214 +214 @@
       for key in get_interface_keys(datadump, True):
         datadump[key]['autogen_ifbase'] = key.split('_')[1]
+        datadump[key]['autogen_vlan'] = False
+
         datadump[key]['autogen_gateway'] = datadump[key]['ip'].split('/')[0]
         if datadump[key]['type'] in ['11a', '11b', '11g', 'wireless']:
@@ -219 +221 @@
           wlan_count += 1
         else:
-          datadump[key]['autogen_ifname'] = datadump[key]['autogen_ifbase']
+          datadump[key]['autogen_ifname'] = '_'.join(key.split('_')[1:])
+          if len(key.split('_')) > 2 and key.split('_')[2].isdigit():
+            datadump[key]['autogen_vlan'] = key.split('_')[2]
+
         datadump[key]['autogen_bridge'] = datadump[key]['autogen_ifbase'].startswith('bridge')
         if datadump[key]['autogen_bridge'] and not 'alias' in key:
           datadump[key]['autogen_bridge_interfaces'] = datadump[key]['members'].split()
-    except Exception as e:
+    except Exception:
       print "# Error while processing interface %s" % key
       raise
@@ -230 +235 @@
       if dhcp_type(datadump[key]) == DHCP_SERVER]
 
-    datadump['autogen_dhcp_interfaces'] = dhcp_interfaces
+    datadump['autogen_dhcp_interfaces'] = [x.replace('_','.') for x in dhcp_interfaces]
     datadump['autogen_item'] = item
 
@@ -237 +242 @@
     datadump['autogen_fqdn'] = datadump['autogen_realname'] + '.' + datadump['autogen_domain']
     datadump_cache[item] = datadump.copy()
-  except Exception as e:
+  except Exception:
     print "# Error while processing %s" % item
     raise
@@ -607 +612 @@
   #   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")] }
+  vlan_list = defaultdict(list)
   dhclient_if = {'lo0' : False}
 
@@ -623 +629 @@
     ifacedump = datadump[iface_key]
     ifname = ifacedump['autogen_ifname']
+
+    # If defined as vlan interface
+    if ifacedump['autogen_vlan']:
+      vlan_list[ifacedump['autogen_ifbase']].append(ifacedump['autogen_vlan'])
 
     # Flag dhclient is possible
@@ -675 +685 @@
       assert False, "Unknown type " + ifacedump['type']
 
-  store = (addrs_list, dhclient_if, output)
+  store = (addrs_list, vlan_list, dhclient_if, output)
   interface_list_cache[datadump['autogen_item']] = store
   return(store)
@@ -866 +876 @@
 """)
 
-  (addrs_list, dhclient_if, extra_ouput) = make_interface_list(datadump)
-  output += extra_ouput.strip() + "\n"
+  (addrs_list, vlan_list, dhclient_if, extra_ouput) = make_interface_list(datadump)
+  for iface, vlans in vlan_list.items():
+    output += 'vlans_%s="%s"\n' % (iface, ' '.join(vlans))
+
+  # Details like SSID
+  if extra_ouput:
+    output += extra_ouput.strip() + "\n"
 
   # Print IP address which needs to be assigned over here
@@ -886 +901 @@
         cmp=lambda x,y: cmp(1 if x == '172' else 0, 1 if y == '172' else 0)
       )
-    addr_str = " ".join([x[0] for x in addrs])
-    output += "ipv4_addrs_%s='%s'\n\n" % (iface, addr_str)
+    output += "ifconfig_%s='inet %s'\n" % (iface, addrs[0][0])
+    for idx, addr in enumerate(addrs[1:]):
+      output += "ifconfig_%s_alias%s='inet %s'\n" % (iface, idx, addr[0]) 
+    output += "\n"
 
   rc_conf_local_cache[datadump['autogen_item']] = output
   return output
-
 
 
@@ -947 +963 @@
 
 def get_neighbours(datadump):
-  (addrs_list, dhclient_if, extra_ouput) = make_interface_list(datadump)
+  (addrs_list, _, dhclient_if, extra_ouput) = make_interface_list(datadump)
 
   (poel, errors) = make_relations()
@@ -1115 +1131 @@
         return lines
 
-  (addrs_list, dhclient_if, extra_ouput) = make_interface_list(datadump)
+  (addrs_list, vlan_list, dhclient_if, extra_ouput) = make_interface_list(datadump)
   table = []
   for iface,addrs in sorted(addrs_list.iteritems()):
@@ -1201 +1217 @@
           output += "  %-11s: %s\n" % (key, format_yaml_value(datadump[iface_key][key]))
       output += "\n\n"
-    except Exception as e:
+    except Exception:
       print "# Error while processing interface %s" % iface_key
       raise
@@ -1673 +1689 @@
       try:
         node = sys.argv[2]
-        datadump = get_yaml(node)
       except IndexError:
         print "Invalid argument"
@@ -1680 +1695 @@
         print e
         exit(1)
+
+      datadump = get_yaml(node)
         
 
@@ -2092 +2109 @@
                 datadump['monitoring_group'] = 'wleiden'
 
-            except Exception as e:
+            except Exception:
               print "# Error while processing interface %s" % iface_key
               raise
           store_yaml(datadump)
-        except Exception as e:
+        except Exception:
           print "# Error while processing %s" % host
           raise