From c34f01b32b05ebf4994fa2df18291289759102a7 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 3 Oct 2024 18:38:31 +0100 Subject: [PATCH] Add tests --- netbox/ipam/filtersets.py | 7 +++---- netbox/ipam/tests/test_filtersets.py | 10 ++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index d9927c447..894219c64 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -1072,7 +1072,7 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet): def get_for_virtualmachine(self, queryset, name, value): return queryset.get_for_virtualmachine(value) - def test_filter_interface_id(self, queryset, name, value): + def filter_interface_id(self, queryset, name, value): if value is None: return queryset.none() return queryset.filter( @@ -1081,9 +1081,8 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet): ) def filter_vminterface_id(self, queryset, name, value): - value = value.strip() - if not value: - return queryset + if value is None: + return queryset.none() return queryset.filter( Q(vminterfaces_as_tagged=value) | Q(vminterfaces_as_untagged=value) diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py index 70eeb73bc..4e38b1450 100644 --- a/netbox/ipam/tests/test_filtersets.py +++ b/netbox/ipam/tests/test_filtersets.py @@ -1887,6 +1887,16 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'available_at_site': site_id} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5) # 4 scoped + 1 global group + 1 global + def test_interface(self): + interface_id = Interface.objects.first().pk + params = {'interface_id': interface_id} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + + def test_vminterface(self): + vminterface_id = VMInterface.objects.first().pk + params = {'vminterface_id': vminterface_id} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + class ServiceTemplateTestCase(TestCase, ChangeLoggedFilterSetTests): queryset = ServiceTemplate.objects.all()