From aa9a40f268fc48650f95912f2917f65dd5fa3d8c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 21 Mar 2024 10:20:14 -0400 Subject: [PATCH] Remove unused MACAddressFilter --- netbox/utilities/filters.py | 5 ----- netbox/utilities/tests/test_filters.py | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py index 72c9124a1..7bbc4a6a2 100644 --- a/netbox/utilities/filters.py +++ b/netbox/utilities/filters.py @@ -8,7 +8,6 @@ from drf_spectacular.types import OpenApiTypes __all__ = ( 'ContentTypeFilter', - 'MACAddressFilter', 'MultiValueArrayFilter', 'MultiValueCharFilter', 'MultiValueDateFilter', @@ -101,10 +100,6 @@ class MultiValueArrayFilter(django_filters.MultipleChoiceFilter): return super().get_filter_predicate(v) -class MACAddressFilter(django_filters.CharFilter): - pass - - @extend_schema_field(OpenApiTypes.STR) class MultiValueMACAddressFilter(django_filters.MultipleChoiceFilter): field_class = multivalue_field_factory(forms.CharField) diff --git a/netbox/utilities/tests/test_filters.py b/netbox/utilities/tests/test_filters.py index 6caeb9d14..dd6194565 100644 --- a/netbox/utilities/tests/test_filters.py +++ b/netbox/utilities/tests/test_filters.py @@ -17,8 +17,8 @@ from ipam.filtersets import ASNFilterSet from ipam.models import RIR, ASN from netbox.filtersets import BaseFilterSet from utilities.filters import ( - MACAddressFilter, MultiValueCharFilter, MultiValueDateFilter, MultiValueDateTimeFilter, MultiValueNumberFilter, - MultiValueTimeFilter, TreeNodeMultipleChoiceFilter, + MultiValueCharFilter, MultiValueDateFilter, MultiValueDateTimeFilter, MultiValueMACAddressFilter, + MultiValueNumberFilter, MultiValueTimeFilter, TreeNodeMultipleChoiceFilter, ) @@ -113,7 +113,7 @@ class BaseFilterSetTest(TestCase): class DummyFilterSet(BaseFilterSet): charfield = django_filters.CharFilter() numberfield = django_filters.NumberFilter() - macaddressfield = MACAddressFilter() + macaddressfield = MultiValueMACAddressFilter() modelchoicefield = django_filters.ModelChoiceFilter( field_name='integerfield', # We're pretending this is a ForeignKey field queryset=Site.objects.all() @@ -198,7 +198,7 @@ class BaseFilterSetTest(TestCase): self.assertEqual(self.filters['numberfield__empty'].exclude, False) def test_mac_address_filter(self): - self.assertIsInstance(self.filters['macaddressfield'], MACAddressFilter) + self.assertIsInstance(self.filters['macaddressfield'], MultiValueMACAddressFilter) self.assertEqual(self.filters['macaddressfield'].lookup_expr, 'exact') self.assertEqual(self.filters['macaddressfield'].exclude, False) self.assertEqual(self.filters['macaddressfield__n'].lookup_expr, 'exact')