NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 02:48:38 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

List child IP addresses even when consumed by a range

Browse Source
This commit is contained in:
Jeremy Stretch 2025-04-02 13:24:13 -04:00
parent ecb56dda14
commit 55d02b3c2c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/ipam/utils.py
View File

@ -88,15 +88,11 @@ def annotate_ip_space(prefix):
first_ip=f'{first_ip_in_prefix}/{prefix.mask_length}' first_ip=f'{first_ip_in_prefix}/{prefix.mask_length}'
)) ))
# Iterate through existing IPs and annotate free ranges # Add IP ranges & addresses, annotating available space in between records
for record in records: for record in records:
if prev_ip: if prev_ip:
# We've already listed a range which covers this IP
if record[0] < prev_ip:
continue
# Annotate available space # Annotate available space
if (diff := int(record[0] - prev_ip)) > 1: if (diff := int(record[0]) - int(prev_ip)) > 1:
first_skipped = f'{prev_ip + 1}/{prefix.mask_length}' first_skipped = f'{prev_ip + 1}/{prefix.mask_length}'
output.append(AvailableIPSpace( output.append(AvailableIPSpace(
size=diff - 1, size=diff - 1,
@ -110,7 +106,6 @@ def annotate_ip_space(prefix):
prev_ip = record[1].end_address.ip prev_ip = record[1].end_address.ip
else: else:
prev_ip = record[0] prev_ip = record[0]
print(f'prev_ip: {prev_ip}')
# Include any remaining available IPs # Include any remaining available IPs
if prev_ip < last_ip_in_prefix: if prev_ip < last_ip_in_prefix: