diff --git a/netbox/circuits/graphql/filter_mixins.py b/netbox/circuits/graphql/filter_mixins.py index 0e70fbec4..f3a0d1f4a 100644 --- a/netbox/circuits/graphql/filter_mixins.py +++ b/netbox/circuits/graphql/filter_mixins.py @@ -6,7 +6,7 @@ from netbox.graphql.filter_mixins import OrganizationalModelFilterMixin if TYPE_CHECKING: from .filters import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from netbox.graphql.enums import * __all__ = ['BaseCircuitTypeFilterMixin'] diff --git a/netbox/circuits/graphql/filters.py b/netbox/circuits/graphql/filters.py index 420367f6e..8e94ec2c2 100644 --- a/netbox/circuits/graphql/filters.py +++ b/netbox/circuits/graphql/filters.py @@ -17,7 +17,7 @@ if TYPE_CHECKING: from .enums import * from netbox.graphql.enums import * from wireless.graphql.enums import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from core.graphql.filters import * from extras.graphql.filters import * from circuits.graphql.filters import * @@ -62,10 +62,10 @@ class CircuitTerminationFilter( strawberry_django.filter_field() ) termination_id: ID | None = strawberry_django.filter_field() - port_speed: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + port_speed: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - upstream_speed: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + upstream_speed: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) xconnect_id: FilterLookup[str] | None = strawberry_django.filter_field() @@ -97,7 +97,7 @@ class CircuitFilter(ContactFilterMixin, ImageAttachmentFilterMixin, DistanceFilt 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 = ( + commit_rate: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) diff --git a/netbox/core/graphql/filters.py b/netbox/core/graphql/filters.py index dcbc6f4f8..e1feac715 100644 --- a/netbox/core/graphql/filters.py +++ b/netbox/core/graphql/filters.py @@ -9,7 +9,7 @@ from strawberry_django import ( ) from django.contrib.contenttypes.models import ContentType as DjangoContentType from core.graphql.filter_mixins import BaseFilterMixin -from core.graphql.filter_lookups import JSONFilter +from netbox.graphql.filter_lookups import JSONFilter from netbox.graphql.filter_mixins import ( PrimaryModelFilterMixin, ) @@ -17,7 +17,7 @@ from netbox.graphql.filter_mixins import ( from core import models if TYPE_CHECKING: - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from users.graphql.filters import * @@ -39,7 +39,7 @@ class DataFileFilter(BaseFilterMixin): ) source_id: ID | None = strawberry_django.filter_field() path: FilterLookup[str] | None = strawberry_django.filter_field() - size: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + size: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) hash: FilterLookup[str] | None = strawberry_django.filter_field() @@ -53,7 +53,7 @@ class DataSourceFilter(PrimaryModelFilterMixin): status: FilterLookup[str] | None = strawberry_django.filter_field() enabled: FilterLookup[bool] | None = strawberry_django.filter_field() ignore_rules: FilterLookup[str] | None = strawberry_django.filter_field() - parameters: Annotated['JSONFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + parameters: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) last_synced: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field() @@ -78,10 +78,10 @@ class ObjectChangeFilter(BaseFilterMixin): related_object_type_id: ID | None = strawberry_django.filter_field() related_object_id: ID | None = strawberry_django.filter_field() object_repr: FilterLookup[str] | None = strawberry_django.filter_field() - prechange_data: Annotated['JSONFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + prechange_data: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - postchange_data: Annotated['JSONFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + postchange_data: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) diff --git a/netbox/dcim/graphql/filter_mixins.py b/netbox/dcim/graphql/filter_mixins.py index cd1586134..dbe0fba00 100644 --- a/netbox/dcim/graphql/filter_mixins.py +++ b/netbox/dcim/graphql/filter_mixins.py @@ -10,7 +10,7 @@ from .enums import * if TYPE_CHECKING: from .filters import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from extras.graphql.filters import * from ipam.graphql.filters import * @@ -81,7 +81,7 @@ class RenderConfigFilterMixin(BaseFilterMixin): @dataclass class InterfaceBaseFilterMixin(BaseFilterMixin): enabled: FilterLookup[bool] | None = strawberry_django.filter_field() - mtu: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + mtu: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) mode: InterfaceModeEnum | None = strawberry_django.filter_field() @@ -114,25 +114,25 @@ class InterfaceBaseFilterMixin(BaseFilterMixin): @dataclass class RackBaseFilterMixin(WeightFilterMixin, PrimaryModelFilterMixin): width: Annotated['RackWidthEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field() - u_height: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + u_height: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - starting_unit: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + starting_unit: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) desc_units: FilterLookup[bool] | None = strawberry_django.filter_field() - outer_width: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + outer_width: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - outer_depth: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + outer_depth: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) outer_unit: Annotated['RackDimensionUnitEnum', strawberry.lazy('dcim.graphql.enums')] | None = ( strawberry_django.filter_field() ) - mounting_depth: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + mounting_depth: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - max_weight: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + max_weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) diff --git a/netbox/dcim/graphql/filters.py b/netbox/dcim/graphql/filters.py index b9fcedfaf..fff312106 100644 --- a/netbox/dcim/graphql/filters.py +++ b/netbox/dcim/graphql/filters.py @@ -24,7 +24,7 @@ if TYPE_CHECKING: from .enums import * from netbox.graphql.enums import * from wireless.graphql.enums import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from core.graphql.filters import * from extras.graphql.filters import * from circuits.graphql.filters import * @@ -90,7 +90,7 @@ class CableFilter(PrimaryModelFilterMixin, TenancyFilterMixin): status: Annotated['LinkStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field() label: FilterLookup[str] | None = strawberry_django.filter_field() color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field() - length: Annotated['FloatLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + length: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) length_unit: Annotated['CableLengthUnitEnum', strawberry.lazy('dcim.graphql.enums')] | None = ( @@ -176,12 +176,12 @@ class DeviceFilter( location: Annotated['LocationFilter', strawberry.lazy('dcim.graphql.filters')] | None = ( strawberry_django.filter_field() ) - location_id: Annotated['TreeNodeFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + location_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) rack: Annotated['RackFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field() rack_id: ID | None = strawberry_django.filter_field() - position: Annotated['FloatLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + position: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) face: Annotated['DeviceFaceEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field() @@ -211,16 +211,16 @@ class DeviceFilter( strawberry_django.filter_field() ) virtual_chassis_id: ID | None = strawberry_django.filter_field() - vc_position: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + vc_position: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - vc_priority: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + vc_priority: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - latitude: Annotated['FloatLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + latitude: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - longitude: Annotated['FloatLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + longitude: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) interfaces: Annotated['InterfaceFilter', strawberry.lazy('dcim.graphql.filters')] | None = ( @@ -307,7 +307,7 @@ class DeviceTypeFilter(ImageAttachmentFilterMixin, PrimaryModelFilterMixin, Weig ) default_platform_id: ID | None = strawberry_django.filter_field() part_number: FilterLookup[str] | None = strawberry_django.filter_field() - u_height: Annotated['FloatLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + u_height: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) exclude_from_utilization: FilterLookup[bool] | None = strawberry_django.filter_field() @@ -334,7 +334,7 @@ class FrontPortFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterM strawberry_django.filter_field() ) rear_port_id: ID | None = strawberry_django.filter_field() - rear_port_position: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + rear_port_position: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -347,7 +347,7 @@ class FrontPortTemplateFilter(ModularComponentTemplateFilterMixin): strawberry_django.filter_field() ) rear_port_id: ID | None = strawberry_django.filter_field() - rear_port_position: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + rear_port_position: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -372,7 +372,7 @@ class InterfaceFilter(ModularComponentModelFilterMixin, InterfaceBaseFilterMixin strawberry_django.filter_field() ) mgmt_only: FilterLookup[bool] | None = strawberry_django.filter_field() - speed: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + speed: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) duplex: Annotated['InterfaceDuplexEnum', strawberry.lazy('dcim.graphql.enums')] | None = ( @@ -385,13 +385,13 @@ class InterfaceFilter(ModularComponentModelFilterMixin, InterfaceBaseFilterMixin rf_channel: Annotated['WirelessChannelEnum', strawberry.lazy('wireless.graphql.enums')] | None = ( strawberry_django.filter_field() ) - rf_channel_frequency: Annotated['FloatLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + rf_channel_frequency: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - rf_channel_width: Annotated['FloatLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + rf_channel_width: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - tx_power: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + tx_power: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) poe_mode: Annotated['InterfacePoEModeEnum', strawberry.lazy('dcim.graphql.enums')] | None = ( @@ -584,16 +584,16 @@ class PowerFeedFilter(PrimaryModelFilterMixin, CabledObjectModelFilterMixin): phase: Annotated['PowerFeedPhaseEnum', strawberry.lazy('dcim.graphql.enums')] | None = ( strawberry_django.filter_field() ) - voltage: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + voltage: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - amperage: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + amperage: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - max_utilization: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + max_utilization: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - available_power: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + available_power: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) tenant: Annotated['TenantFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( @@ -638,7 +638,7 @@ class PowerPanelFilter(ContactFilterMixin, ImageAttachmentFilterMixin, PrimaryMo location: Annotated['LocationFilter', strawberry.lazy('dcim.graphql.filters')] | None = ( strawberry_django.filter_field() ) - location_id: Annotated['TreeNodeFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + location_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) name: FilterLookup[str] | None = strawberry_django.filter_field() @@ -649,10 +649,10 @@ class PowerPortFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterM type: Annotated['PowerPortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = ( strawberry_django.filter_field() ) - maximum_draw: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + maximum_draw: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - allocated_draw: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + allocated_draw: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -662,10 +662,10 @@ class PowerPortTemplateFilter(ModularComponentTemplateFilterMixin): type: Annotated['PowerPortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = ( strawberry_django.filter_field() ) - maximum_draw: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + maximum_draw: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - allocated_draw: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + allocated_draw: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -699,7 +699,7 @@ class RackFilter(ContactFilterMixin, ImageAttachmentFilterMixin, RackBaseFilterM location: Annotated['LocationFilter', strawberry.lazy('dcim.graphql.filters')] | None = ( strawberry_django.filter_field() ) - location_id: Annotated['TreeNodeFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + location_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) tenant: Annotated['TenantFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( @@ -723,7 +723,7 @@ class RackFilter(ContactFilterMixin, ImageAttachmentFilterMixin, RackBaseFilterM class RackReservationFilter(PrimaryModelFilterMixin): rack: Annotated['RackFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field() rack_id: ID | None = strawberry_django.filter_field() - units: Annotated['IntegerArrayLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + units: Annotated['IntegerArrayLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) tenant: Annotated['TenantFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( @@ -744,7 +744,7 @@ class RackRoleFilter(OrganizationalModelFilterMixin): class RearPortFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterMixin): type: Annotated['PortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field() color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field() - positions: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + positions: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -753,7 +753,7 @@ class RearPortFilter(ModularComponentModelFilterMixin, CabledObjectModelFilterMi class RearPortTemplateFilter(ModularComponentTemplateFilterMixin): type: Annotated['PortTypeEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field() color: Annotated['ColorEnum', strawberry.lazy('netbox.graphql.enums')] | None = strawberry_django.filter_field() - positions: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + positions: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -774,13 +774,13 @@ class SiteFilter(ContactFilterMixin, ImageAttachmentFilterMixin, PrimaryModelFil slug: FilterLookup[str] | None = strawberry_django.filter_field() status: Annotated['SiteStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = strawberry_django.filter_field() region: Annotated['RegionFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field() - region_id: Annotated['TreeNodeFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + region_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) group: Annotated['SiteGroupFilter', strawberry.lazy('dcim.graphql.filters')] | None = ( strawberry_django.filter_field() ) - group_id: Annotated['TreeNodeFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + group_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) tenant: Annotated['TenantFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( @@ -792,10 +792,10 @@ class SiteFilter(ContactFilterMixin, ImageAttachmentFilterMixin, PrimaryModelFil time_zone: FilterLookup[str] | None = strawberry_django.filter_field() physical_address: FilterLookup[str] | None = strawberry_django.filter_field() shipping_address: FilterLookup[str] | None = strawberry_django.filter_field() - latitude: Annotated['FloatLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + latitude: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - longitude: Annotated['FloatLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + longitude: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) prefixes: Annotated['PrefixFilter', strawberry.lazy('ipam.graphql.filters')] | None = ( @@ -832,7 +832,7 @@ class VirtualDeviceContextFilter(PrimaryModelFilterMixin): status: Annotated['VirtualDeviceContextStatusEnum', strawberry.lazy('dcim.graphql.enums')] | None = ( strawberry_django.filter_field() ) - identifier: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + identifier: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) primary_ip4: Annotated['IPAddressFilter', strawberry.lazy('ipam.graphql.filters')] | None = ( diff --git a/netbox/extras/graphql/filter_mixins.py b/netbox/extras/graphql/filter_mixins.py index 726ae046e..b0e8d3c53 100644 --- a/netbox/extras/graphql/filter_mixins.py +++ b/netbox/extras/graphql/filter_mixins.py @@ -6,7 +6,7 @@ from strawberry_django import FilterLookup from core.graphql.filter_mixins import BaseFilterMixin if TYPE_CHECKING: - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from .filters import * __all__ = [ @@ -20,7 +20,7 @@ __all__ = [ @dataclass class CustomFieldsFilterMixin(BaseFilterMixin): - custom_field_data: Annotated['JSONFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + custom_field_data: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) diff --git a/netbox/extras/graphql/filters.py b/netbox/extras/graphql/filters.py index e80487fa0..7fc390b54 100644 --- a/netbox/extras/graphql/filters.py +++ b/netbox/extras/graphql/filters.py @@ -17,7 +17,7 @@ if TYPE_CHECKING: from .enums import * from netbox.graphql.enums import * from wireless.graphql.enums import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from extras.graphql.filters import * from circuits.graphql.filters import * from dcim.graphql.filters import * @@ -49,7 +49,7 @@ __all__ = ( @strawberry_django.filter(models.ConfigContext, lookups=True) class ConfigContextFilter(BaseObjectTypeFilterMixin, SyncedDataFilterMixin, ChangeLogFilterMixin): name: FilterLookup[str] = strawberry_django.filter_field() - weight: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) description: FilterLookup[str] = strawberry_django.filter_field() @@ -57,13 +57,13 @@ class ConfigContextFilter(BaseObjectTypeFilterMixin, SyncedDataFilterMixin, Chan regions: Annotated['RegionFilter', strawberry.lazy('dcim.graphql.filters')] | None = ( strawberry_django.filter_field() ) - region_id: Annotated['TreeNodeFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + region_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) site_groups: Annotated['SiteGroupFilter', strawberry.lazy('dcim.graphql.filters')] | None = ( strawberry_django.filter_field() ) - site_group_id: Annotated['TreeNodeFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + site_group_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) sites: Annotated['SiteFilter', strawberry.lazy('dcim.graphql.filters')] | None = strawberry_django.filter_field() @@ -91,14 +91,14 @@ class ConfigContextFilter(BaseObjectTypeFilterMixin, SyncedDataFilterMixin, Chan tenant_groups: Annotated['TenantGroupFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( strawberry_django.filter_field() ) - tenant_group_id: Annotated['TreeNodeFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + tenant_group_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) tenants: Annotated['TenantFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( strawberry_django.filter_field() ) tags: Annotated['TagFilter', strawberry.lazy('extras.graphql.filters')] | None = strawberry_django.filter_field() - data: Annotated['JSONFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + data: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -108,7 +108,7 @@ class ConfigTemplateFilter(BaseObjectTypeFilterMixin, SyncedDataFilterMixin, Cha name: FilterLookup[str] | None = strawberry_django.filter_field() description: FilterLookup[str] | None = strawberry_django.filter_field() template_code: FilterLookup[str] | None = strawberry_django.filter_field() - environment_params: Annotated['JSONFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + environment_params: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -125,25 +125,25 @@ class CustomFieldFilter(BaseObjectTypeFilterMixin, ChangeLogFilterMixin): description: FilterLookup[str] | None = strawberry_django.filter_field() required: FilterLookup[bool] | None = strawberry_django.filter_field() unique: FilterLookup[bool] | None = strawberry_django.filter_field() - search_weight: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + search_weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) filter_logic: Annotated['CustomFieldFilterLogicEnum', strawberry.lazy('extras.graphql.enums')] | None = ( strawberry_django.filter_field() ) - default: Annotated['JSONFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + default: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - related_object_filter: Annotated['JSONFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + related_object_filter: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - weight: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - validation_minimum: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + validation_minimum: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - validation_maximum: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + validation_maximum: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) validation_regex: FilterLookup[str] | None = strawberry_django.filter_field() @@ -168,7 +168,7 @@ class CustomFieldChoiceSetFilter(BaseObjectTypeFilterMixin, ChangeLogFilterMixin base_choices: Annotated['CustomFieldChoiceSetBaseEnum', strawberry.lazy('extras.graphql.enums')] | None = ( strawberry_django.filter_field() ) - extra_choices: Annotated['StringArrayLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + extra_choices: Annotated['StringArrayLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) order_alphabetically: FilterLookup[bool] | None = strawberry_django.filter_field() @@ -180,7 +180,7 @@ class CustomLinkFilter(BaseObjectTypeFilterMixin, ChangeLogFilterMixin): enabled: FilterLookup[bool] | None = strawberry_django.filter_field() link_text: FilterLookup[str] | None = strawberry_django.filter_field() link_url: FilterLookup[str] | None = strawberry_django.filter_field() - weight: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) group_name: FilterLookup[str] | None = strawberry_django.filter_field() @@ -201,10 +201,10 @@ class ExportTemplateFilter(BaseObjectTypeFilterMixin, SyncedDataFilterMixin, Cha @strawberry_django.filter(models.ImageAttachment, lookups=True) class ImageAttachmentFilter(BaseObjectTypeFilterMixin, ChangeLogFilterMixin): object_id: ID | None = strawberry_django.filter_field() - image_height: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + image_height: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - image_width: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + image_width: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) name: FilterLookup[str] | None = strawberry_django.filter_field() @@ -241,12 +241,12 @@ class SavedFilterFilter(BaseObjectTypeFilterMixin, ChangeLogFilterMixin): description: FilterLookup[str] | None = strawberry_django.filter_field() user: Annotated['UserFilter', strawberry.lazy('users.graphql.filters')] | None = strawberry_django.filter_field() user_id: ID | None = strawberry_django.filter_field() - weight: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) enabled: FilterLookup[bool] | None = strawberry_django.filter_field() shared: FilterLookup[bool] | None = strawberry_django.filter_field() - parameters: Annotated['JSONFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + parameters: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -280,11 +280,11 @@ class WebhookFilter(BaseObjectTypeFilterMixin, CustomFieldsFilterMixin, TagsFilt class EventRuleFilter(BaseObjectTypeFilterMixin, CustomFieldsFilterMixin, TagsFilterMixin, ChangeLogFilterMixin): name: FilterLookup[str] | None = strawberry_django.filter_field() description: FilterLookup[str] | None = strawberry_django.filter_field() - event_types: Annotated['StringArrayLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + event_types: Annotated['StringArrayLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) enabled: FilterLookup[bool] | None = strawberry_django.filter_field() - conditions: Annotated['JSONFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + conditions: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) action_type: Annotated['EventRuleActionEnum', strawberry.lazy('extras.graphql.enums')] | None = ( @@ -293,7 +293,7 @@ class EventRuleFilter(BaseObjectTypeFilterMixin, CustomFieldsFilterMixin, TagsFi action_object_type: FilterLookup[str] | None = strawberry_django.filter_field() action_object_type_id: ID | None = strawberry_django.filter_field() action_object_id: ID | None = strawberry_django.filter_field() - action_data: Annotated['JSONFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + action_data: Annotated['JSONFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) comments: FilterLookup[str] | None = strawberry_django.filter_field() diff --git a/netbox/ipam/graphql/filter_mixins.py b/netbox/ipam/graphql/filter_mixins.py index 74c189344..187a0a270 100644 --- a/netbox/ipam/graphql/filter_mixins.py +++ b/netbox/ipam/graphql/filter_mixins.py @@ -7,7 +7,7 @@ from core.graphql.filter_mixins import * if TYPE_CHECKING: from .enums import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * __all__ = ['ServiceBaseFilterMixin'] @@ -17,6 +17,6 @@ class ServiceBaseFilterMixin(BaseFilterMixin): protocol: Annotated['ServiceProtocolEnum', strawberry.lazy('ipam.graphql.enums')] | None = ( strawberry_django.filter_field() ) - ports: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + ports: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) diff --git a/netbox/ipam/graphql/filters.py b/netbox/ipam/graphql/filters.py index 40c98a99c..a66d40e31 100644 --- a/netbox/ipam/graphql/filters.py +++ b/netbox/ipam/graphql/filters.py @@ -21,7 +21,7 @@ if TYPE_CHECKING: from .enums import * from netbox.graphql.enums import * from wireless.graphql.enums import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from core.graphql.filters import * from extras.graphql.filters import * from circuits.graphql.filters import * @@ -59,7 +59,7 @@ __all__ = ( class ASNFilter(PrimaryModelFilterMixin): rir: Annotated['RIRFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field() rir_id: ID | None = strawberry_django.filter_field() - asn: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + asn: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) tenant: Annotated['TenantFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( @@ -74,10 +74,10 @@ class ASNRangeFilter(OrganizationalModelFilterMixin): slug: FilterLookup[str] | None = strawberry_django.filter_field() rir: Annotated['RIRFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field() rir_id: ID | None = strawberry_django.filter_field() - start: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + start: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - end: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + end: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) tenant: Annotated['TenantFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( @@ -101,7 +101,7 @@ class AggregateFilter(ContactFilterMixin, PrimaryModelFilterMixin): @strawberry_django.filter(models.FHRPGroup, lookups=True) class FHRPGroupFilter(PrimaryModelFilterMixin): - group_id: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + group_id: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) name: FilterLookup[str] | None = strawberry_django.filter_field() @@ -127,7 +127,7 @@ class FHRPGroupAssignmentFilter(BaseObjectTypeFilterMixin, ChangeLogFilterMixin) strawberry_django.filter_field() ) group_id: ID | None = strawberry_django.filter_field() - priority: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + priority: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -179,7 +179,7 @@ class IPAddressFilter(ContactFilterMixin, PrimaryModelFilterMixin): class IPRangeFilter(ContactFilterMixin, PrimaryModelFilterMixin): start_address: FilterLookup[str] | None = strawberry_django.filter_field() end_address: FilterLookup[str] | None = strawberry_django.filter_field() - size: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + size: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) vrf: Annotated['VRFFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field() @@ -241,7 +241,7 @@ class RIRFilter(OrganizationalModelFilterMixin): @strawberry_django.filter(models.Role, lookups=True) class RoleFilter(OrganizationalModelFilterMixin): - weight: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + weight: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -282,7 +282,7 @@ class VLANFilter(PrimaryModelFilterMixin): strawberry_django.filter_field() ) group_id: ID | None = strawberry_django.filter_field() - vid: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + vid: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) name: FilterLookup[str] | None = strawberry_django.filter_field() @@ -316,7 +316,7 @@ class VLANGroupFilter(OrganizationalModelFilterMixin): ) scope_type_id: ID | None = strawberry_django.filter_field() scope_id: ID | None = strawberry_django.filter_field() - vid_ranges: Annotated['IntegerArrayLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + vid_ranges: Annotated['IntegerArrayLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -333,10 +333,10 @@ class VLANTranslationRuleFilter(NetBoxModelFilterMixin): ) policy_id: ID | None = strawberry_django.filter_field() description: FilterLookup[str] | None = strawberry_django.filter_field() - local_vid: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + local_vid: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - remote_vid: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + remote_vid: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) diff --git a/netbox/core/graphql/filter_lookups.py b/netbox/netbox/graphql/filter_lookups.py similarity index 100% rename from netbox/core/graphql/filter_lookups.py rename to netbox/netbox/graphql/filter_lookups.py diff --git a/netbox/netbox/graphql/filter_mixins.py b/netbox/netbox/graphql/filter_mixins.py index 078bf81ed..09bd71bfc 100644 --- a/netbox/netbox/graphql/filter_mixins.py +++ b/netbox/netbox/graphql/filter_mixins.py @@ -10,7 +10,7 @@ from strawberry_django import FilterLookup, DatetimeFilterLookup from extras.models import * from utilities.filters import * -from core.graphql.filter_lookups import * +from netbox.graphql.filter_lookups import * from core.graphql.filter_mixins import * from extras.graphql.filter_mixins import * diff --git a/netbox/tenancy/graphql/filter_mixins.py b/netbox/tenancy/graphql/filter_mixins.py index dffd5d85b..e1604fa87 100644 --- a/netbox/tenancy/graphql/filter_mixins.py +++ b/netbox/tenancy/graphql/filter_mixins.py @@ -7,7 +7,7 @@ from core.graphql.filter_mixins import BaseFilterMixin if TYPE_CHECKING: from .filters import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * __all__ = ['TenancyFilterMixin', 'ContactFilterMixin'] @@ -28,6 +28,6 @@ class TenancyFilterMixin(BaseFilterMixin): group: Annotated['TenantGroupFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( strawberry_django.filter_field() ) - group_id: Annotated['TreeNodeFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + group_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) diff --git a/netbox/tenancy/graphql/filters.py b/netbox/tenancy/graphql/filters.py index 97074226b..06af3f8b9 100644 --- a/netbox/tenancy/graphql/filters.py +++ b/netbox/tenancy/graphql/filters.py @@ -16,7 +16,7 @@ from tenancy import models from .filter_mixins import ContactFilterMixin if TYPE_CHECKING: - from core.graphql.filter_lookups import TreeNodeFilter + from netbox.graphql.filter_lookups import TreeNodeFilter from circuits.graphql.filters import * from dcim.graphql.filters import * from ipam.graphql.filters import * @@ -41,7 +41,7 @@ class TenantFilter(PrimaryModelFilterMixin, ContactFilterMixin): group: Annotated['TenantGroupFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( strawberry_django.filter_field() ) - group_id: Annotated['TreeNodeFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + group_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) asns: Annotated['ASNFilter', strawberry.lazy('ipam.graphql.filters')] | None = strawberry_django.filter_field() @@ -127,7 +127,7 @@ class ContactFilter(PrimaryModelFilterMixin): group: Annotated['ContactGroupFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( strawberry_django.filter_field() ) - group_id: Annotated['TreeNodeFilter', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + group_id: Annotated['TreeNodeFilter', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) assignments: Annotated['ContactAssignmentFilter', strawberry.lazy('tenancy.graphql.filters')] | None = ( diff --git a/netbox/users/graphql/filters.py b/netbox/users/graphql/filters.py index e9d6e51f1..1027c7c39 100644 --- a/netbox/users/graphql/filters.py +++ b/netbox/users/graphql/filters.py @@ -16,7 +16,7 @@ if TYPE_CHECKING: from .enums import * from netbox.graphql.enums import * from wireless.graphql.enums import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from extras.graphql.filters import * from circuits.graphql.filters import * from dcim.graphql.filters import * diff --git a/netbox/virtualization/graphql/filters.py b/netbox/virtualization/graphql/filters.py index b3910719d..d2d34d54e 100644 --- a/netbox/virtualization/graphql/filters.py +++ b/netbox/virtualization/graphql/filters.py @@ -18,7 +18,7 @@ if TYPE_CHECKING: from .enums import * from netbox.graphql.enums import * from wireless.graphql.enums import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from extras.graphql.filters import * from circuits.graphql.filters import * from dcim.graphql.filters import * @@ -113,13 +113,13 @@ class VirtualMachineFilter( strawberry_django.filter_field() ) primary_ip6_id: ID | None = strawberry_django.filter_field() - vcpus: Annotated['FloatLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + vcpus: Annotated['FloatLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - memory: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + memory: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - disk: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + disk: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) serial: FilterLookup[str] | None = strawberry_django.filter_field() @@ -157,6 +157,6 @@ class VMInterfaceFilter(VMComponentFilterMixin, InterfaceBaseFilterMixin): @strawberry_django.filter(models.VirtualDisk, lookups=True) class VirtualDiskFilter(VMComponentFilterMixin): - size: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + size: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) diff --git a/netbox/vpn/graphql/filters.py b/netbox/vpn/graphql/filters.py index f910ce18a..e69455ae5 100644 --- a/netbox/vpn/graphql/filters.py +++ b/netbox/vpn/graphql/filters.py @@ -17,7 +17,7 @@ if TYPE_CHECKING: from .enums import * from netbox.graphql.enums import * from wireless.graphql.enums import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from core.graphql.filters import * from extras.graphql.filters import * from circuits.graphql.filters import * @@ -89,7 +89,7 @@ class TunnelFilter(PrimaryModelFilterMixin): strawberry_django.filter_field() ) tenant_id: ID | None = strawberry_django.filter_field() - tunnel_id: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + tunnel_id: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -107,7 +107,7 @@ class IKEProposalFilter(PrimaryModelFilterMixin): strawberry_django.filter_field() ) group: Annotated['DHGroupEnum', strawberry.lazy('vpn.graphql.enums')] | None = strawberry_django.filter_field() - sa_lifetime: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + sa_lifetime: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -132,10 +132,10 @@ class IPSecProposalFilter(PrimaryModelFilterMixin): authentication_algorithm: Annotated['AuthenticationAlgorithmEnum', strawberry.lazy('vpn.graphql.enums')] | None = ( strawberry_django.filter_field() ) - sa_lifetime_seconds: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + sa_lifetime_seconds: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) - sa_lifetime_data: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + sa_lifetime_data: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) @@ -168,7 +168,7 @@ class L2VPNFilter(ContactFilterMixin, PrimaryModelFilterMixin): name: FilterLookup[str] | None = strawberry_django.filter_field() slug: FilterLookup[str] | None = strawberry_django.filter_field() type: Annotated['L2VPNTypeEnum', strawberry.lazy('vpn.graphql.enums')] | None = strawberry_django.filter_field() - identifier: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + identifier: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) import_targets: Annotated['RouteTargetFilter', strawberry.lazy('ipam.graphql.filters')] | None = ( @@ -190,6 +190,6 @@ class L2VPNTerminationFilter(NetBoxModelFilterMixin): assigned_object_type: Annotated['ContentTypeFilter', strawberry.lazy('core.graphql.filters')] | None = ( strawberry_django.filter_field() ) - assigned_object_id: Annotated['IntegerLookup', strawberry.lazy('core.graphql.filter_lookups')] | None = ( + assigned_object_id: Annotated['IntegerLookup', strawberry.lazy('netbox.graphql.filter_lookups')] | None = ( strawberry_django.filter_field() ) diff --git a/netbox/wireless/graphql/filters.py b/netbox/wireless/graphql/filters.py index 890991a4d..5fe233a6a 100644 --- a/netbox/wireless/graphql/filters.py +++ b/netbox/wireless/graphql/filters.py @@ -17,7 +17,7 @@ if TYPE_CHECKING: from .enums import * from netbox.graphql.enums import * from wireless.graphql.enums import * - from core.graphql.filter_lookups import * + from netbox.graphql.filter_lookups import * from extras.graphql.filters import * from circuits.graphql.filters import * from dcim.graphql.filters import *