mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #1025: Applied missing API view filters

Browse Source
This commit is contained in:
Jeremy Stretch
2017-04-03 11:04:17 -04:00
parent 1c38f705a7
commit a67fc64afb
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/dcim/api/views.py
View File

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

4
netbox/dcim/filters.py
View File

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

1
netbox/extras/api/views.py
View File

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

2
netbox/ipam/api/views.py
View File

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

4
netbox/secrets/api/views.py
View File

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