Fixes #1025: Applied missing API view filters

netbox/dcim/api/views.py

@@ -1,4 +1,4 @@
-from rest_framework.decorators import detail_route, list_route
+from rest_framework.decorators import detail_route
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet, ViewSet
@@ -38,8 +38,8 @@ class RegionViewSet(WritableSerializerMixin, ModelViewSet):
 class SiteViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
     queryset = Site.objects.select_related('region', 'tenant')
     serializer_class = serializers.SiteSerializer
-    filter_class = filters.SiteFilter
     write_serializer_class = serializers.WritableSiteSerializer
+    filter_class = filters.SiteFilter
 
     @detail_route()
     def graphs(self, request, pk=None):
@@ -59,8 +59,8 @@ class SiteViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
 class RackGroupViewSet(WritableSerializerMixin, ModelViewSet):
     queryset = RackGroup.objects.select_related('site')
     serializer_class = serializers.RackGroupSerializer
-    filter_class = filters.RackGroupFilter
     write_serializer_class = serializers.WritableRackGroupSerializer
+    filter_class = filters.RackGroupFilter
 
 
 #
@@ -135,6 +135,7 @@ class DeviceTypeViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
     queryset = DeviceType.objects.select_related('manufacturer')
     serializer_class = serializers.DeviceTypeSerializer
     write_serializer_class = serializers.WritableDeviceTypeSerializer
+    filter_class = filters.DeviceTypeFilter
 
 
 #

netbox/dcim/filters.py

@@ -240,7 +240,7 @@ class InterfaceTemplateFilter(DeviceTypeComponentFilterSet):
 
     class Meta:
         model = InterfaceTemplate
-        fields = ['name']
+        fields = ['name', 'form_factor']
 
 
 class DeviceBayTemplateFilter(DeviceTypeComponentFilterSet):
@@ -448,7 +448,7 @@ class InterfaceFilter(DeviceComponentFilterSet):
 
     class Meta:
         model = Interface
-        fields = ['name']
+        fields = ['name', 'form_factor']
 
     def filter_type(self, queryset, name, value):
         value = value.strip().lower()

netbox/extras/api/views.py

@@ -51,7 +51,6 @@ class GraphViewSet(WritableSerializerMixin, ModelViewSet):
 class ExportTemplateViewSet(WritableSerializerMixin, ModelViewSet):
     queryset = ExportTemplate.objects.all()
     serializer_class = serializers.ExportTemplateSerializer
-    # write_serializer_class = serializers.WritableExportTemplateSerializer
     filter_class = filters.ExportTemplateFilter
 
 

netbox/ipam/api/views.py

@@ -34,6 +34,7 @@ class RoleViewSet(ModelViewSet):
 class RIRViewSet(ModelViewSet):
     queryset = RIR.objects.all()
     serializer_class = serializers.RIRSerializer
+    filter_class = filters.RIRFilter
 
 
 #
@@ -99,3 +100,4 @@ class ServiceViewSet(WritableSerializerMixin, ModelViewSet):
     queryset = Service.objects.select_related('device')
     serializer_class = serializers.ServiceSerializer
     write_serializer_class = serializers.WritableServiceSerializer
+    filter_class = filters.ServiceFilter

netbox/secrets/api/views.py

@@ -8,8 +8,8 @@ from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet, ViewSet
 
+from secrets import filters
 from secrets.exceptions import InvalidKey
-from secrets.filters import SecretFilter
 from secrets.models import Secret, SecretRole, SessionKey, UserKey
 from utilities.api import WritableSerializerMixin
 from . import serializers
@@ -43,7 +43,7 @@ class SecretViewSet(WritableSerializerMixin, ModelViewSet):
     )
     serializer_class = serializers.SecretSerializer
     write_serializer_class = serializers.WritableSecretSerializer
-    filter_class = SecretFilter
+    filter_class = filters.SecretFilter
 
     master_key = None