Skip to content

Fixes #18879 - Add prefix filtering by assigned VLAN Group #19182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 15, 2025
Merged

Fixes #18879 - Add prefix filtering by assigned VLAN Group #19182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5aa302d
feat(ipam): Add VLAN group filters to IPAM FilterSet
pheus Apr 13, 2025
2ec0676
feat(ipam): Add VLAN group filter in IPAM FilterForm
pheus Apr 13, 2025
1fb2d1c
feat(ipam): Add VLAN group filtering to tests
pheus Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions netbox/ipam/filtersets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,18 @@ class PrefixFilterSet(NetBoxModelFilterSet, ScopedFilterSet, TenancyFilterSet, C
to_field_name='rd',
label=_('VRF (RD)'),
)
vlan_group_id = django_filters.ModelMultipleChoiceFilter(
field_name='vlan__group',
queryset=VLANGroup.objects.all(),
to_field_name="id",
label=_('VLAN Group (ID)'),
)
vlan_group = django_filters.ModelMultipleChoiceFilter(
field_name='vlan__group__slug',
queryset=VLANGroup.objects.all(),
to_field_name="slug",
label=_('VLAN Group (slug)'),
)
vlan_id = django_filters.ModelMultipleChoiceFilter(
queryset=VLAN.objects.all(),
label=_('VLAN (ID)'),
Expand Down
7 changes: 6 additions & 1 deletion netbox/ipam/forms/filtersets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class PrefixFilterForm(ContactModelFilterForm, TenancyFilterForm, NetBoxModelFil
'within_include', 'family', 'status', 'role_id', 'mask_length', 'is_pool', 'mark_utilized',
name=_('Addressing')
),
FieldSet('vlan_id', name=_('VLAN Assignment')),
FieldSet('vlan_group_id', 'vlan_id', name=_('VLAN Assignment')),
FieldSet('vrf_id', 'present_in_vrf_id', name=_('VRF')),
FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Scope')),
FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
Expand Down Expand Up @@ -260,6 +260,11 @@ class PrefixFilterForm(ContactModelFilterForm, TenancyFilterForm, NetBoxModelFil
choices=BOOLEAN_WITH_BLANK_CHOICES
)
)
vlan_group_id = DynamicModelMultipleChoiceField(
queryset=VLANGroup.objects.all(),
required=False,
label=_('VLAN Group'),
)
vlan_id = DynamicModelMultipleChoiceField(
queryset=VLAN.objects.all(),
required=False,
Expand Down
18 changes: 16 additions & 2 deletions netbox/ipam/tests/test_filtersets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,9 +645,16 @@ def setUpTestData(cls):
vrfs[1].export_targets.add(route_targets[1])
vrfs[2].export_targets.add(route_targets[2])

vlan_groups = (
VLANGroup(name='VLAN Group 1', slug='vlan-group-1'),
VLANGroup(name='VLAN Group 2', slug='vlan-group-2'),
)
for vlan_group in vlan_groups:
vlan_group.save()

vlans = (
VLAN(vid=1, name='VLAN 1'),
VLAN(vid=2, name='VLAN 2'),
VLAN(vid=1, name='VLAN 1', group=vlan_groups[0]),
VLAN(vid=2, name='VLAN 2', group=vlan_groups[1]),
VLAN(vid=3, name='VLAN 3'),
)
VLAN.objects.bulk_create(vlans)
Expand Down Expand Up @@ -850,6 +857,13 @@ def test_site(self):
params = {'site': [sites[0].slug, sites[1].slug]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)

def test_vlan_group(self):
vlan_groups = VLANGroup.objects.all()[:2]
params = {'vlan_group_id': [vlan_groups[0].pk, vlan_groups[1].pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
params = {'vlan_group': [vlan_groups[0].slug, vlan_groups[1].slug]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)

def test_vlan(self):
vlans = VLAN.objects.all()[:2]
params = {'vlan_id': [vlans[0].pk, vlans[1].pk]}
Expand Down