Closes #7598: GraphQL Filter Redesign

netbox/circuits/graphql/enums.py

@@ -0,0 +1,86 @@
+from enum import Enum
+import strawberry
+
+__all__ = [
+    'CircuitStatusEnum',
+    'CircuitCommitRateEnum',
+    'CircuitTerminationSideEnum',
+    'CircuitTerminationPortSpeedEnum',
+    'CircuitPriorityEnum',
+    'VirtualCircuitTerminationRoleEnum',
+]
+
+#
+# Circuits
+#
+
+
+@strawberry.enum
+class CircuitStatusEnum(Enum):
+    STATUS_DEPROVISIONING = 'deprovisioning'
+    STATUS_ACTIVE = 'active'
+    STATUS_PLANNED = 'planned'
+    STATUS_PROVISIONING = 'provisioning'
+    STATUS_OFFLINE = 'offline'
+    STATUS_DECOMMISSIONED = 'decommissioned'
+
+
+@strawberry.enum
+class CircuitCommitRateEnum(Enum):
+    TEN_MBPS = 10000
+    HUNDRED_MBPS = 100000
+    ONE_GBPS = 1000000
+    TEN_GBPS = 10000000
+    TWENTY_FIVE_GBPS = 25000000
+    FORTY_GBPS = 40000000
+    HUNDRED_GBPS = 100000000
+    TWO_HUNDRED_GBPS = 200000000
+    FOUR_HUNDRED_GBPS = 400000000
+    T1 = 1544
+    E1 = 2048
+
+
+#
+# CircuitTerminations
+#
+
+
+@strawberry.enum
+class CircuitTerminationSideEnum(Enum):
+    SIDE_A = 'A'
+    SIDE_Z = 'Z'
+
+
+@strawberry.enum
+class CircuitTerminationPortSpeedEnum(Enum):
+    TEN_MBPS = 10000
+    HUNDRED_MBPS = 100000
+    ONE_GBPS = 1000000
+    TEN_GBPS = 10000000
+    TWENTY_FIVE_GBPS = 25000000
+    FORTY_GBPS = 40000000
+    HUNDRED_GBPS = 100000000
+    TWO_HUNDRED_GBPS = 200000000
+    FOUR_HUNDRED_GBPS = 400000000
+    T1 = 1544
+    E1 = 2048
+
+
+@strawberry.enum
+class CircuitPriorityEnum(Enum):
+    PRIORITY_PRIMARY = 'primary'
+    PRIORITY_SECONDARY = 'secondary'
+    PRIORITY_TERTIARY = 'tertiary'
+    PRIORITY_INACTIVE = 'inactive'
+
+
+#
+# Virtual circuits
+#
+
+
+@strawberry.enum
+class VirtualCircuitTerminationRoleEnum(Enum):
+    ROLE_PEER = 'peer'
+    ROLE_HUB = 'hub'
+    ROLE_SPOKE = 'spoke'

netbox/circuits/graphql/filter_mixins.py

@@ -0,0 +1,17 @@
+from dataclasses import dataclass
+from typing import Annotated, TYPE_CHECKING
+import strawberry
+import strawberry_django
+from netbox.graphql.filter_mixins import OrganizationalModelFilterMixin
+
+if TYPE_CHECKING:
+    from .filters import *
+    from core.graphql.filter_lookups import *
+    from netbox.graphql.enums import *
+
+__all__ = ['BaseCircuitTypeFilterMixin']
+
+
+@dataclass
+class BaseCircuitTypeFilterMixin(OrganizationalModelFilterMixin):
+    color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field()

netbox/circuits/graphql/filters.py

@@ -1,7 +1,33 @@
+from datetime import date
+from typing import Annotated, TYPE_CHECKING
+import strawberry
+from strawberry.scalars import ID
 import strawberry_django
