jamie/ipam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

fix: 🐛 devices with same name return incorrect id #43

Merged
jamie merged 1 commits from v1.9.8 into main 2026-04-07 11:26:38 +01:00
Conversation 0 Commits 1 Files Changed 1
+39 -68
1 changed files with 39 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d6a95e2b0 - Show all commits
routes.py
+39 -68
View File
@@ -631,8 +631,15 @@ def prewarm_cache(app):
cursor.execute('SELECT id, name, cidr FROM Subnet WHERE id = %s', (subnet_id,)) cursor.execute('SELECT id, name, cidr FROM Subnet WHERE id = %s', (subnet_id,))
subnet_row = cursor.fetchone() subnet_row = cursor.fetchone()
if subnet_row: if subnet_row:
cursor.execute('SELECT id, ip, hostname, notes FROM IPAddress WHERE subnet_id = %s', (subnet_id,)) cursor.execute('''
ip_addresses = cursor.fetchall() SELECT ip.id, ip.ip, ip.hostname, d.id, d.description, ip.notes
FROM IPAddress ip
LEFT JOIN DeviceIPAddress dia ON ip.id = dia.ip_id
LEFT JOIN Device d ON dia.device_id = d.id
WHERE ip.subnet_id = %s
ORDER BY INET_ATON(ip.ip)
''', (subnet_id,))
ip_addresses_with_device = cursor.fetchall()
cursor.execute('SELECT COUNT(*) FROM IPAddress WHERE subnet_id = %s', (subnet_id,)) cursor.execute('SELECT COUNT(*) FROM IPAddress WHERE subnet_id = %s', (subnet_id,))
total_ips = cursor.fetchone()[0] total_ips = cursor.fetchone()[0]
@@ -661,23 +668,6 @@ def prewarm_cache(app):
'percent': round(utilization_percent, 1) 'percent': round(utilization_percent, 1)
} }
cursor.execute('SELECT id, name, description FROM Device')
devices = cursor.fetchall()
device_name_map = {name.lower(): (id, description) for id, name, description in devices}
ip_addresses_with_device = []
for ip in ip_addresses:
ip_id = ip[0]
ip_address = ip[1]
hostname = ip[2]
ip_notes = ip[3] if len(ip) > 3 else None
device_id = None
device_description = None
if hostname:
match = device_name_map.get(hostname.lower())
if match:
device_id, device_description = match
ip_addresses_with_device.append((ip_id, ip_address, hostname, device_id, device_description, ip_notes))
subnet_dict = {'id': subnet_row[0], 'name': subnet_row[1], 'cidr': subnet_row[2]} subnet_dict = {'id': subnet_row[0], 'name': subnet_row[1], 'cidr': subnet_row[2]}
result = { result = {
'subnet': subnet_dict, 'subnet': subnet_dict,
@@ -1500,8 +1490,15 @@ def register_routes(app, limiter=None):
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute('SELECT id, name, cidr, vlan_id, vlan_description, vlan_notes FROM Subnet WHERE id = %s', (subnet_id,)) cursor.execute('SELECT id, name, cidr, vlan_id, vlan_description, vlan_notes FROM Subnet WHERE id = %s', (subnet_id,))
subnet = cursor.fetchone() subnet = cursor.fetchone()
cursor.execute('SELECT id, ip, hostname, notes FROM IPAddress WHERE subnet_id = %s', (subnet_id,)) cursor.execute('''
ip_addresses = cursor.fetchall() SELECT ip.id, ip.ip, ip.hostname, d.id, d.description, ip.notes
FROM IPAddress ip
LEFT JOIN DeviceIPAddress dia ON ip.id = dia.ip_id
LEFT JOIN Device d ON dia.device_id = d.id
WHERE ip.subnet_id = %s
ORDER BY INET_ATON(ip.ip)
''', (subnet_id,))
ip_addresses_with_device = cursor.fetchall()
# Calculate utilization stats # Calculate utilization stats
cursor.execute('SELECT COUNT(*) FROM IPAddress WHERE subnet_id = %s', (subnet_id,)) cursor.execute('SELECT COUNT(*) FROM IPAddress WHERE subnet_id = %s', (subnet_id,))
@@ -1534,23 +1531,6 @@ def register_routes(app, limiter=None):
# Get custom fields for subnet # Get custom fields for subnet
custom_fields = get_custom_fields_for_entity('subnet', subnet_id, conn=conn) custom_fields = get_custom_fields_for_entity('subnet', subnet_id, conn=conn)
cursor.execute('SELECT id, name, description FROM Device')
devices = cursor.fetchall()
device_name_map = {name.lower(): (id, description) for id, name, description in devices}
ip_addresses_with_device = []
for ip in ip_addresses:
ip_id = ip[0]
ip_address = ip[1]
hostname = ip[2]
ip_notes = ip[3] if len(ip) > 3 else None
device_id = None
device_description = None
if hostname:
match = device_name_map.get(hostname.lower())
if match:
device_id, device_description = match
ip_addresses_with_device.append((ip_id, ip_address, hostname, device_id, device_description, ip_notes))
subnet_dict = { subnet_dict = {
'id': subnet[0], 'id': subnet[0],
'name': subnet[1], 'name': subnet[1],
@@ -3139,24 +3119,15 @@ def register_routes(app, limiter=None):
subnet = cursor.fetchone() subnet = cursor.fetchone()
if not subnet: if not subnet:
return 'Subnet not found', 404 return 'Subnet not found', 404
cursor.execute('SELECT id, ip, hostname, notes FROM IPAddress WHERE subnet_id = %s', (subnet_id,)) cursor.execute('''
ip_addresses = cursor.fetchall() SELECT ip.id, ip.ip, ip.hostname, d.id, d.description, ip.notes
cursor.execute('SELECT id, name, description FROM Device') FROM IPAddress ip
devices = cursor.fetchall() LEFT JOIN DeviceIPAddress dia ON ip.id = dia.ip_id
device_name_map = {name.lower(): (id, description) for id, name, description in devices} LEFT JOIN Device d ON dia.device_id = d.id
ip_addresses_with_device = [] WHERE ip.subnet_id = %s
for ip in ip_addresses: ORDER BY INET_ATON(ip.ip)
ip_id = ip[0] ''', (subnet_id,))
ip_address = ip[1] ip_addresses_with_device = cursor.fetchall()
hostname = ip[2]
ip_notes = ip[3] if len(ip) > 3 else None
device_id = None
device_description = None
if hostname:
match = device_name_map.get(hostname.lower())
if match:
device_id, device_description = match
ip_addresses_with_device.append((ip_id, ip_address, hostname, device_id, device_description, ip_notes))
output = StringIO() output = StringIO()
writer = csv.writer(output) writer = csv.writer(output)
writer.writerow(['IP Address', 'Hostname', 'Description']) writer.writerow(['IP Address', 'Hostname', 'Description'])
@@ -3761,7 +3732,7 @@ def register_routes(app, limiter=None):
FROM IPAddress ip FROM IPAddress ip
JOIN Subnet s ON ip.subnet_id = s.id JOIN Subnet s ON ip.subnet_id = s.id
WHERE ip.ip LIKE %s OR ip.hostname LIKE %s OR ip.notes LIKE %s WHERE ip.ip LIKE %s OR ip.hostname LIKE %s OR ip.notes LIKE %s
ORDER BY ip.ip ORDER BY INET_ATON(ip.ip)
''', (search_pattern, search_pattern, search_pattern)) ''', (search_pattern, search_pattern, search_pattern))
results['ips'] = [{'id': row[0], 'ip': row[1], 'hostname': row[2], results['ips'] = [{'id': row[0], 'ip': row[1], 'hostname': row[2],
'subnet_id': row[3], 'subnet_name': row[4], 'subnet_id': row[3], 'subnet_name': row[4],
@@ -4177,7 +4148,7 @@ def register_routes(app, limiter=None):
LEFT JOIN DeviceIPAddress dia ON ip.id = dia.ip_id LEFT JOIN DeviceIPAddress dia ON ip.id = dia.ip_id
LEFT JOIN Device d ON dia.device_id = d.id LEFT JOIN Device d ON dia.device_id = d.id
WHERE ip.subnet_id = %s WHERE ip.subnet_id = %s
ORDER BY ip.ip ORDER BY INET_ATON(ip.ip)
''', (subnet_id,)) ''', (subnet_id,))
subnet['ip_addresses'] = cursor.fetchall() subnet['ip_addresses'] = cursor.fetchall()
# Get custom fields # Get custom fields
@@ -5215,7 +5186,7 @@ def register_routes(app, limiter=None):
FROM DeviceIPAddress dia FROM DeviceIPAddress dia
JOIN IPAddress ip ON dia.ip_id = ip.id JOIN IPAddress ip ON dia.ip_id = ip.id
WHERE dia.device_id = %s WHERE dia.device_id = %s
ORDER BY ip.ip ORDER BY INET_ATON(ip.ip)
LIMIT 1 LIMIT 1
''', (device['id'],)) ''', (device['id'],))
ip_result = cursor.fetchone() ip_result = cursor.fetchone()
@@ -5562,19 +5533,19 @@ def register_routes(app, limiter=None):
writer.writerow([f"Subnet: {subnet[1]} ({subnet[2]})"]) writer.writerow([f"Subnet: {subnet[1]} ({subnet[2]})"])
writer.writerow(['IP Address', 'Hostname', 'Description']) writer.writerow(['IP Address', 'Hostname', 'Description'])
cursor.execute('SELECT * FROM IPAddress WHERE subnet_id = %s', (subnet_id,)) cursor.execute('''
SELECT ip.id, ip.ip, ip.hostname, d.id, d.description, ip.notes
FROM IPAddress ip
LEFT JOIN DeviceIPAddress dia ON ip.id = dia.ip_id
LEFT JOIN Device d ON dia.device_id = d.id
WHERE ip.subnet_id = %s
ORDER BY INET_ATON(ip.ip)
''', (subnet_id,))
ip_addresses = cursor.fetchall() ip_addresses = cursor.fetchall()
cursor.execute('SELECT id, name, description FROM Device')
devices = cursor.fetchall()
device_name_map = {name.lower(): (id, description) for id, name, description in devices}
for ip in ip_addresses: for ip in ip_addresses:
hostname = ip[2] hostname = ip[2]
device_description = None device_description = ip[4] if len(ip) > 4 else None
if hostname:
match = device_name_map.get(hostname.lower())
if match:
device_description = match[1]
writer.writerow([ip[1] or '', hostname or '', device_description or '']) writer.writerow([ip[1] or '', hostname or '', device_description or ''])
writer.writerow([]) # Empty row between subnets writer.writerow([]) # Empty row between subnets