From e2dae0cd1fb46d629379b544d6d1158afa272cfd Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 16 Jul 2024 10:19:42 -0400 Subject: [PATCH] Clean up add_available_vlans() --- netbox/ipam/utils.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/netbox/ipam/utils.py b/netbox/ipam/utils.py index 3a6e96a6c..ccf6cb632 100644 --- a/netbox/ipam/utils.py +++ b/netbox/ipam/utils.py @@ -131,16 +131,13 @@ def available_vlans_from_range(vlans, vlan_group, vlan_range): return new_vlans -def add_available_vlans(vlans, vlan_group=None): +def add_available_vlans(vlans, vlan_group): """ Create fake records for all gaps between used VLANs """ new_vlans = [] - if vlan_group and vlan_group.vid_ranges: - for vlan_range in vlan_group.vid_ranges: - new_vlans.extend(available_vlans_from_range(vlans, vlan_group, vlan_range)) - else: - new_vlans = available_vlans_from_range(vlans, vlan_group, vlan_range) + for vlan_range in vlan_group.vid_ranges: + new_vlans.extend(available_vlans_from_range(vlans, vlan_group, vlan_range)) vlans = list(vlans) + new_vlans vlans.sort(key=lambda v: v.vid if type(v) is VLAN else v['vid'])