Changeset 14025 in genesis for tools/syntax-checker.py

Timestamp:

Jan 22, 2018, 12:49:48 PM (7 years ago)

Author:

rick

Message:

Fix overlapping IP networks

The syntax checker did not check for overlapping network ranges. For example
/24 defined at Dwars overlapped with /23 of Meerburgkerk. This is causing
issues with routing and network propogation.

While here ensure all ns_ip has proper subnet set

File:

• tools/syntax-checker.py (modified) (5 diffs)

tools/syntax-checker.py

@@ -6 +6 @@
 import gformat
 import sys
+import ipaddress
 
 from collections import defaultdict
@@ -11 +12 @@
 __version__ = '$Id$'
 
-allowed_multi_use = ['0.0.0.0', '192.168.1.', '192.168.178.']
+allowed_multi_use = map(lambda x: ipaddress.ip_network(x, strict=True), [
+    u'192.168.0.0/22',
+    u'192.168.0.0/16',
+    u'192.168.0.0/24',
+    u'192.168.1.0/24',
+    u'192.168.178.0/24',
+    ])
+
+
+
+
 
 def check_double_ip():
@@ -19 +30 @@
       print "## Processing host %-25s: " % host,
       datadump = gformat.get_yaml(host,add_version_info=False)
+      masterip_addr = ipaddress.IPv4Interface(unicode(datadump['masterip']))
+      masterip_is_used = False
+
       # Check syntax of defined variables
       _ = gformat.generate_wleiden_yaml(datadump)
@@ -25 +39 @@
         iface_keys = [elem for elem in datadump.keys() if (elem.startswith('iface_') and not "lo0" in elem)]
         for iface_key in iface_keys:
-          # Virtual interfaces bridge interfaces do not have IP addreses
-          if not datadump[iface_key].has_key('ip'):
+          # Extra (descriptive entries) are ignored
+          if '_extra' in iface_key:
             continue
 
-          l = datadump[iface_key]['ip']
-          addr, mask = l.split('/')
+          # Process actual and virtual IP (avoiding clashes with nanostation IP)
+          for entry in ['ip', 'ns_ip']:
+            if entry in datadump[iface_key]:
+              addr = ipaddress.IPv4Interface(unicode(datadump[iface_key][entry]))
+              if masterip_addr in addr.network:
+                masterip_is_used = True
+              pool[addr.network].append((host, iface_key, entry, addr))
 
-          pool[addr].append((host, iface_key))
 
-        iface_key = 'masterip'
-        addr = datadump['masterip']
         # Add masterip to the list if IP has not been defined at interface
-        if not host in [x[0] for x in pool[addr]]:
-          pool[addr].append((host, 'masterip'))
+        if not masterip_is_used:
+            pool[masterip_addr.network].append((host, 'masterip', '', masterip_addr))
 
         print "OK"
@@ -48 +64 @@
     sys.exit(1)
 
-  error = False
-  for addr,leden in pool.iteritems():
-    if len(leden) > 1:
-      if not any(map(lambda x: addr.startswith(x), allowed_multi_use)):
-        print "[ERROR] Multiple usages of IP %s:" % (addr)
-        for host, key in leden:
-          print "  - %s - %s" % (host, key)
-        error = True
+  errors = 0
+  keys = sorted(pool.keys(),reverse=True)
 
-  if error:
-    print "# Errors found"
+  for i,network in enumerate(keys):
+    if not network in allowed_multi_use:
+      for network2 in keys[i+1:]: 
+        if not network2 in allowed_multi_use and network2.overlaps(network):
+          errors += 1
+          print "[ERROR#%i] network %s overlaps with %s:" % (errors, network, network2)
+          for (host, key, entry, addr) in sorted(pool[network] + pool[network2]):
+            print "  - %-20s - %-20s - %-5s - %s" % (host, key, entry, addr)
+
+      leden = sorted(pool[network])
+      for i,lid in enumerate(leden):
+        for lid2 in leden[i+1:]:
+          if lid[3] == lid2[3]:
+            errors += 1
+            print "[ERROR#%i] Multiple usages of IP %s:" % (errors, lid[3])
+            print "  - %-20s - %-20s - %-5s" % (lid[0], lid[1], lid[2])
+            print "  - %-20s - %-20s - %-5s" % (lid2[0], lid2[1], lid2[2])
+            
+  if errors > 0:
+    print "# %i Errors found" % errors
     return 1
   else: