fix: resolve bug for /32 and /31 addresses

Author: zeidlitz

generate.py

@@ -6,7 +6,6 @@
 import logging
 import os
 import platform
-import re
 import sqlite3
 import sys
 import yaml
@@ -17,7 +16,6 @@
 from lib import networks
 from lib import packages
 from lib import processor
-from lib import statistics
 from lib import tables
 
 def generate(database, manifest_file, seatmap_file,
@@ -27,7 +25,7 @@ def generate(database, manifest_file, seatmap_file,
   # Create fresh database file
   logging.debug('Checking if database file %s exists', database)
   has_previous_db = False
-  previous_statistics = None
+  before = {}
   if os.path.isfile(database):
       logging.debug(
           'Found existing database file %s, gathering stats before deleting',
@@ -87,6 +85,7 @@ def generate(database, manifest_file, seatmap_file,
 
     # Parse ipplan
     logging.debug('Parsing lines in %s', ipplan)
+    lines = []
     try:
         with open(ipplan, 'r') as f:
             lines = f.readlines()
@@ -149,6 +148,7 @@ def generate(database, manifest_file, seatmap_file,
           sys.exit(9)
       logging.debug('Found seatmap file \'%s\'', seatmap_file)
       logging.debug('Parsing seatmap file as JSON')
+      seatmap = {}
       try:
           with open(seatmap_file, 'r') as f:
               seatmap = json.loads(f.read())

lib/processor.py

@@ -1,4 +1,5 @@
 import ipcalc
+# import pdb
 import logging
 import re
 import socket
@@ -110,16 +111,26 @@ def host(l, c, network_id):
     return
 
 
-def network(l, c):
+def network(l, c, network_id=None):
     node_id = node(c)
     short_name = l[0]
     vlan = int(l[3]) if l[3] != '-' else None
     terminator = l[2]
 
     # IPv4
+    '''
+    edge cases: /31 and /32 
+    net_ipv4 = 85.225.229.1/32 
+    if len(net_ipv4)
+    if /32 or /31 then
+    
+    '''
     ipv4 = l[1]
     net_ipv4 = ipcalc.Network(ipv4)
-    ipv4_gateway = net_ipv4[1]
+    if len(net_ipv4) <= 2:
+        ipv4_gateway = net_ipv4[0]
+    else:
+        ipv4_gateway = net_ipv4[1]
     ipv4_netmask = str(net_ipv4.netmask())
     ipv4_netmask_dec = int(str(ipv4).split("/")[1])
 
@@ -145,7 +156,7 @@ def network(l, c):
 
     options(c, node_id, l[4])
 
-    return node_id
+    return node_id, network_id
 
 
 def split_value(string):
@@ -199,9 +210,9 @@ def ip2long(ip, version):
         return int(hexlify(socket.inet_pton(socket.AF_INET6, ip)), 16)
 
 
-def parser_func(l):
+def parser_func(line):
     for exp in SYNTAX:
-        if re.match(exp, l[0]):
+        if re.match(exp, line[0]):
             return SYNTAX[exp]
     return None