From decff44ee8068f7cf31e6d6d214da9c744820db1 Mon Sep 17 00:00:00 2001 From: aq5747 Date: Sat, 30 Aug 2025 10:50:52 -0400 Subject: [PATCH 1/2] Fixes #20217: hide 0 VLANs available message in VLAN groups --- netbox/ipam/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/ipam/utils.py b/netbox/ipam/utils.py index 8fe40592e30..ea9f91a97f8 100644 --- a/netbox/ipam/utils.py +++ b/netbox/ipam/utils.py @@ -164,11 +164,11 @@ def available_vlans_from_range(vlans, vlan_group, vid_range): prev_vid = vlan.vid # Annotate any remaining available VLANs - if prev_vid < max_vid: + if prev_vid < max_vid and (available := max_vid - prev_vid - 1) > 0: new_vlans.append({ 'vid': prev_vid + 1, 'vlan_group': vlan_group, - 'available': max_vid - prev_vid - 1, + 'available': available, }) return new_vlans From b406be9dbe3d910425abfba5258d0fa33bfcfc20 Mon Sep 17 00:00:00 2001 From: aq5747 Date: Sat, 6 Sep 2025 10:55:10 -0400 Subject: [PATCH 2/2] Simplified fix to improve readability --- netbox/ipam/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/ipam/utils.py b/netbox/ipam/utils.py index ea9f91a97f8..790ac6503d0 100644 --- a/netbox/ipam/utils.py +++ b/netbox/ipam/utils.py @@ -164,11 +164,11 @@ def available_vlans_from_range(vlans, vlan_group, vid_range): prev_vid = vlan.vid # Annotate any remaining available VLANs - if prev_vid < max_vid and (available := max_vid - prev_vid - 1) > 0: + if prev_vid < max_vid - 1: new_vlans.append({ 'vid': prev_vid + 1, 'vlan_group': vlan_group, - 'available': available, + 'available': max_vid - prev_vid - 1, }) return new_vlans