From 49a6a36f4cc3d7149c39d3c1a9fd7da019719e76 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 9 Jan 2020 20:42:32 -0500 Subject: [PATCH] Renamed virtualization FilterSets --- netbox/netbox/views.py | 6 +++--- netbox/virtualization/api/views.py | 10 +++++----- netbox/virtualization/filters.py | 20 ++++++++++---------- netbox/virtualization/tests/test_filters.py | 10 +++++----- netbox/virtualization/views.py | 14 +++++++------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index a9adaf31a..83c763a18 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -31,7 +31,7 @@ from secrets.tables import SecretTable from tenancy.filters import TenantFilterSet from tenancy.models import Tenant from tenancy.tables import TenantTable -from virtualization.filters import ClusterFilter, VirtualMachineFilter +from virtualization.filters import ClusterFilterSet, VirtualMachineFilterSet from virtualization.models import Cluster, VirtualMachine from virtualization.tables import ClusterTable, VirtualMachineDetailTable from .forms import SearchForm @@ -126,7 +126,7 @@ SEARCH_TYPES = OrderedDict(( ('cluster', { 'permission': 'virtualization.view_cluster', 'queryset': Cluster.objects.prefetch_related('type', 'group'), - 'filter': ClusterFilter, + 'filter': ClusterFilterSet, 'table': ClusterTable, 'url': 'virtualization:cluster_list', }), @@ -135,7 +135,7 @@ SEARCH_TYPES = OrderedDict(( 'queryset': VirtualMachine.objects.prefetch_related( 'cluster', 'tenant', 'platform', 'primary_ip4', 'primary_ip6', ), - 'filter': VirtualMachineFilter, + 'filter': VirtualMachineFilterSet, 'table': VirtualMachineDetailTable, 'url': 'virtualization:virtualmachine_list', }), diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py index 94b75d154..a45dd6567 100644 --- a/netbox/virtualization/api/views.py +++ b/netbox/virtualization/api/views.py @@ -28,7 +28,7 @@ class ClusterTypeViewSet(ModelViewSet): cluster_count=Count('clusters') ) serializer_class = serializers.ClusterTypeSerializer - filterset_class = filters.ClusterTypeFilter + filterset_class = filters.ClusterTypeFilterSet class ClusterGroupViewSet(ModelViewSet): @@ -36,7 +36,7 @@ class ClusterGroupViewSet(ModelViewSet): cluster_count=Count('clusters') ) serializer_class = serializers.ClusterGroupSerializer - filterset_class = filters.ClusterGroupFilter + filterset_class = filters.ClusterGroupFilterSet class ClusterViewSet(CustomFieldModelViewSet): @@ -47,7 +47,7 @@ class ClusterViewSet(CustomFieldModelViewSet): virtualmachine_count=get_subquery(VirtualMachine, 'cluster') ) serializer_class = serializers.ClusterSerializer - filterset_class = filters.ClusterFilter + filterset_class = filters.ClusterFilterSet # @@ -58,7 +58,7 @@ class VirtualMachineViewSet(CustomFieldModelViewSet): queryset = VirtualMachine.objects.prefetch_related( 'cluster__site', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6', 'tags' ) - filterset_class = filters.VirtualMachineFilter + filterset_class = filters.VirtualMachineFilterSet def get_serializer_class(self): """ @@ -88,7 +88,7 @@ class InterfaceViewSet(ModelViewSet): 'virtual_machine', 'tags' ) serializer_class = serializers.InterfaceSerializer - filterset_class = filters.InterfaceFilter + filterset_class = filters.InterfaceFilterSet def get_serializer_class(self): request = self.get_serializer_context()['request'] diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py index b9b751724..4aa5302c1 100644 --- a/netbox/virtualization/filters.py +++ b/netbox/virtualization/filters.py @@ -13,29 +13,29 @@ from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine __all__ = ( - 'ClusterFilter', - 'ClusterGroupFilter', - 'ClusterTypeFilter', - 'InterfaceFilter', - 'VirtualMachineFilter', + 'ClusterFilterSet', + 'ClusterGroupFilterSet', + 'ClusterTypeFilterSet', + 'InterfaceFilterSet', + 'VirtualMachineFilterSet', ) -class ClusterTypeFilter(NameSlugSearchFilterSet): +class ClusterTypeFilterSet(NameSlugSearchFilterSet): class Meta: model = ClusterType fields = ['id', 'name', 'slug'] -class ClusterGroupFilter(NameSlugSearchFilterSet): +class ClusterGroupFilterSet(NameSlugSearchFilterSet): class Meta: model = ClusterGroup fields = ['id', 'name', 'slug'] -class ClusterFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): +class ClusterFilterSet(CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -104,7 +104,7 @@ class ClusterFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): ) -class VirtualMachineFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): +class VirtualMachineFilterSet(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -204,7 +204,7 @@ class VirtualMachineFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdate ) -class InterfaceFilter(django_filters.FilterSet): +class InterfaceFilterSet(django_filters.FilterSet): q = django_filters.CharFilter( method='search', label='Search', diff --git a/netbox/virtualization/tests/test_filters.py b/netbox/virtualization/tests/test_filters.py index 5b63ea0ca..d5d5dd35b 100644 --- a/netbox/virtualization/tests/test_filters.py +++ b/netbox/virtualization/tests/test_filters.py @@ -8,7 +8,7 @@ from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMac class ClusterTypeTestCase(TestCase): queryset = ClusterType.objects.all() - filterset = ClusterTypeFilter + filterset = ClusterTypeFilterSet @classmethod def setUpTestData(cls): @@ -36,7 +36,7 @@ class ClusterTypeTestCase(TestCase): class ClusterGroupTestCase(TestCase): queryset = ClusterGroup.objects.all() - filterset = ClusterGroupFilter + filterset = ClusterGroupFilterSet @classmethod def setUpTestData(cls): @@ -64,7 +64,7 @@ class ClusterGroupTestCase(TestCase): class ClusterTestCase(TestCase): queryset = Cluster.objects.all() - filterset = ClusterFilter + filterset = ClusterFilterSet @classmethod def setUpTestData(cls): @@ -146,7 +146,7 @@ class ClusterTestCase(TestCase): class VirtualMachineTestCase(TestCase): queryset = VirtualMachine.objects.all() - filterset = VirtualMachineFilter + filterset = VirtualMachineFilterSet @classmethod def setUpTestData(cls): @@ -303,7 +303,7 @@ class VirtualMachineTestCase(TestCase): class InterfaceTestCase(TestCase): queryset = Interface.objects.all() - filterset = InterfaceFilter + filterset = InterfaceFilterSet @classmethod def setUpTestData(cls): diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 73eccb4b2..2115a4a82 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -98,7 +98,7 @@ class ClusterListView(PermissionRequiredMixin, ObjectListView): permission_required = 'virtualization.view_cluster' queryset = Cluster.objects.prefetch_related('type', 'group', 'site', 'tenant') table = tables.ClusterTable - filter = filters.ClusterFilter + filter = filters.ClusterFilterSet filter_form = forms.ClusterFilterForm template_name = 'virtualization/cluster_list.html' @@ -149,7 +149,7 @@ class ClusterBulkImportView(PermissionRequiredMixin, BulkImportView): class ClusterBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'virtualization.change_cluster' queryset = Cluster.objects.prefetch_related('type', 'group', 'site') - filter = filters.ClusterFilter + filter = filters.ClusterFilterSet table = tables.ClusterTable form = forms.ClusterBulkEditForm default_return_url = 'virtualization:cluster_list' @@ -158,7 +158,7 @@ class ClusterBulkEditView(PermissionRequiredMixin, BulkEditView): class ClusterBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'virtualization.delete_cluster' queryset = Cluster.objects.prefetch_related('type', 'group', 'site') - filter = filters.ClusterFilter + filter = filters.ClusterFilterSet table = tables.ClusterTable default_return_url = 'virtualization:cluster_list' @@ -254,7 +254,7 @@ class ClusterRemoveDevicesView(PermissionRequiredMixin, View): class VirtualMachineListView(PermissionRequiredMixin, ObjectListView): permission_required = 'virtualization.view_virtualmachine' queryset = VirtualMachine.objects.prefetch_related('cluster', 'tenant', 'role', 'primary_ip4', 'primary_ip6') - filter = filters.VirtualMachineFilter + filter = filters.VirtualMachineFilterSet filter_form = forms.VirtualMachineFilterForm table = tables.VirtualMachineDetailTable template_name = 'virtualization/virtualmachine_list.html' @@ -310,7 +310,7 @@ class VirtualMachineBulkImportView(PermissionRequiredMixin, BulkImportView): class VirtualMachineBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'virtualization.change_virtualmachine' queryset = VirtualMachine.objects.prefetch_related('cluster', 'tenant', 'role') - filter = filters.VirtualMachineFilter + filter = filters.VirtualMachineFilterSet table = tables.VirtualMachineTable form = forms.VirtualMachineBulkEditForm default_return_url = 'virtualization:virtualmachine_list' @@ -319,7 +319,7 @@ class VirtualMachineBulkEditView(PermissionRequiredMixin, BulkEditView): class VirtualMachineBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'virtualization.delete_virtualmachine' queryset = VirtualMachine.objects.prefetch_related('cluster', 'tenant', 'role') - filter = filters.VirtualMachineFilter + filter = filters.VirtualMachineFilterSet table = tables.VirtualMachineTable default_return_url = 'virtualization:virtualmachine_list' @@ -376,6 +376,6 @@ class VirtualMachineBulkAddInterfaceView(PermissionRequiredMixin, BulkComponentC form = forms.VirtualMachineBulkAddInterfaceForm model = Interface model_form = forms.InterfaceForm - filter = filters.VirtualMachineFilter + filter = filters.VirtualMachineFilterSet table = tables.VirtualMachineTable default_return_url = 'virtualization:virtualmachine_list'