Changeset 10889 in genesis

Timestamp:

May 16, 2012, 10:06:19 PM (13 years ago)

Author:

rick

Message:

Basic dhcp flag validation.

File:

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

tools/gformat.py

@@ -108 +108 @@
     return DHCP_CLIENT
   else:
+    # Validation Checks
+    begin,end = map(int,item['dhcp'].split('-'))
+    if begin >= end:
+      raise ValueError("DHCP Start >= DHCP End")
     return DHCP_SERVER
 
@@ -447 +451 @@
     datadump[iface_key]['autogen_netmask'] = cidr2netmask(mask)
     datadump[iface_key]['autogen_subnet'] = get_network(addr, mask)
-    try:
-      if dhcp_type(datadump[iface_key]) != DHCP_SERVER:
-        raise ValueError
-      (dhcp_start, dhcp_stop) = datadump[iface_key]['dhcp'].split('-')
-    except (AttributeError, ValueError, KeyError):
-      dhcp_out[ifname].append("  subnet %(autogen_subnet)s netmask %(autogen_netmask)s {\n    ### not autoritive\n  }\n" % datadump[iface_key])
+    if dhcp_type(datadump[iface_key]) != DHCP_SERVER:
+      dhcp_out[ifname].append("  subnet %(autogen_subnet)s netmask %(autogen_netmask)s {\n    ### not autoritive\n  }\n" % \
+        datadump[iface_key])
       continue
 
+    (dhcp_start, dhcp_stop) = datadump[iface_key]['dhcp'].split('-')
     dhcp_part = ".".join(addr.split('.')[0:3])
     datadump[iface_key]['autogen_dhcp_start'] = dhcp_part + "." + dhcp_start
@@ -494 +496 @@
     output += "## %(interface)s - %(comment)s\n" % datadump[iface_key]
 
-    try:
-      (dhcp_start, dhcp_stop) = datadump[iface_key]['dhcp'].split('-')
-      (ip, cidr) = datadump[iface_key]['ip'].split('/')
-      datadump[iface_key]['autogen_netmask'] = cidr2netmask(cidr)
-    except (AttributeError, ValueError, KeyError):
+    if dhcp_type(datadump[iface_key]) != DHCP_SERVER:
       output += "# not autoritive\n\n"
       continue
+
+    (dhcp_start, dhcp_stop) = datadump[iface_key]['dhcp'].split('-')
+    (ip, cidr) = datadump[iface_key]['ip'].split('/')
+    datadump[iface_key]['autogen_netmask'] = cidr2netmask(cidr)
 
     dhcp_part = ".".join(ip.split('.')[0:3])
@@ -1534 +1536 @@
 
           for iface_key in datadump['autogen_iface_keys']:
-            # All our normal wireless cards are normal APs now
-            if datadump[iface_key]['type'] in ['11a', '11b', '11g', 'wireless']:
-              datadump[iface_key]['mode'] = 'ap'
-            # Wireless Leiden SSID have an consistent lowercase/uppercase
-            if datadump[iface_key].has_key('ssid'):
-              ssid = datadump[iface_key]['ssid']
-              prefix = 'ap-WirelessLeiden-'
-              if ssid.lower().startswith(prefix.lower()):
-                datadump[iface_key]['ssid'] = prefix + ssid[len(prefix)].upper() + ssid[len(prefix) + 1:] 
-            if datadump[iface_key].has_key('ns_ip') and not datadump[iface_key].has_key('mode'):
-              datadump[iface_key]['mode'] = 'autogen-FIXME'
-            if not datadump[iface_key].has_key('comment'):
-              datadump[iface_key]['comment'] = 'autogen-FIXME'
-
-            if datadump[iface_key]['comment'].startswith('autogen-') and datadump[iface_key].has_key('comment'):
-              datadump[iface_key] = datadump[iface_key]['desc']
-
-            x = datadump[iface_key]['comment']
-            datadump[iface_key]['comment'] = x[0].upper() + x[1:]
-            
-
-            if datadump[iface_key].has_key('desc'):
-              if datadump[iface_key]['comment'].lower() == datadump[iface_key]['desc'].lower():
-                del datadump[iface_key]['desc']
-              else:
-                print "# ERROR: At %s - %s" % (datadump['nodename'], iface_key)
-                response = fix_conflict(datadump[iface_key]['comment'], datadump[iface_key]['desc'])
-                if response:
-                  datadump[iface_key]['comment'] = response
+            try:
+              if datadump[iface_key]['interface'] not in iface_key:
+                raise ValueError("interface must be in the key name")
+              # All our normal wireless cards are normal APs now
+              if datadump[iface_key]['type'] in ['11a', '11b', '11g', 'wireless']:
+                datadump[iface_key]['mode'] = 'ap'
+              # Wireless Leiden SSID have an consistent lowercase/uppercase
+              if datadump[iface_key].has_key('ssid'):
+                ssid = datadump[iface_key]['ssid']
+                prefix = 'ap-WirelessLeiden-'
+                if ssid.lower().startswith(prefix.lower()):
+                  datadump[iface_key]['ssid'] = prefix + ssid[len(prefix)].upper() + ssid[len(prefix) + 1:] 
+              if datadump[iface_key].has_key('ns_ip') and not datadump[iface_key].has_key('mode'):
+                datadump[iface_key]['mode'] = 'autogen-FIXME'
+              if not datadump[iface_key].has_key('comment'):
+                datadump[iface_key]['comment'] = 'autogen-FIXME'
+
+              if datadump[iface_key]['comment'].startswith('autogen-') and datadump[iface_key].has_key('comment'):
+                datadump[iface_key] = datadump[iface_key]['desc']
+
+              x = datadump[iface_key]['comment']
+              datadump[iface_key]['comment'] = x[0].upper() + x[1:]
+              
+
+              if datadump[iface_key].has_key('desc'):
+                if datadump[iface_key]['comment'].lower() == datadump[iface_key]['desc'].lower():
                   del datadump[iface_key]['desc']
-
-            # Set the compass value based on the angle between the poels
-            if datadump[iface_key].has_key('ns_ip'):
-              my_pool = poel[network(datadump[iface_key]['ip'])]
-              remote_hosts = list(set([x[0] for x in my_pool]) - set([host]))
-              if remote_hosts:
-                compass_target = remote_hosts[0]
-                datadump[iface_key]['compass'] = cd_between_hosts(host, compass_target, datadumps)
-              
+                else:
+                  print "# ERROR: At %s - %s" % (datadump['nodename'], iface_key)
+                  response = fix_conflict(datadump[iface_key]['comment'], datadump[iface_key]['desc'])
+                  if response:
+                    datadump[iface_key]['comment'] = response
+                    del datadump[iface_key]['desc']
+
+              # Check DHCP configuration
+              dhcp_type(datadump[iface_key])
+
+              # Set the compass value based on the angle between the poels
+              if datadump[iface_key].has_key('ns_ip'):
+                my_pool = poel[network(datadump[iface_key]['ip'])]
+                remote_hosts = list(set([x[0] for x in my_pool]) - set([host]))
+                if remote_hosts:
+                  compass_target = remote_hosts[0]
+                  datadump[iface_key]['compass'] = cd_between_hosts(host, compass_target, datadumps)
+            except Exception as e:
+              print "# Error while processing interface %s" % iface_key
+              raise
           store_yaml(datadump)
         except Exception as e: