Clean up filtersets

netbox/dcim/filtersets.py

@@ -173,7 +173,7 @@ class SiteFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
         return queryset.filter(qs_filter)
 
 
-class LocationFilterSet(OrganizationalModelFilterSet):
+class LocationFilterSet(TenancyFilterSet, OrganizationalModelFilterSet):
     region_id = TreeNodeMultipleChoiceFilter(
         queryset=Region.objects.all(),
         field_name='site__region',

netbox/ipam/filtersets.py

@@ -9,7 +9,6 @@ from dcim.models import Device, Interface, Region, Site, SiteGroup
 from extras.filters import TagFilter
 from netbox.filtersets import ChangeLoggedModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
-from tenancy.models import Tenant
 from utilities.filters import (
     ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter, NumericArrayFilter, TreeNodeMultipleChoiceFilter,
 )
@@ -180,7 +179,6 @@ class AggregateFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
 
 
 class ASNFilterSet(OrganizationalModelFilterSet, TenancyFilterSet):
-
     rir_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RIR.objects.all(),
         label='RIR (ID)',
@@ -210,7 +208,7 @@ class ASNFilterSet(OrganizationalModelFilterSet, TenancyFilterSet):
     def search(self, queryset, name, value):
         if not value.strip():
             return queryset
-        qs_filter = Q(Q(description__icontains=value) | Q(asn__icontains=value))
+        qs_filter = Q(description__icontains=value)
         return queryset.filter(qs_filter)
 
 

netbox/wireless/filtersets.py

@@ -5,7 +5,7 @@ from dcim.choices import LinkStatusChoices
 from extras.filters import TagFilter
 from ipam.models import VLAN
 from netbox.filtersets import OrganizationalModelFilterSet, PrimaryModelFilterSet
-from utilities.filters import TreeNodeMultipleChoiceFilter
+from utilities.filters import MultiValueNumberFilter, TreeNodeMultipleChoiceFilter
 from .choices import *
 from .models import *
 
@@ -78,6 +78,8 @@ class WirelessLinkFilterSet(PrimaryModelFilterSet):
         method='search',
         label='Search',
     )
+    interface_a_id = MultiValueNumberFilter()
+    interface_b_id = MultiValueNumberFilter()
     status = django_filters.MultipleChoiceFilter(
         choices=LinkStatusChoices
     )