diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py index 5008fd19b..771a8efcc 100644 --- a/netbox/circuits/api/views.py +++ b/netbox/circuits/api/views.py @@ -32,7 +32,7 @@ class ProviderViewSet(CustomFieldModelViewSet): circuit_count=Count('circuits') ) serializer_class = serializers.ProviderSerializer - filterset_class = filters.ProviderFilter + filterset_class = filters.ProviderFilterSet @action(detail=True) def graphs(self, request, pk): @@ -54,7 +54,7 @@ class CircuitTypeViewSet(ModelViewSet): circuit_count=Count('circuits') ) serializer_class = serializers.CircuitTypeSerializer - filterset_class = filters.CircuitTypeFilter + filterset_class = filters.CircuitTypeFilterSet # @@ -64,7 +64,7 @@ class CircuitTypeViewSet(ModelViewSet): class CircuitViewSet(CustomFieldModelViewSet): queryset = Circuit.objects.prefetch_related('type', 'tenant', 'provider').prefetch_related('tags') serializer_class = serializers.CircuitSerializer - filterset_class = filters.CircuitFilter + filterset_class = filters.CircuitFilterSet # @@ -76,4 +76,4 @@ class CircuitTerminationViewSet(ModelViewSet): 'circuit', 'site', 'connected_endpoint__device', 'cable' ) serializer_class = serializers.CircuitTerminationSerializer - filterset_class = filters.CircuitTerminationFilter + filterset_class = filters.CircuitTerminationFilterSet diff --git a/netbox/circuits/filters.py b/netbox/circuits/filters.py index cb439082d..9a63a7814 100644 --- a/netbox/circuits/filters.py +++ b/netbox/circuits/filters.py @@ -9,14 +9,14 @@ from .choices import * from .models import Circuit, CircuitTermination, CircuitType, Provider __all__ = ( - 'CircuitFilter', - 'CircuitTerminationFilter', - 'CircuitTypeFilter', - 'ProviderFilter', + 'CircuitFilterSet', + 'CircuitTerminationFilterSet', + 'CircuitTypeFilterSet', + 'ProviderFilterSet', ) -class ProviderFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): +class ProviderFilterSet(CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -65,14 +65,14 @@ class ProviderFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): ) -class CircuitTypeFilter(NameSlugSearchFilterSet): +class CircuitTypeFilterSet(NameSlugSearchFilterSet): class Meta: model = CircuitType fields = ['id', 'name', 'slug'] -class CircuitFilter(CustomFieldFilterSet, TenancyFilterSet, CreatedUpdatedFilterSet): +class CircuitFilterSet(CustomFieldFilterSet, TenancyFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -146,7 +146,7 @@ class CircuitFilter(CustomFieldFilterSet, TenancyFilterSet, CreatedUpdatedFilter ).distinct() -class CircuitTerminationFilter(django_filters.FilterSet): +class CircuitTerminationFilterSet(django_filters.FilterSet): q = django_filters.CharFilter( method='search', label='Search', diff --git a/netbox/circuits/tests/test_filters.py b/netbox/circuits/tests/test_filters.py index 329a3bc3f..46c2bacbe 100644 --- a/netbox/circuits/tests/test_filters.py +++ b/netbox/circuits/tests/test_filters.py @@ -8,7 +8,7 @@ from dcim.models import Region, Site class ProviderTestCase(TestCase): queryset = Provider.objects.all() - filterset = ProviderFilter + filterset = ProviderFilterSet @classmethod def setUpTestData(cls): @@ -91,7 +91,7 @@ class ProviderTestCase(TestCase): class CircuitTypeTestCase(TestCase): queryset = CircuitType.objects.all() - filterset = CircuitTypeFilter + filterset = CircuitTypeFilterSet @classmethod def setUpTestData(cls): @@ -117,7 +117,7 @@ class CircuitTypeTestCase(TestCase): class CircuitTestCase(TestCase): queryset = Circuit.objects.all() - filterset = CircuitFilter + filterset = CircuitFilterSet @classmethod def setUpTestData(cls): @@ -219,7 +219,7 @@ class CircuitTestCase(TestCase): class CircuitTerminationTestCase(TestCase): queryset = CircuitTermination.objects.all() - filterset = CircuitTerminationFilter + filterset = CircuitTerminationFilterSet @classmethod def setUpTestData(cls): diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 02f3e9374..1df1e8d4f 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -23,7 +23,7 @@ from .models import Circuit, CircuitTermination, CircuitType, Provider class ProviderListView(PermissionRequiredMixin, ObjectListView): permission_required = 'circuits.view_provider' queryset = Provider.objects.annotate(count_circuits=Count('circuits')) - filter = filters.ProviderFilter + filter = filters.ProviderFilterSet filter_form = forms.ProviderFilterForm table = tables.ProviderDetailTable template_name = 'circuits/provider_list.html' @@ -73,7 +73,7 @@ class ProviderBulkImportView(PermissionRequiredMixin, BulkImportView): class ProviderBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'circuits.change_provider' queryset = Provider.objects.all() - filter = filters.ProviderFilter + filter = filters.ProviderFilterSet table = tables.ProviderTable form = forms.ProviderBulkEditForm default_return_url = 'circuits:provider_list' @@ -82,7 +82,7 @@ class ProviderBulkEditView(PermissionRequiredMixin, BulkEditView): class ProviderBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'circuits.delete_provider' queryset = Provider.objects.all() - filter = filters.ProviderFilter + filter = filters.ProviderFilterSet table = tables.ProviderTable default_return_url = 'circuits:provider_list' @@ -136,7 +136,7 @@ class CircuitListView(PermissionRequiredMixin, ObjectListView): a_side=Subquery(_terminations.filter(term_side='A').values('site__name')[:1]), z_side=Subquery(_terminations.filter(term_side='Z').values('site__name')[:1]), ) - filter = filters.CircuitFilter + filter = filters.CircuitFilterSet filter_form = forms.CircuitFilterForm table = tables.CircuitTable template_name = 'circuits/circuit_list.html' @@ -194,7 +194,7 @@ class CircuitBulkImportView(PermissionRequiredMixin, BulkImportView): class CircuitBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'circuits.change_circuit' queryset = Circuit.objects.prefetch_related('provider', 'type', 'tenant').prefetch_related('terminations__site') - filter = filters.CircuitFilter + filter = filters.CircuitFilterSet table = tables.CircuitTable form = forms.CircuitBulkEditForm default_return_url = 'circuits:circuit_list' @@ -203,7 +203,7 @@ class CircuitBulkEditView(PermissionRequiredMixin, BulkEditView): class CircuitBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'circuits.delete_circuit' queryset = Circuit.objects.prefetch_related('provider', 'type', 'tenant').prefetch_related('terminations__site') - filter = filters.CircuitFilter + filter = filters.CircuitFilterSet table = tables.CircuitTable default_return_url = 'circuits:circuit_list' diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index 17423d1e4..766bd2041 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -7,7 +7,7 @@ from rest_framework.response import Response from rest_framework.reverse import reverse from rest_framework.views import APIView -from circuits.filters import CircuitFilter, ProviderFilter +from circuits.filters import CircuitFilterSet, ProviderFilterSet from circuits.models import Circuit, CircuitTermination, Provider from circuits.tables import CircuitTable, ProviderTable from dcim.filters import ( @@ -42,7 +42,7 @@ SEARCH_TYPES = OrderedDict(( ('provider', { 'permission': 'circuits.view_provider', 'queryset': Provider.objects.all(), - 'filter': ProviderFilter, + 'filter': ProviderFilterSet, 'table': ProviderTable, 'url': 'circuits:provider_list', }), @@ -59,7 +59,7 @@ SEARCH_TYPES = OrderedDict(( CircuitTermination.objects.filter(circuit=OuterRef('pk')).filter(term_side='Z').values('site__name')[:1] ), ), - 'filter': CircuitFilter, + 'filter': CircuitFilterSet, 'table': CircuitTable, 'url': 'circuits:circuit_list', }),