Upgraded django-filter to 2.0.0

netbox/virtualization/api/views.py

@@ -23,19 +23,19 @@ class VirtualizationFieldChoicesViewSet(FieldChoicesViewSet):
 class ClusterTypeViewSet(ModelViewSet):
     queryset = ClusterType.objects.all()
     serializer_class = serializers.ClusterTypeSerializer
-    filter_class = filters.ClusterTypeFilter
+    filterset_class = filters.ClusterTypeFilter
 
 
 class ClusterGroupViewSet(ModelViewSet):
     queryset = ClusterGroup.objects.all()
     serializer_class = serializers.ClusterGroupSerializer
-    filter_class = filters.ClusterGroupFilter
+    filterset_class = filters.ClusterGroupFilter
 
 
 class ClusterViewSet(CustomFieldModelViewSet):
     queryset = Cluster.objects.select_related('type', 'group').prefetch_related('tags')
     serializer_class = serializers.ClusterSerializer
-    filter_class = filters.ClusterFilter
+    filterset_class = filters.ClusterFilter
 
 
 #
@@ -46,7 +46,7 @@ class VirtualMachineViewSet(CustomFieldModelViewSet):
     queryset = VirtualMachine.objects.select_related(
         'cluster__site', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6'
     ).prefetch_related('tags')
-    filter_class = filters.VirtualMachineFilter
+    filterset_class = filters.VirtualMachineFilter
 
     def get_serializer_class(self):
         """
@@ -67,7 +67,7 @@ class InterfaceViewSet(ModelViewSet):
         virtual_machine__isnull=False
     ).select_related('virtual_machine').prefetch_related('tags')
     serializer_class = serializers.InterfaceSerializer
-    filter_class = filters.InterfaceFilter
+    filterset_class = filters.InterfaceFilter
 
     def get_serializer_class(self):
         request = self.get_serializer_context()['request']

netbox/virtualization/filters.py

@@ -26,7 +26,10 @@ class ClusterGroupFilter(django_filters.FilterSet):
 
 
 class ClusterFilter(CustomFieldFilterSet):
-    id__in = NumericInFilter(name='id', lookup_expr='in')
+    id__in = NumericInFilter(
+        field_name='id',
+        lookup_expr='in'
+    )
     q = django_filters.CharFilter(
         method='search',
         label='Search',
@@ -36,7 +39,7 @@ class ClusterFilter(CustomFieldFilterSet):
         label='Parent group (ID)',
     )
     group = django_filters.ModelMultipleChoiceFilter(
-        name='group__slug',
+        field_name='group__slug',
         queryset=ClusterGroup.objects.all(),
         to_field_name='slug',
         label='Parent group (slug)',
@@ -46,7 +49,7 @@ class ClusterFilter(CustomFieldFilterSet):
         label='Cluster type (ID)',
     )
     type = django_filters.ModelMultipleChoiceFilter(
-        name='type__slug',
+        field_name='type__slug',
         queryset=ClusterType.objects.all(),
         to_field_name='slug',
         label='Cluster type (slug)',
@@ -56,13 +59,13 @@ class ClusterFilter(CustomFieldFilterSet):
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
-        name='site__slug',
+        field_name='site__slug',
         queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
     tag = django_filters.CharFilter(
-        name='tags__slug',
+        field_name='tags__slug',
     )
 
     class Meta:
@@ -79,7 +82,10 @@ class ClusterFilter(CustomFieldFilterSet):
 
 
 class VirtualMachineFilter(CustomFieldFilterSet):
-    id__in = NumericInFilter(name='id', lookup_expr='in')
+    id__in = NumericInFilter(
+        field_name='id',
+        lookup_expr='in'
+    )
     q = django_filters.CharFilter(
         method='search',
         label='Search',
@@ -89,23 +95,23 @@ class VirtualMachineFilter(CustomFieldFilterSet):
         null_value=None
     )
     cluster_group_id = django_filters.ModelMultipleChoiceFilter(
-        name='cluster__group',
+        field_name='cluster__group',
         queryset=ClusterGroup.objects.all(),
         label='Cluster group (ID)',
     )
     cluster_group = django_filters.ModelMultipleChoiceFilter(
-        name='cluster__group__slug',
+        field_name='cluster__group__slug',
         queryset=ClusterGroup.objects.all(),
         to_field_name='slug',
         label='Cluster group (slug)',
     )
     cluster_type_id = django_filters.ModelMultipleChoiceFilter(
-        name='cluster__type',
+        field_name='cluster__type',
         queryset=ClusterType.objects.all(),
         label='Cluster type (ID)',
     )
     cluster_type = django_filters.ModelMultipleChoiceFilter(
-        name='cluster__type__slug',
+        field_name='cluster__type__slug',
         queryset=ClusterType.objects.all(),
         to_field_name='slug',
         label='Cluster type (slug)',
@@ -115,12 +121,12 @@ class VirtualMachineFilter(CustomFieldFilterSet):
         label='Cluster (ID)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        name='cluster__site',
+        field_name='cluster__site',
         queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
-        name='cluster__site__slug',
+        field_name='cluster__site__slug',
         queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
@@ -130,7 +136,7 @@ class VirtualMachineFilter(CustomFieldFilterSet):
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
-        name='role__slug',
+        field_name='role__slug',
         queryset=DeviceRole.objects.all(),
         to_field_name='slug',
         label='Role (slug)',
@@ -140,7 +146,7 @@ class VirtualMachineFilter(CustomFieldFilterSet):
         label='Tenant (ID)',
     )
     tenant = django_filters.ModelMultipleChoiceFilter(
-        name='tenant__slug',
+        field_name='tenant__slug',
         queryset=Tenant.objects.all(),
         to_field_name='slug',
         label='Tenant (slug)',
@@ -150,13 +156,13 @@ class VirtualMachineFilter(CustomFieldFilterSet):
         label='Platform (ID)',
     )
     platform = django_filters.ModelMultipleChoiceFilter(
-        name='platform__slug',
+        field_name='platform__slug',
         queryset=Platform.objects.all(),
         to_field_name='slug',
         label='Platform (slug)',
     )
     tag = django_filters.CharFilter(
-        name='tags__slug',
+        field_name='tags__slug',
     )
 
     class Meta:
@@ -174,12 +180,12 @@ class VirtualMachineFilter(CustomFieldFilterSet):
 
 class InterfaceFilter(django_filters.FilterSet):
     virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
-        name='virtual_machine',
+        field_name='virtual_machine',
         queryset=VirtualMachine.objects.all(),
         label='Virtual machine (ID)',
     )
     virtual_machine = django_filters.ModelMultipleChoiceFilter(
-        name='virtual_machine__name',
+        field_name='virtual_machine__name',
         queryset=VirtualMachine.objects.all(),
         to_field_name='name',
         label='Virtual machine',