-
-from circuits import filtersets, models
-from netbox.graphql.filter_mixins import autotype_decorator, BaseFilterMixin
+from strawberry_django import FilterLookup, DateFilterLookup
+from extras.graphql.filter_mixins import *
+from netbox.graphql.filter_mixins import *
+from core.graphql.filter_mixins import *
+from tenancy.graphql.filter_mixins import *
+from dcim.graphql.filter_mixins import *
+from .filter_mixins import *
+
+from circuits import models
+
+if TYPE_CHECKING:
+    from .enums import *
+    from netbox.graphql.enums import *
+    from wireless.graphql.enums import *
+    from core.graphql.filter_lookups import *
+    from core.graphql.filters import *
+    from extras.graphql.filters import *
+    from circuits.graphql.filters import *
+    from dcim.graphql.filters import *
+    from ipam.graphql.filters import *
+    from tenancy.graphql.filters import *
+    from wireless.graphql.filters import *
+    from users.graphql.filters import *
+    from virtualization.graphql.filters import *
+    from vpn.graphql.filters import *
 
 __all__ = (
     'CircuitFilter',
@@ -19,66 +45,165 @@
 
 
 @strawberry_django.filter(models.CircuitTermination, lookups=True)
-@autotype_decorator(filtersets.CircuitTerminationFilterSet)
-class CircuitTerminationFilter(BaseFilterMixin):
-    pass
+class CircuitTerminationFilter(
+    BaseObjectTypeFilterMixin,
+    CustomFieldsFilterMixin,
+    TagsFilterMixin,
+    ChangeLogFilterMixin,
+    CabledObjectModelFilterMixin,
+):
+    circuit: Annotated['CircuitFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    term_side: Annotated['CircuitTerminationSideEnum', strawberry.lazy('circuits.graphql.enums')] | None = (
+        strawberry_django.filter_field()
+    )
+    termination_type: Annotated['ContentTypeFilter', strawberry.lazy('core.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    termination_id: ID | None = strawberry_django.filter_field()
+    port_speed: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = (
+        strawberry_django.filter_field()
+    )
+    upstream_speed: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = (
+        strawberry_django.filter_field()
+    )
+    xconnect_id: FilterLookup[str] | None = strawberry_django.filter_field()
+    pp_info: FilterLookup[str] | None = strawberry_django.filter_field()
+    description: FilterLookup[str] | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.Circuit, lookups=True)
-@autotype_decorator(filtersets.CircuitFilterSet)
-class CircuitFilter(BaseFilterMixin):
-    pass
+class CircuitFilter(ContactFilterMixin, ImageAttachmentFilterMixin, DistanceFilterMixin, PrimaryModelFilterMixin):
+    cid: FilterLookup[str] | None = strawberry_django.filter_field()
+    provider: Annotated['ProviderFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    provider_id: ID | None = strawberry_django.filter_field()
+    provider_account: Annotated['ProviderAccountFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    provider_account_id: ID | None = strawberry_django.filter_field()
+    type: Annotated['CircuitTypeFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    type_id: ID | None = strawberry_django.filter_field()
+    status: Annotated['CircuitStatusEnum', strawberry.lazy('circuits.graphql.enums')] | None = (
+        strawberry_django.filter_field()
+    )
+    tenant: Annotated['TenantFilter', strawberry.lazy('tenancy.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    tenant_id: ID | None = strawberry_django.filter_field()
+    install_date: DateFilterLookup[date] | None = strawberry_django.filter_field()
+    termination_date: DateFilterLookup[date] | None = strawberry_django.filter_field()
+    commit_rate: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = (
+        strawberry_django.filter_field()
+    )
 
 
 @strawberry_django.filter(models.CircuitType, lookups=True)
-@autotype_decorator(filtersets.CircuitTypeFilterSet)
-class CircuitTypeFilter(BaseFilterMixin):
+class CircuitTypeFilter(BaseCircuitTypeFilterMixin):
     pass
 
 
 @strawberry_django.filter(models.CircuitGroup, lookups=True)
-@autotype_decorator(filtersets.CircuitGroupFilterSet)
-class CircuitGroupFilter(BaseFilterMixin):
-    pass
+class CircuitGroupFilter(OrganizationalModelFilterMixin):
+    tenant: Annotated['TenantFilter', strawberry.lazy('tenancy.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    tenant_id: ID | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.CircuitGroupAssignment, lookups=True)
-@autotype_decorator(filtersets.CircuitGroupAssignmentFilterSet)
-class CircuitGroupAssignmentFilter(BaseFilterMixin):
-    pass
+class CircuitGroupAssignmentFilter(
+    BaseObjectTypeFilterMixin, CustomFieldsFilterMixin, TagsFilterMixin, ChangeLogFilterMixin
+):
+    member_type: Annotated['ContentTypeFilter', strawberry.lazy('core.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    member_type_id: ID | None = strawberry_django.filter_field()
+    group: Annotated['CircuitGroupFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    group_id: ID | None = strawberry_django.filter_field()
+    priority: Annotated['CircuitPriorityEnum', strawberry.lazy('circuits.graphql.enums')] | None = (
+        strawberry_django.filter_field()
+    )
 
 
 @strawberry_django.filter(models.Provider, lookups=True)
-@autotype_decorator(filtersets.ProviderFilterSet)
-class ProviderFilter(BaseFilterMixin):
-    pass
+class ProviderFilter(ContactFilterMixin, PrimaryModelFilterMixin):
+    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    slug: FilterLookup[str] | None = strawberry_django.filter_field()
+    asns: Annotated['ASNFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.ProviderAccount, lookups=True)
-@autotype_decorator(filtersets.ProviderAccountFilterSet)
-class ProviderAccountFilter(BaseFilterMixin):
-    pass
+class ProviderAccountFilter(ContactFilterMixin, PrimaryModelFilterMixin):
+    provider: Annotated['ProviderFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    provider_id: ID | None = strawberry_django.filter_field()
+    account: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: FilterLookup[str] | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.ProviderNetwork, lookups=True)
-@autotype_decorator(filtersets.ProviderNetworkFilterSet)
-class ProviderNetworkFilter(BaseFilterMixin):
-    pass
+class ProviderNetworkFilter(PrimaryModelFilterMixin):
+    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    provider: Annotated['ProviderFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    provider_id: ID | None = strawberry_django.filter_field()
+    service_id: FilterLookup[str] | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.VirtualCircuitType, lookups=True)
-@autotype_decorator(filtersets.VirtualCircuitTypeFilterSet)
-class VirtualCircuitTypeFilter(BaseFilterMixin):
+class VirtualCircuitTypeFilter(BaseCircuitTypeFilterMixin):
     pass
 
 
 @strawberry_django.filter(models.VirtualCircuit, lookups=True)
-@autotype_decorator(filtersets.VirtualCircuitFilterSet)
-class VirtualCircuitFilter(BaseFilterMixin):
-    pass
+class VirtualCircuitFilter(PrimaryModelFilterMixin):
+    cid: FilterLookup[str] | None = strawberry_django.filter_field()
+    provider_network: Annotated['ProviderNetworkFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    provider_network_id: ID | None = strawberry_django.filter_field()
+    provider_account: Annotated['ProviderAccountFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    provider_account_id: ID | None = strawberry_django.filter_field()
+    type: Annotated['VirtualCircuitTypeFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    type_id: ID | None = strawberry_django.filter_field()
+    status: Annotated['CircuitStatusEnum', strawberry.lazy('circuits.graphql.enums')] | None = (
+        strawberry_django.filter_field()
+    )
+    tenant: Annotated['TenantFilter', strawberry.lazy('tenancy.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    tenant_id: ID | None = strawberry_django.filter_field()
+    group_assignments: Annotated['CircuitGroupAssignmentFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
 
 
 @strawberry_django.filter(models.VirtualCircuitTermination, lookups=True)
-@autotype_decorator(filtersets.VirtualCircuitTerminationFilterSet)
-class VirtualCircuitTerminationFilter(BaseFilterMixin):
-    pass
+class VirtualCircuitTerminationFilter(
+    BaseObjectTypeFilterMixin, CustomFieldsFilterMixin, TagsFilterMixin, ChangeLogFilterMixin
+):
+    virtual_circuit: Annotated['VirtualCircuitFilter', strawberry.lazy('circuits.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    virtual_circuit_id: ID | None = strawberry_django.filter_field()
+    role: Annotated['VirtualCircuitTerminationRoleEnum', strawberry.lazy('circuits.graphql.enums')] | None = (
+        strawberry_django.filter_field()
+    )
+    interface: Annotated['InterfaceFilter', strawberry.lazy('dcim.graphql.filters')] | None = (
+        strawberry_django.filter_field()
+    )
+    interface_id: ID | None = strawberry_django.filter_field()
+    description: FilterLookup[str] | None = strawberry_django.filter_field()