NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-17 04:32:51 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Remove unused MACAddressFilter

Browse Source
This commit is contained in:
Jeremy Stretch 2024-03-21 10:20:14 -04:00
parent d924eaf4da
commit aa9a40f268
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/utilities/filters.py
View File

@ -8,7 +8,6 @@ from drf_spectacular.types import OpenApiTypes
__all__ = ( __all__ = (
'ContentTypeFilter', 'ContentTypeFilter',
'MACAddressFilter',
'MultiValueArrayFilter', 'MultiValueArrayFilter',
'MultiValueCharFilter', 'MultiValueCharFilter',
'MultiValueDateFilter', 'MultiValueDateFilter',
@ -101,10 +100,6 @@ class MultiValueArrayFilter(django_filters.MultipleChoiceFilter):
return super().get_filter_predicate(v) return super().get_filter_predicate(v)
class MACAddressFilter(django_filters.CharFilter):
pass
@extend_schema_field(OpenApiTypes.STR) @extend_schema_field(OpenApiTypes.STR)
class MultiValueMACAddressFilter(django_filters.MultipleChoiceFilter): class MultiValueMACAddressFilter(django_filters.MultipleChoiceFilter):
field_class = multivalue_field_factory(forms.CharField) field_class = multivalue_field_factory(forms.CharField)

8
netbox/utilities/tests/test_filters.py
View File

@ -17,8 +17,8 @@ from ipam.filtersets import ASNFilterSet
from ipam.models import RIR, ASN from ipam.models import RIR, ASN
from netbox.filtersets import BaseFilterSet from netbox.filtersets import BaseFilterSet
from utilities.filters import ( from utilities.filters import (
MACAddressFilter, MultiValueCharFilter, MultiValueDateFilter, MultiValueDateTimeFilter, MultiValueNumberFilter, MultiValueCharFilter, MultiValueDateFilter, MultiValueDateTimeFilter, MultiValueMACAddressFilter,
MultiValueTimeFilter, TreeNodeMultipleChoiceFilter, MultiValueNumberFilter, MultiValueTimeFilter, TreeNodeMultipleChoiceFilter,
) )
@ -113,7 +113,7 @@ class BaseFilterSetTest(TestCase):
class DummyFilterSet(BaseFilterSet): class DummyFilterSet(BaseFilterSet):
charfield = django_filters.CharFilter() charfield = django_filters.CharFilter()
numberfield = django_filters.NumberFilter() numberfield = django_filters.NumberFilter()
macaddressfield = MACAddressFilter() macaddressfield = MultiValueMACAddressFilter()
modelchoicefield = django_filters.ModelChoiceFilter( modelchoicefield = django_filters.ModelChoiceFilter(
field_name='integerfield', # We're pretending this is a ForeignKey field field_name='integerfield', # We're pretending this is a ForeignKey field
queryset=Site.objects.all() queryset=Site.objects.all()
@ -198,7 +198,7 @@ class BaseFilterSetTest(TestCase):
self.assertEqual(self.filters['numberfield__empty'].exclude, False) self.assertEqual(self.filters['numberfield__empty'].exclude, False)
def test_mac_address_filter(self): 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'].lookup_expr, 'exact')
self.assertEqual(self.filters['macaddressfield'].exclude, False) self.assertEqual(self.filters['macaddressfield'].exclude, False)
self.assertEqual(self.filters['macaddressfield__n'].lookup_expr, 'exact') self.assertEqual(self.filters['macaddressfield__n'].lookup_expr, 'exact')