Move register_filterset to netbox.plugins.registration

netbox/circuits/filtersets.py

@@ -7,11 +7,11 @@ from dcim.filtersets import CabledObjectFilterSet
 from dcim.models import Interface, Location, Region, Site, SiteGroup
 from ipam.models import ASN
 from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet
+from netbox.plugins.registration import register_filterset
 from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet
 from utilities.filters import (
     ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter, TreeNodeMultipleChoiceFilter,
 )
-from utilities.filtersets import register_filterset
 from .choices import *
 from .models import *
 

netbox/core/filtersets.py

@@ -4,10 +4,10 @@ from django.db.models import Q
 from django.utils.translation import gettext as _
 
 from netbox.filtersets import BaseFilterSet, ChangeLoggedModelFilterSet, PrimaryModelFilterSet
+from netbox.plugins.registration import register_filterset
 from netbox.utils import get_data_backend_choices
 from users.models import User
 from utilities.filters import ContentTypeFilter
-from utilities.filtersets import register_filterset
 from .choices import *
 from .models import *
 

netbox/dcim/filtersets.py

@@ -14,6 +14,7 @@ from netbox.filtersets import (
     AttributeFiltersMixin, BaseFilterSet, ChangeLoggedModelFilterSet, NestedGroupModelFilterSet,
     OrganizationalModelFilterSet, PrimaryModelFilterSet, NetBoxModelFilterSet,
 )
+from netbox.plugins.registration import register_filterset
 from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet
 from tenancy.models import *
 from users.filterset_mixins import OwnerFilterMixin
@@ -22,7 +23,6 @@ from utilities.filters import (
     ContentTypeFilter, MultiValueCharFilter, MultiValueMACAddressFilter, MultiValueNumberFilter, MultiValueWWNFilter,
     NumericArrayFilter, TreeNodeMultipleChoiceFilter,
 )
-from utilities.filtersets import register_filterset
 from virtualization.models import Cluster, ClusterGroup, VirtualMachine, VMInterface
 from vpn.models import L2VPN
 from wireless.choices import WirelessChannelChoices, WirelessRoleChoices

netbox/extras/filtersets.py

@@ -6,13 +6,13 @@ from django.utils.translation import gettext as _
 from core.models import DataSource, ObjectType
 from dcim.models import DeviceRole, DeviceType, Location, Platform, Region, Site, SiteGroup
 from netbox.filtersets import BaseFilterSet, ChangeLoggedModelFilterSet, NetBoxModelFilterSet, PrimaryModelFilterSet
+from netbox.plugins.registration import register_filterset
 from tenancy.models import Tenant, TenantGroup
 from users.filterset_mixins import OwnerFilterMixin
 from users.models import Group, User
 from utilities.filters import (
     ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter
 )
-from utilities.filtersets import register_filterset
 from virtualization.models import Cluster, ClusterGroup, ClusterType
 from .choices import *
 from .filters import TagFilter, TagIDFilter

netbox/ipam/filtersets.py

@@ -14,12 +14,11 @@ from dcim.models import Device, Interface, Region, Site, SiteGroup
 from netbox.filtersets import (
     ChangeLoggedModelFilterSet, OrganizationalModelFilterSet, NetBoxModelFilterSet, PrimaryModelFilterSet,
 )
+from netbox.plugins.registration import register_filterset
 from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet
-
 from utilities.filters import (
     ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter, NumericArrayFilter, TreeNodeMultipleChoiceFilter,
 )
-from utilities.filtersets import register_filterset
 from virtualization.models import VirtualMachine, VMInterface
 from vpn.models import L2VPN
 from .choices import *

netbox/netbox/plugins/registration.py

@@ -7,6 +7,7 @@ from .navigation import PluginMenu, PluginMenuButton, PluginMenuItem
 from .templates import PluginTemplateExtension
 
 __all__ = (
+    'register_filterset',
     'register_graphql_schema',
     'register_menu',
     'register_menu_items',
@@ -44,6 +45,18 @@ def register_template_extensions(class_list):
             registry['plugins']['template_extensions'][model].append(template_extension)
 
 
+def register_filterset(filterset_class):
+    """
+    Decorator for registering a FilterSet with the application registry.
+
+    Uses model identifier as key to match search index pattern.
+    """
+    model = filterset_class._meta.model
+    label = f'{model._meta.app_label}.{model._meta.model_name}'
+    registry['filtersets'][label] = filterset_class
+    return filterset_class
+
+
 def register_menu(menu):
     if not isinstance(menu, PluginMenu):
         raise TypeError(_("{item} must be an instance of netbox.plugins.PluginMenuItem").format(item=menu))

netbox/tenancy/filtersets.py

@@ -5,8 +5,8 @@ from django.utils.translation import gettext as _
 from netbox.filtersets import (
     NestedGroupModelFilterSet, NetBoxModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet,
 )
+from netbox.plugins.registration import register_filterset
 from utilities.filters import ContentTypeFilter, TreeNodeMultipleChoiceFilter
-from utilities.filtersets import register_filterset
 from .models import *
 
 __all__ = (

netbox/users/filtersets.py

@@ -6,9 +6,9 @@ from django.utils.translation import gettext as _
 from core.models import ObjectType
 from extras.models import NotificationGroup
 from netbox.filtersets import BaseFilterSet
+from netbox.plugins.registration import register_filterset
 from users.models import Group, ObjectPermission, Owner, OwnerGroup, Token, User
 from utilities.filters import ContentTypeFilter
-from utilities.filtersets import register_filterset
 
 __all__ = (
     'GroupFilterSet',

netbox/utilities/filtersets.py

@@ -1,13 +0,0 @@
-from netbox.registry import registry
-
-
-def register_filterset(filterset_class):
-    """
-    Decorator for registering a FilterSet with the application registry.
-
-    Uses model identifier as key to match search index pattern.
-    """
-    model = filterset_class._meta.model
-    label = f'{model._meta.app_label}.{model._meta.model_name}'
-    registry['filtersets'][label] = filterset_class
-    return filterset_class

netbox/virtualization/filtersets.py

@@ -10,11 +10,10 @@ from extras.filtersets import LocalConfigContextFilterSet
 from extras.models import ConfigTemplate
 from ipam.filtersets import PrimaryIPFilterSet
 from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet
+from netbox.plugins.registration import register_filterset
 from tenancy.filtersets import TenancyFilterSet, ContactModelFilterSet
-
 from users.filterset_mixins import OwnerFilterMixin
 from utilities.filters import MultiValueCharFilter, MultiValueMACAddressFilter, TreeNodeMultipleChoiceFilter
-from utilities.filtersets import register_filterset
 from .choices import *
 from .models import *
 

netbox/vpn/filtersets.py

@@ -6,9 +6,9 @@ from core.models import ObjectType
 from dcim.models import Device, Interface
 from ipam.models import IPAddress, RouteTarget, VLAN
 from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet
+from netbox.plugins.registration import register_filterset
 from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet
 from utilities.filters import ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter
-from utilities.filtersets import register_filterset
 from virtualization.models import VirtualMachine, VMInterface
 from .choices import *
 from .models import *

netbox/wireless/filtersets.py

@@ -6,9 +6,9 @@ from dcim.base_filtersets import ScopedFilterSet
 from dcim.models import Interface
 from ipam.models import VLAN
 from netbox.filtersets import NestedGroupModelFilterSet, PrimaryModelFilterSet
+from netbox.plugins.registration import register_filterset
 from tenancy.filtersets import TenancyFilterSet
 from utilities.filters import TreeNodeMultipleChoiceFilter
-from utilities.filtersets import register_filterset
 from .choices import *
 from .models import *