NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-26 17:26:10 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Remove extend_schema_field() wrapping from filters

Browse Source
This commit is contained in:
jeremystretch 2023-03-30 14:17:30 -04:00
parent 60661ab639
commit 4a968fa971
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
netbox/ipam/filtersets.py
View File

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