diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index 9830dfc15..a128b6acc 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -4,8 +4,6 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError from django.db.models import Q from django.utils.translation import gettext as _ -from drf_spectacular.utils import extend_schema_field -from drf_spectacular.types import OpenApiTypes from netaddr.core import AddrFormatError from dcim.models import Device, Interface, Region, Site, SiteGroup @@ -18,8 +16,6 @@ from virtualization.models import VirtualMachine, VMInterface from .choices import * from .models import * -from rest_framework import serializers - __all__ = ( 'AggregateFilterSet', 'ASNFilterSet', @@ -288,17 +284,17 @@ class PrefixFilterSet(NetBoxModelFilterSet, TenancyFilterSet): to_field_name='rd', label=_('VRF (RD)'), ) - present_in_vrf_id = extend_schema_field(OpenApiTypes.STR)(django_filters.ModelChoiceFilter( + present_in_vrf_id = django_filters.ModelChoiceFilter( queryset=VRF.objects.all(), method='filter_present_in_vrf', label=_('VRF') - )) - present_in_vrf = extend_schema_field(OpenApiTypes.STR)(django_filters.ModelChoiceFilter( + ) + present_in_vrf = django_filters.ModelChoiceFilter( queryset=VRF.objects.all(), method='filter_present_in_vrf', to_field_name='rd', label=_('VRF (RD)'), - )) + ) region_id = TreeNodeMultipleChoiceFilter( queryset=Region.objects.all(), field_name='site__region', @@ -530,17 +526,17 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet): to_field_name='rd', label=_('VRF (RD)'), ) - present_in_vrf_id = extend_schema_field(OpenApiTypes.STR)(django_filters.ModelChoiceFilter( + present_in_vrf_id = django_filters.ModelChoiceFilter( queryset=VRF.objects.all(), method='filter_present_in_vrf', label=_('VRF') - )) - present_in_vrf = extend_schema_field(OpenApiTypes.STR)(django_filters.ModelChoiceFilter( + ) + present_in_vrf = django_filters.ModelChoiceFilter( queryset=VRF.objects.all(), method='filter_present_in_vrf', to_field_name='rd', label=_('VRF (RD)'), - )) + ) device = MultiValueCharFilter( method='filter_device', field_name='name', @@ -714,10 +710,10 @@ class FHRPGroupFilterSet(NetBoxModelFilterSet): auth_type = django_filters.MultipleChoiceFilter( choices=FHRPGroupAuthTypeChoices ) - related_ip = extend_schema_field(OpenApiTypes.STR)(django_filters.ModelMultipleChoiceFilter( + related_ip = django_filters.ModelMultipleChoiceFilter( queryset=IPAddress.objects.all(), method='filter_related_ip' - )) + ) class Meta: model = FHRPGroup @@ -911,14 +907,14 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet): choices=VLANStatusChoices, null_value=None ) - available_on_device = extend_schema_field(OpenApiTypes.STR)(django_filters.ModelChoiceFilter( + available_on_device = django_filters.ModelChoiceFilter( queryset=Device.objects.all(), method='get_for_device' - )) - available_on_virtualmachine = extend_schema_field(OpenApiTypes.STR)(django_filters.ModelChoiceFilter( + ) + available_on_virtualmachine = django_filters.ModelChoiceFilter( queryset=VirtualMachine.objects.all(), method='get_for_virtualmachine' - )) + ) l2vpn_id = django_filters.ModelMultipleChoiceFilter( field_name='l2vpn_terminations__l2vpn', queryset=L2VPN.objects.all(),