diff --git a/srv/poe_manager/generate_ips.py b/srv/poe_manager/generate_ips.py index 25f0fd1..0a46f66 100644 --- a/srv/poe_manager/generate_ips.py +++ b/srv/poe_manager/generate_ips.py @@ -6,7 +6,10 @@ def generate_ips_list(): conn = sqlite3.connect(DB_PATH) conn.row_factory = sqlite3.Row - switches = {row['hostname']: row for row in conn.execute("SELECT hostname, ip, username, password FROM switches")} + switches = {row['hostname']: row for row in conn.execute( + "SELECT hostname, ip, username, password FROM switches" + )} + devices = conn.execute(""" SELECT mac, rpi_ip, port, name, switch_hostname FROM devices @@ -14,8 +17,7 @@ def generate_ips_list(): """).fetchall() conn.close() -for dev in devices: - # Switchdaten holen, falls vorhanden + for dev in devices: switch = switches.get(dev['switch_hostname']) if switch: switch_ip = switch['ip'] @@ -27,7 +29,7 @@ for dev in devices: switch_pass = "" port = dev['port'] or "" - print(f"{dev['rpi_ip']}:{dev['name']}:{switch_ip}:{dev['switch_hostname'] or ''}:{port}:{switch_user}:{switch_pass}") + print(f"{dev['rpi_ip']}:{dev['name']}:{switch_ip}:{dev['switch_hostname'] or 'kein Switch'}:{port}:{switch_user}:{switch_pass}") if __name__ == "__main__": - generate_ips_list() \ No newline at end of file + generate_ips_list()