housekeeping

Author: zeidlitz

generate.py

@@ -109,7 +109,7 @@ def generate(database, manifest_file, seatmap_file,
   logging.debug('Parsing manifest file as JSON')
   try:
       with open(manifest_file, 'r') as f:
-          manifest = yaml.safe_load(f.read())
+          manifest = json.load(f)
   except Exception as e:
       logging.error(
           'Could not parse manifest file %s as JSON: %s',

lib/processor.py

@@ -1,5 +1,5 @@
 import ipcalc
-# import pdb
+import json
 import logging
 import re
 import socket
@@ -50,7 +50,6 @@ def master_network(l, c, r):
         ipv6 = l[2]
         _current_v6_base = ipv6.split('::', 1)[0]
 
-        last_digits = int(str(ipv4_gateway).split('.')[-1])
         ipv6_netmask = int(ipv6.split('/', 1)[1])
         ipv6_gateway = "%s::1" % (_current_v6_base, )
 
@@ -72,9 +71,12 @@ def master_network(l, c, r):
 
 def host(l, c, network_id):
     node_id = node(c)
-    c.execute('SELECT vlan FROM network WHERE node_id = ?', (network_id, ))
-    vlan = c.fetchone()[0]
-    vlan = int(vlan) if not vlan is None else None
+    c.execute('''SELECT vlan FROM network WHERE node_id = ?''', (node_id,))
+    row = c.fetchone()
+    if row != None:
+        vlan = int(row[0])
+    else:
+        vlan = None
 
     name = l[1]
     ip = l[2]
@@ -104,6 +106,7 @@ def host(l, c, network_id):
         ipv4_addr,
         ipv6_addr,
         network_id]
+    row[5] = json.dumps(row[5])
     c.execute('INSERT INTO host VALUES (?,?,?,?,?,?)', row)
 
     options(c, node_id, l[3])
@@ -118,13 +121,6 @@ def network(l, c, network_id=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)
     if len(net_ipv4) <= 2: