diff --git a/netbox/circuits/api/serializers_/circuits.py b/netbox/circuits/api/serializers_/circuits.py index af6fbc3ec..3ce6bd82b 100644 --- a/netbox/circuits/api/serializers_/circuits.py +++ b/netbox/circuits/api/serializers_/circuits.py @@ -29,9 +29,9 @@ from tenancy.api.serializers_.tenants import TenantSerializer from .providers import ProviderAccountSerializer, ProviderNetworkSerializer, ProviderSerializer __all__ = ( - 'CircuitSerializer', 'CircuitGroupAssignmentSerializer', 'CircuitGroupSerializer', + 'CircuitSerializer', 'CircuitTerminationSerializer', 'CircuitTypeSerializer', 'VirtualCircuitSerializer', diff --git a/netbox/circuits/filtersets.py b/netbox/circuits/filtersets.py index d8d464d07..3ed9145be 100644 --- a/netbox/circuits/filtersets.py +++ b/netbox/circuits/filtersets.py @@ -25,9 +25,9 @@ __all__ = ( 'CircuitGroupFilterSet', 'CircuitTerminationFilterSet', 'CircuitTypeFilterSet', - 'ProviderNetworkFilterSet', 'ProviderAccountFilterSet', 'ProviderFilterSet', + 'ProviderNetworkFilterSet', 'VirtualCircuitFilterSet', 'VirtualCircuitTerminationFilterSet', 'VirtualCircuitTypeFilterSet', diff --git a/netbox/circuits/forms/bulk_edit.py b/netbox/circuits/forms/bulk_edit.py index 1a0427445..d9eb0f775 100644 --- a/netbox/circuits/forms/bulk_edit.py +++ b/netbox/circuits/forms/bulk_edit.py @@ -33,8 +33,8 @@ __all__ = ( 'CircuitGroupBulkEditForm', 'CircuitTerminationBulkEditForm', 'CircuitTypeBulkEditForm', - 'ProviderBulkEditForm', 'ProviderAccountBulkEditForm', + 'ProviderBulkEditForm', 'ProviderNetworkBulkEditForm', 'VirtualCircuitBulkEditForm', 'VirtualCircuitTerminationBulkEditForm', diff --git a/netbox/circuits/forms/bulk_import.py b/netbox/circuits/forms/bulk_import.py index dbcd1554b..2c98598fb 100644 --- a/netbox/circuits/forms/bulk_import.py +++ b/netbox/circuits/forms/bulk_import.py @@ -12,14 +12,14 @@ from tenancy.models import Tenant from utilities.forms.fields import CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, SlugField __all__ = ( - 'CircuitImportForm', 'CircuitGroupAssignmentImportForm', 'CircuitGroupImportForm', + 'CircuitImportForm', 'CircuitTerminationImportForm', 'CircuitTerminationImportRelatedForm', 'CircuitTypeImportForm', - 'ProviderImportForm', 'ProviderAccountImportForm', + 'ProviderImportForm', 'ProviderNetworkImportForm', 'VirtualCircuitImportForm', 'VirtualCircuitTerminationImportForm', diff --git a/netbox/circuits/forms/filtersets.py b/netbox/circuits/forms/filtersets.py index 3065f6338..7ce0e2a80 100644 --- a/netbox/circuits/forms/filtersets.py +++ b/netbox/circuits/forms/filtersets.py @@ -25,8 +25,8 @@ __all__ = ( 'CircuitGroupFilterForm', 'CircuitTerminationFilterForm', 'CircuitTypeFilterForm', - 'ProviderFilterForm', 'ProviderAccountFilterForm', + 'ProviderFilterForm', 'ProviderNetworkFilterForm', 'VirtualCircuitFilterForm', 'VirtualCircuitTerminationFilterForm', diff --git a/netbox/circuits/forms/model_forms.py b/netbox/circuits/forms/model_forms.py index e25f39a3a..63f6a4364 100644 --- a/netbox/circuits/forms/model_forms.py +++ b/netbox/circuits/forms/model_forms.py @@ -32,8 +32,8 @@ __all__ = ( 'CircuitGroupForm', 'CircuitTerminationForm', 'CircuitTypeForm', - 'ProviderForm', 'ProviderAccountForm', + 'ProviderForm', 'ProviderNetworkForm', 'VirtualCircuitForm', 'VirtualCircuitTerminationForm', diff --git a/netbox/circuits/graphql/enums.py b/netbox/circuits/graphql/enums.py index c99fbda95..894634774 100644 --- a/netbox/circuits/graphql/enums.py +++ b/netbox/circuits/graphql/enums.py @@ -3,9 +3,9 @@ import strawberry from circuits.choices import * __all__ = ( + 'CircuitPriorityEnum', 'CircuitStatusEnum', 'CircuitTerminationSideEnum', - 'CircuitPriorityEnum', 'VirtualCircuitTerminationRoleEnum', ) diff --git a/netbox/circuits/graphql/filters.py b/netbox/circuits/graphql/filters.py index e72ee71e9..f531a16ff 100644 --- a/netbox/circuits/graphql/filters.py +++ b/netbox/circuits/graphql/filters.py @@ -28,8 +28,8 @@ __all__ = ( 'CircuitGroupFilter', 'CircuitTerminationFilter', 'CircuitTypeFilter', - 'ProviderFilter', 'ProviderAccountFilter', + 'ProviderFilter', 'ProviderNetworkFilter', 'VirtualCircuitFilter', 'VirtualCircuitTerminationFilter', diff --git a/netbox/circuits/graphql/types.py b/netbox/circuits/graphql/types.py index 3da3059b8..e659bb460 100644 --- a/netbox/circuits/graphql/types.py +++ b/netbox/circuits/graphql/types.py @@ -21,9 +21,9 @@ __all__ = ( 'CircuitTerminationType', 'CircuitType', 'CircuitTypeType', - 'ProviderType', 'ProviderAccountType', 'ProviderNetworkType', + 'ProviderType', 'VirtualCircuitTerminationType', 'VirtualCircuitType', 'VirtualCircuitTypeType', diff --git a/netbox/circuits/models/providers.py b/netbox/circuits/models/providers.py index be81caa54..f12912536 100644 --- a/netbox/circuits/models/providers.py +++ b/netbox/circuits/models/providers.py @@ -6,9 +6,9 @@ from netbox.models import PrimaryModel from netbox.models.features import ContactsMixin __all__ = ( - 'ProviderNetwork', 'Provider', 'ProviderAccount', + 'ProviderNetwork', ) diff --git a/netbox/circuits/tables/providers.py b/netbox/circuits/tables/providers.py index 4fbdff8c7..c546349f9 100644 --- a/netbox/circuits/tables/providers.py +++ b/netbox/circuits/tables/providers.py @@ -7,9 +7,9 @@ from netbox.tables import PrimaryModelTable, columns from tenancy.tables import ContactsColumnMixin __all__ = ( - 'ProviderTable', 'ProviderAccountTable', 'ProviderNetworkTable', + 'ProviderTable', ) diff --git a/netbox/core/api/serializers_/tasks.py b/netbox/core/api/serializers_/tasks.py index f5f941e61..5bdafe858 100644 --- a/netbox/core/api/serializers_/tasks.py +++ b/netbox/core/api/serializers_/tasks.py @@ -2,8 +2,8 @@ from rest_framework import serializers from rest_framework.reverse import reverse __all__ = ( - 'BackgroundTaskSerializer', 'BackgroundQueueSerializer', + 'BackgroundTaskSerializer', 'BackgroundWorkerSerializer', ) diff --git a/netbox/core/graphql/filters.py b/netbox/core/graphql/filters.py index b4fe7af73..65d10836a 100644 --- a/netbox/core/graphql/filters.py +++ b/netbox/core/graphql/filters.py @@ -17,10 +17,10 @@ if TYPE_CHECKING: from users.graphql.filters import UserFilter __all__ = ( + 'ContentTypeFilter', 'DataFileFilter', 'DataSourceFilter', 'ObjectChangeFilter', - 'ContentTypeFilter', ) diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index 98ca71cdf..b92ec52b4 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -46,8 +46,8 @@ from .models import * __all__ = ( 'CableFilterSet', - 'CabledObjectFilterSet', 'CableTerminationFilterSet', + 'CabledObjectFilterSet', 'CommonInterfaceFilterSet', 'ConsoleConnectionFilterSet', 'ConsolePortFilterSet', diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index 3e84124ef..ad41e5a74 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -48,9 +48,9 @@ __all__ = ( 'LocationBulkEditForm', 'MACAddressBulkEditForm', 'ManufacturerBulkEditForm', - 'ModuleBulkEditForm', 'ModuleBayBulkEditForm', 'ModuleBayTemplateBulkEditForm', + 'ModuleBulkEditForm', 'ModuleTypeBulkEditForm', 'ModuleTypeProfileBulkEditForm', 'PlatformBulkEditForm', diff --git a/netbox/dcim/forms/bulk_import.py b/netbox/dcim/forms/bulk_import.py index e5a06118e..435506343 100644 --- a/netbox/dcim/forms/bulk_import.py +++ b/netbox/dcim/forms/bulk_import.py @@ -48,8 +48,8 @@ __all__ = ( 'LocationImportForm', 'MACAddressImportForm', 'ManufacturerImportForm', - 'ModuleImportForm', 'ModuleBayImportForm', + 'ModuleImportForm', 'ModuleTypeImportForm', 'ModuleTypeProfileImportForm', 'PlatformImportForm', @@ -63,8 +63,8 @@ __all__ = ( 'RackTypeImportForm', 'RearPortImportForm', 'RegionImportForm', - 'SiteImportForm', 'SiteGroupImportForm', + 'SiteImportForm', 'VirtualChassisImportForm', 'VirtualDeviceContextImportForm' ) diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index 28e9ee000..b375f2bba 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -44,14 +44,14 @@ __all__ = ( 'InterfaceFilterForm', 'InterfaceTemplateFilterForm', 'InventoryItemFilterForm', - 'InventoryItemTemplateFilterForm', 'InventoryItemRoleFilterForm', + 'InventoryItemTemplateFilterForm', 'LocationFilterForm', 'MACAddressFilterForm', 'ManufacturerFilterForm', - 'ModuleFilterForm', 'ModuleBayFilterForm', 'ModuleBayTemplateFilterForm', + 'ModuleFilterForm', 'ModuleTypeFilterForm', 'ModuleTypeProfileFilterForm', 'PlatformFilterForm', @@ -62,8 +62,8 @@ __all__ = ( 'PowerPanelFilterForm', 'PowerPortFilterForm', 'PowerPortTemplateFilterForm', - 'RackFilterForm', 'RackElevationFilterForm', + 'RackFilterForm', 'RackReservationFilterForm', 'RackRoleFilterForm', 'RackTypeFilterForm', diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 502c3b5ef..741315323 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -60,9 +60,9 @@ __all__ = ( 'LocationForm', 'MACAddressForm', 'ManufacturerForm', - 'ModuleForm', 'ModuleBayForm', 'ModuleBayTemplateForm', + 'ModuleForm', 'ModuleTypeForm', 'ModuleTypeProfileForm', 'PlatformForm', diff --git a/netbox/dcim/graphql/filters.py b/netbox/dcim/graphql/filters.py index dc6dd6c17..bd8a38058 100644 --- a/netbox/dcim/graphql/filters.py +++ b/netbox/dcim/graphql/filters.py @@ -63,9 +63,9 @@ __all__ = ( 'ConsolePortTemplateFilter', 'ConsoleServerPortFilter', 'ConsoleServerPortTemplateFilter', - 'DeviceFilter', 'DeviceBayFilter', 'DeviceBayTemplateFilter', + 'DeviceFilter', 'DeviceRoleFilter', 'DeviceTypeFilter', 'FrontPortFilter', @@ -78,9 +78,9 @@ __all__ = ( 'LocationFilter', 'MACAddressFilter', 'ManufacturerFilter', - 'ModuleFilter', 'ModuleBayFilter', 'ModuleBayTemplateFilter', + 'ModuleFilter', 'ModuleTypeFilter', 'ModuleTypeProfileFilter', 'PlatformFilter', diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py index 4036d151f..cf16bc39f 100644 --- a/netbox/dcim/graphql/types.py +++ b/netbox/dcim/graphql/types.py @@ -41,47 +41,47 @@ if TYPE_CHECKING: __all__ = ( 'CableType', 'ComponentType', - 'ConsolePortType', 'ConsolePortTemplateType', - 'ConsoleServerPortType', + 'ConsolePortType', 'ConsoleServerPortTemplateType', - 'DeviceType', - 'DeviceBayType', + 'ConsoleServerPortType', 'DeviceBayTemplateType', + 'DeviceBayType', 'DeviceRoleType', + 'DeviceType', 'DeviceTypeType', - 'FrontPortType', 'FrontPortTemplateType', - 'InterfaceType', + 'FrontPortType', 'InterfaceTemplateType', - 'InventoryItemType', + 'InterfaceType', 'InventoryItemRoleType', 'InventoryItemTemplateType', + 'InventoryItemType', 'LocationType', 'MACAddressType', 'ManufacturerType', 'ModularComponentType', - 'ModuleType', - 'ModuleBayType', 'ModuleBayTemplateType', + 'ModuleBayType', + 'ModuleType', 'ModuleTypeProfileType', 'ModuleTypeType', 'PlatformType', 'PowerFeedType', - 'PowerOutletType', 'PowerOutletTemplateType', + 'PowerOutletType', 'PowerPanelType', - 'PowerPortType', 'PowerPortTemplateType', - 'RackType', + 'PowerPortType', 'RackReservationType', 'RackRoleType', + 'RackType', 'RackTypeType', - 'RearPortType', 'RearPortTemplateType', + 'RearPortType', 'RegionType', - 'SiteType', 'SiteGroupType', + 'SiteType', 'VirtualChassisType', 'VirtualDeviceContextType', ) diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index b26d641c4..7fbe61e70 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -21,14 +21,14 @@ __all__ = ( 'DeviceInterfaceTable', 'DeviceInventoryItemTable', 'DeviceModuleBayTable', - 'DevicePowerPortTable', 'DevicePowerOutletTable', + 'DevicePowerPortTable', 'DeviceRearPortTable', 'DeviceRoleTable', 'DeviceTable', 'FrontPortTable', - 'InterfaceTable', 'InterfaceLAGMemberTable', + 'InterfaceTable', 'InventoryItemRoleTable', 'InventoryItemTable', 'MACAddressTable', diff --git a/netbox/dcim/tables/racks.py b/netbox/dcim/tables/racks.py index 639a5ff48..2a1642ae9 100644 --- a/netbox/dcim/tables/racks.py +++ b/netbox/dcim/tables/racks.py @@ -9,9 +9,9 @@ from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin from .template_code import OUTER_UNIT, WEIGHT __all__ = ( - 'RackTable', 'RackReservationTable', 'RackRoleTable', + 'RackTable', 'RackTypeTable', ) diff --git a/netbox/dcim/tables/sites.py b/netbox/dcim/tables/sites.py index 66b5df3b4..2ca0ba59f 100644 --- a/netbox/dcim/tables/sites.py +++ b/netbox/dcim/tables/sites.py @@ -10,8 +10,8 @@ from .template_code import LOCATION_BUTTONS __all__ = ( 'LocationTable', 'RegionTable', - 'SiteTable', 'SiteGroupTable', + 'SiteTable', ) diff --git a/netbox/extras/api/serializers_/notifications.py b/netbox/extras/api/serializers_/notifications.py index 4c9d08169..dd26a5985 100644 --- a/netbox/extras/api/serializers_/notifications.py +++ b/netbox/extras/api/serializers_/notifications.py @@ -7,8 +7,8 @@ from users.api.serializers_.users import GroupSerializer, UserSerializer from users.models import Group, User __all__ = ( - 'NotificationSerializer', 'NotificationGroupSerializer', + 'NotificationSerializer', 'SubscriptionSerializer', ) diff --git a/netbox/extras/graphql/filter_mixins.py b/netbox/extras/graphql/filter_mixins.py index 341db4771..9627f0f40 100644 --- a/netbox/extras/graphql/filter_mixins.py +++ b/netbox/extras/graphql/filter_mixins.py @@ -10,10 +10,10 @@ if TYPE_CHECKING: from .filters import * __all__ = ( + 'ConfigContextFilterMixin', 'CustomFieldsFilterMixin', 'JournalEntriesFilterMixin', 'TagsFilterMixin', - 'ConfigContextFilterMixin', ) diff --git a/netbox/extras/graphql/filters.py b/netbox/extras/graphql/filters.py index 1996ae1b9..ae7458b4e 100644 --- a/netbox/extras/graphql/filters.py +++ b/netbox/extras/graphql/filters.py @@ -33,8 +33,8 @@ __all__ = ( 'ConfigContextFilter', 'ConfigContextProfileFilter', 'ConfigTemplateFilter', - 'CustomFieldFilter', 'CustomFieldChoiceSetFilter', + 'CustomFieldFilter', 'CustomLinkFilter', 'EventRuleFilter', 'ExportTemplateFilter', diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index c16f00886..9d3e5b75f 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -24,14 +24,14 @@ __all__ = ( 'BaseScript', 'BooleanVar', 'ChoiceVar', - 'DateVar', 'DateTimeVar', - 'FileVar', - 'IntegerVar', + 'DateVar', 'DecimalVar', + 'FileVar', 'IPAddressVar', 'IPAddressWithMaskVar', 'IPNetworkVar', + 'IntegerVar', 'MultiChoiceVar', 'MultiObjectVar', 'ObjectVar', diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py index d9c61ee9f..a4026fe39 100644 --- a/netbox/extras/tables/tables.py +++ b/netbox/extras/tables/tables.py @@ -28,14 +28,14 @@ __all__ = ( 'JournalEntryTable', 'NotificationGroupTable', 'NotificationTable', - 'SavedFilterTable', 'ReportResultsTable', - 'ScriptResultsTable', + 'SavedFilterTable', 'ScriptJobTable', + 'ScriptResultsTable', 'SubscriptionTable', 'TableConfigTable', - 'TaggedItemTable', 'TagTable', + 'TaggedItemTable', 'WebhookTable', ) diff --git a/netbox/ipam/api/serializers_/ip.py b/netbox/ipam/api/serializers_/ip.py index d1e97c218..0b933a170 100644 --- a/netbox/ipam/api/serializers_/ip.py +++ b/netbox/ipam/api/serializers_/ip.py @@ -19,8 +19,8 @@ from .vrfs import VRFSerializer __all__ = ( 'AggregateSerializer', - 'AvailableIPSerializer', 'AvailableIPRequestSerializer', + 'AvailableIPSerializer', 'AvailablePrefixSerializer', 'IPAddressSerializer', 'IPRangeSerializer', diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index a2e5b8eb8..56d2fb2b7 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -33,9 +33,9 @@ from .choices import * from .models import * __all__ = ( - 'AggregateFilterSet', 'ASNFilterSet', 'ASNRangeFilterSet', + 'AggregateFilterSet', 'FHRPGroupAssignmentFilterSet', 'FHRPGroupFilterSet', 'IPAddressFilterSet', diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py index bbe1d4e56..02e18bbe3 100644 --- a/netbox/ipam/forms/bulk_edit.py +++ b/netbox/ipam/forms/bulk_edit.py @@ -24,9 +24,9 @@ from utilities.forms.widgets import BulkEditNullBooleanSelect, HTMXSelect from utilities.templatetags.builtins.filters import bettertitle __all__ = ( - 'AggregateBulkEditForm', 'ASNBulkEditForm', 'ASNRangeBulkEditForm', + 'AggregateBulkEditForm', 'FHRPGroupBulkEditForm', 'IPAddressBulkEditForm', 'IPRangeBulkEditForm', diff --git a/netbox/ipam/forms/bulk_import.py b/netbox/ipam/forms/bulk_import.py index 93107d88e..d55d58c68 100644 --- a/netbox/ipam/forms/bulk_import.py +++ b/netbox/ipam/forms/bulk_import.py @@ -20,9 +20,9 @@ from utilities.forms.fields import ( from virtualization.models import VirtualMachine, VMInterface __all__ = ( - 'AggregateImportForm', 'ASNImportForm', 'ASNRangeImportForm', + 'AggregateImportForm', 'FHRPGroupImportForm', 'IPAddressImportForm', 'IPRangeImportForm', @@ -32,8 +32,8 @@ __all__ = ( 'RouteTargetImportForm', 'ServiceImportForm', 'ServiceTemplateImportForm', - 'VLANImportForm', 'VLANGroupImportForm', + 'VLANImportForm', 'VLANTranslationPolicyImportForm', 'VLANTranslationRuleImportForm', 'VRFImportForm', diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py index 756a92913..0bfbd53a4 100644 --- a/netbox/ipam/forms/filtersets.py +++ b/netbox/ipam/forms/filtersets.py @@ -14,9 +14,9 @@ from virtualization.models import Cluster, ClusterGroup, VirtualMachine from vpn.models import L2VPN __all__ = ( - 'AggregateFilterForm', 'ASNFilterForm', 'ASNRangeFilterForm', + 'AggregateFilterForm', 'FHRPGroupFilterForm', 'IPAddressFilterForm', 'IPRangeFilterForm', diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py index e20f056c8..1bdcff2d8 100644 --- a/netbox/ipam/forms/model_forms.py +++ b/netbox/ipam/forms/model_forms.py @@ -28,11 +28,11 @@ from utilities.templatetags.builtins.filters import bettertitle from virtualization.models import VirtualMachine, VMInterface __all__ = ( - 'AggregateForm', 'ASNForm', 'ASNRangeForm', - 'FHRPGroupForm', + 'AggregateForm', 'FHRPGroupAssignmentForm', + 'FHRPGroupForm', 'IPAddressAssignForm', 'IPAddressBulkAddForm', 'IPAddressForm', @@ -41,8 +41,8 @@ __all__ = ( 'RIRForm', 'RoleForm', 'RouteTargetForm', - 'ServiceForm', 'ServiceCreateForm', + 'ServiceForm', 'ServiceTemplateForm', 'VLANForm', 'VLANGroupForm', diff --git a/netbox/ipam/graphql/enums.py b/netbox/ipam/graphql/enums.py index 34180bfbc..db5cc3dab 100644 --- a/netbox/ipam/graphql/enums.py +++ b/netbox/ipam/graphql/enums.py @@ -11,8 +11,8 @@ __all__ = ( 'IPRangeStatusEnum', 'PrefixStatusEnum', 'ServiceProtocolEnum', - 'VLANStatusEnum', 'VLANQinQRoleEnum', + 'VLANStatusEnum', ) FHRPGroupAuthTypeEnum = strawberry.enum(FHRPGroupAuthTypeChoices.as_enum(prefix='authentication')) diff --git a/netbox/ipam/graphql/filters.py b/netbox/ipam/graphql/filters.py index 7f67cb39a..400dc8e83 100644 --- a/netbox/ipam/graphql/filters.py +++ b/netbox/ipam/graphql/filters.py @@ -35,8 +35,8 @@ __all__ = ( 'ASNFilter', 'ASNRangeFilter', 'AggregateFilter', - 'FHRPGroupFilter', 'FHRPGroupAssignmentFilter', + 'FHRPGroupFilter', 'IPAddressFilter', 'IPRangeFilter', 'PrefixFilter', diff --git a/netbox/ipam/graphql/types.py b/netbox/ipam/graphql/types.py index cf957a914..98aa91939 100644 --- a/netbox/ipam/graphql/types.py +++ b/netbox/ipam/graphql/types.py @@ -28,23 +28,23 @@ if TYPE_CHECKING: from wireless.graphql.types import WirelessLANType __all__ = ( - 'ASNType', 'ASNRangeType', + 'ASNType', 'AggregateType', - 'FHRPGroupType', 'FHRPGroupAssignmentType', + 'FHRPGroupType', 'IPAddressType', 'IPRangeType', 'PrefixType', 'RIRType', 'RoleType', 'RouteTargetType', - 'ServiceType', 'ServiceTemplateType', - 'VLANType', + 'ServiceType', 'VLANGroupType', 'VLANTranslationPolicyType', 'VLANTranslationRuleType', + 'VLANType', 'VRFType', ) diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py index 67cf11953..96305cd02 100644 --- a/netbox/ipam/models/ip.py +++ b/netbox/ipam/models/ip.py @@ -22,11 +22,11 @@ from netbox.models import OrganizationalModel, PrimaryModel from netbox.models.features import ContactsMixin __all__ = ( + 'RIR', 'Aggregate', 'IPAddress', 'IPRange', 'Prefix', - 'RIR', 'Role', ) diff --git a/netbox/ipam/models/vrfs.py b/netbox/ipam/models/vrfs.py index 6a8b8d649..60ad760f9 100644 --- a/netbox/ipam/models/vrfs.py +++ b/netbox/ipam/models/vrfs.py @@ -5,8 +5,8 @@ from ipam.constants import * from netbox.models import PrimaryModel __all__ = ( - 'RouteTarget', 'VRF', + 'RouteTarget', ) diff --git a/netbox/ipam/tables/asn.py b/netbox/ipam/tables/asn.py index 2c2ee56e4..94e80bfdf 100644 --- a/netbox/ipam/tables/asn.py +++ b/netbox/ipam/tables/asn.py @@ -6,8 +6,8 @@ from netbox.tables import OrganizationalModelTable, PrimaryModelTable, columns from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin __all__ = ( - 'ASNTable', 'ASNRangeTable', + 'ASNTable', ) diff --git a/netbox/ipam/tables/fhrp.py b/netbox/ipam/tables/fhrp.py index 2d77c62c7..5a3cc83bd 100644 --- a/netbox/ipam/tables/fhrp.py +++ b/netbox/ipam/tables/fhrp.py @@ -5,8 +5,8 @@ from ipam.models import * from netbox.tables import NetBoxTable, PrimaryModelTable, columns __all__ = ( - 'FHRPGroupTable', 'FHRPGroupAssignmentTable', + 'FHRPGroupTable', ) diff --git a/netbox/ipam/tables/vlans.py b/netbox/ipam/tables/vlans.py index dc3d03269..c7c75f91e 100644 --- a/netbox/ipam/tables/vlans.py +++ b/netbox/ipam/tables/vlans.py @@ -18,9 +18,9 @@ __all__ = ( 'VLANGroupTable', 'VLANMembersTable', 'VLANTable', - 'VLANVirtualMachinesTable', 'VLANTranslationPolicyTable', 'VLANTranslationRuleTable', + 'VLANVirtualMachinesTable', ) AVAILABLE_LABEL = mark_safe('Available') diff --git a/netbox/netbox/api/viewsets/__init__.py b/netbox/netbox/api/viewsets/__init__.py index 6dae31e8c..bf19bf35e 100644 --- a/netbox/netbox/api/viewsets/__init__.py +++ b/netbox/netbox/api/viewsets/__init__.py @@ -19,8 +19,8 @@ from utilities.query import reapply_model_ordering from . import mixins __all__ = ( - 'NetBoxReadOnlyModelViewSet', 'NetBoxModelViewSet', + 'NetBoxReadOnlyModelViewSet', ) HTTP_ACTIONS = { diff --git a/netbox/netbox/choices.py b/netbox/netbox/choices.py index 4c2b2478a..77fb71a2e 100644 --- a/netbox/netbox/choices.py +++ b/netbox/netbox/choices.py @@ -5,8 +5,8 @@ from utilities.constants import CSV_DELIMITERS __all__ = ( 'ButtonColorChoices', - 'ColorChoices', 'CSVDelimiterChoices', + 'ColorChoices', 'DistanceUnitChoices', 'ImportFormatChoices', 'ImportMethodChoices', diff --git a/netbox/netbox/config/__init__.py b/netbox/netbox/config/__init__.py index 5da42ca38..3c084949a 100644 --- a/netbox/netbox/config/__init__.py +++ b/netbox/netbox/config/__init__.py @@ -9,10 +9,10 @@ from django.utils.translation import gettext_lazy as _ from .parameters import PARAMS __all__ = ( - 'clear_config', - 'ConfigItem', - 'get_config', 'PARAMS', + 'ConfigItem', + 'clear_config', + 'get_config', ) _thread_locals = threading.local() diff --git a/netbox/netbox/events.py b/netbox/netbox/events.py index e48c32815..4e488eac1 100644 --- a/netbox/netbox/events.py +++ b/netbox/netbox/events.py @@ -13,9 +13,9 @@ __all__ = ( 'EVENT_TYPE_KIND_SUCCESS', 'EVENT_TYPE_KIND_WARNING', 'EventType', + 'get_event_text', 'get_event_type', 'get_event_type_choices', - 'get_event_text', ) diff --git a/netbox/netbox/forms/mixins.py b/netbox/netbox/forms/mixins.py index 30bb332d1..681047f56 100644 --- a/netbox/netbox/forms/mixins.py +++ b/netbox/netbox/forms/mixins.py @@ -10,8 +10,8 @@ from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultiple __all__ = ( 'ChangelogMessageMixin', 'CustomFieldsMixin', - 'OwnerMixin', 'OwnerFilterMixin', + 'OwnerMixin', 'SavedFiltersMixin', 'TagsMixin', ) diff --git a/netbox/netbox/navigation/__init__.py b/netbox/netbox/navigation/__init__.py index 41d70fd9a..081620833 100644 --- a/netbox/netbox/navigation/__init__.py +++ b/netbox/netbox/navigation/__init__.py @@ -4,12 +4,12 @@ from dataclasses import dataclass from django.urls import reverse_lazy __all__ = ( - 'get_model_item', - 'get_model_buttons', 'Menu', 'MenuGroup', 'MenuItem', 'MenuItemButton', + 'get_model_buttons', + 'get_model_item', ) diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index c1424acd1..4b89bb06a 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -38,9 +38,9 @@ __all__ = ( 'DistanceColumn', 'DurationColumn', 'LinkedCountColumn', - 'MarkdownColumn', - 'ManyToManyColumn', 'MPTTColumn', + 'ManyToManyColumn', + 'MarkdownColumn', 'TagColumn', 'TemplateColumn', 'ToggleColumn', diff --git a/netbox/netbox/ui/attrs.py b/netbox/netbox/ui/attrs.py index c20c99b83..3c3dd4061 100644 --- a/netbox/netbox/ui/attrs.py +++ b/netbox/netbox/ui/attrs.py @@ -8,10 +8,10 @@ from utilities.data import resolve_attr_path __all__ = ( 'AddressAttr', 'BooleanAttr', - 'ColorAttr', 'ChoiceAttr', - 'GenericForeignKeyAttr', + 'ColorAttr', 'GPSCoordinatesAttr', + 'GenericForeignKeyAttr', 'ImageAttr', 'NestedObjectAttr', 'NumericAttr', diff --git a/netbox/netbox/views/errors.py b/netbox/netbox/views/errors.py index 0ae0dc8f4..c9a51001d 100644 --- a/netbox/netbox/views/errors.py +++ b/netbox/netbox/views/errors.py @@ -13,9 +13,9 @@ from django.views.generic import View from netbox.plugins.utils import get_installed_plugins __all__ = ( + 'StaticMediaFailureView', 'handler_404', 'handler_500', - 'StaticMediaFailureView', ) diff --git a/netbox/netbox/views/generic/base.py b/netbox/netbox/views/generic/base.py index 778a54e10..dba1bf782 100644 --- a/netbox/netbox/views/generic/base.py +++ b/netbox/netbox/views/generic/base.py @@ -5,8 +5,8 @@ from django.views.generic import View from utilities.views import ObjectPermissionRequiredMixin __all__ = ( - 'BaseObjectView', 'BaseMultiObjectView', + 'BaseObjectView', ) diff --git a/netbox/tenancy/forms/bulk_import.py b/netbox/tenancy/forms/bulk_import.py index d80e05776..c60b0508a 100644 --- a/netbox/tenancy/forms/bulk_import.py +++ b/netbox/tenancy/forms/bulk_import.py @@ -14,11 +14,11 @@ from ..models import * __all__ = ( 'ContactAssignmentImportForm', - 'ContactImportForm', 'ContactGroupImportForm', + 'ContactImportForm', 'ContactRoleImportForm', - 'TenantImportForm', 'TenantGroupImportForm', + 'TenantImportForm', ) diff --git a/netbox/tenancy/forms/forms.py b/netbox/tenancy/forms/forms.py index 84b02247d..8d4226cd2 100644 --- a/netbox/tenancy/forms/forms.py +++ b/netbox/tenancy/forms/forms.py @@ -7,8 +7,8 @@ from ..models import * __all__ = ( 'ContactModelFilterForm', - 'TenancyForm', 'TenancyFilterForm', + 'TenancyForm', ) diff --git a/netbox/tenancy/graphql/filters.py b/netbox/tenancy/graphql/filters.py index 01442d9c7..27ca26a56 100644 --- a/netbox/tenancy/graphql/filters.py +++ b/netbox/tenancy/graphql/filters.py @@ -49,12 +49,12 @@ if TYPE_CHECKING: from .enums import * __all__ = ( + 'ContactAssignmentFilter', + 'ContactFilter', + 'ContactGroupFilter', + 'ContactRoleFilter', 'TenantFilter', 'TenantGroupFilter', - 'ContactFilter', - 'ContactRoleFilter', - 'ContactGroupFilter', - 'ContactAssignmentFilter', ) diff --git a/netbox/tenancy/graphql/types.py b/netbox/tenancy/graphql/types.py index 2c7143f5a..ebc0f2e2b 100644 --- a/netbox/tenancy/graphql/types.py +++ b/netbox/tenancy/graphql/types.py @@ -43,8 +43,8 @@ __all__ = ( 'ContactGroupType', 'ContactRoleType', 'ContactType', - 'TenantType', 'TenantGroupType', + 'TenantType', ) diff --git a/netbox/tenancy/models/contacts.py b/netbox/tenancy/models/contacts.py index 25fd72e21..f744ea935 100644 --- a/netbox/tenancy/models/contacts.py +++ b/netbox/tenancy/models/contacts.py @@ -9,8 +9,8 @@ from netbox.models.features import CustomFieldsMixin, ExportTemplatesMixin, Tags from tenancy.choices import * __all__ = ( - 'ContactAssignment', 'Contact', + 'ContactAssignment', 'ContactGroup', 'ContactRole', ) diff --git a/netbox/tenancy/tables/columns.py b/netbox/tenancy/tables/columns.py index 86f164611..b6a7d9698 100644 --- a/netbox/tenancy/tables/columns.py +++ b/netbox/tenancy/tables/columns.py @@ -7,9 +7,9 @@ from .template_code import * __all__ = ( 'ContactsColumnMixin', + 'TenancyColumnsMixin', 'TenantColumn', 'TenantGroupColumn', - 'TenancyColumnsMixin', ) diff --git a/netbox/users/forms/bulk_edit.py b/netbox/users/forms/bulk_edit.py index ac049cae6..5c4e03b6d 100644 --- a/netbox/users/forms/bulk_edit.py +++ b/netbox/users/forms/bulk_edit.py @@ -15,8 +15,8 @@ __all__ = ( 'ObjectPermissionBulkEditForm', 'OwnerBulkEditForm', 'OwnerGroupBulkEditForm', - 'UserBulkEditForm', 'TokenBulkEditForm', + 'UserBulkEditForm', ) diff --git a/netbox/users/forms/bulk_import.py b/netbox/users/forms/bulk_import.py index 490587d99..baabe5441 100644 --- a/netbox/users/forms/bulk_import.py +++ b/netbox/users/forms/bulk_import.py @@ -10,8 +10,8 @@ __all__ = ( 'GroupImportForm', 'OwnerGroupImportForm', 'OwnerImportForm', - 'UserImportForm', 'TokenImportForm', + 'UserImportForm', ) diff --git a/netbox/utilities/forms/forms.py b/netbox/utilities/forms/forms.py index e7fc61b7e..b2dee5721 100644 --- a/netbox/utilities/forms/forms.py +++ b/netbox/utilities/forms/forms.py @@ -11,8 +11,8 @@ __all__ = ( 'BulkDeleteForm', 'BulkEditForm', 'BulkRenameForm', - 'ConfirmationForm', 'CSVModelForm', + 'ConfirmationForm', 'DeleteForm', 'FilterForm', 'TableConfigForm', diff --git a/netbox/utilities/forms/mixins.py b/netbox/utilities/forms/mixins.py index ca943e088..3a60884df 100644 --- a/netbox/utilities/forms/mixins.py +++ b/netbox/utilities/forms/mixins.py @@ -11,11 +11,11 @@ from utilities.forms.widgets import FilterModifierWidget from utilities.forms.widgets.modifiers import MODIFIER_EMPTY_FALSE, MODIFIER_EMPTY_TRUE __all__ = ( + 'FORM_FIELD_LOOKUPS', 'BackgroundJobMixin', 'CheckLastUpdatedMixin', 'DistanceValidationMixin', 'FilterModifierMixin', - 'FORM_FIELD_LOOKUPS', ) diff --git a/netbox/utilities/forms/utils.py b/netbox/utilities/forms/utils.py index 1aad09b28..1ed13cb9c 100644 --- a/netbox/utilities/forms/utils.py +++ b/netbox/utilities/forms/utils.py @@ -17,9 +17,9 @@ __all__ = ( 'get_field_value', 'get_selected_values', 'parse_alphanumeric_range', + 'parse_csv', 'parse_numeric_range', 'restrict_form_fields', - 'parse_csv', 'validate_csv', ) diff --git a/netbox/utilities/forms/widgets/modifiers.py b/netbox/utilities/forms/widgets/modifiers.py index 00a423a18..e289adc97 100644 --- a/netbox/utilities/forms/widgets/modifiers.py +++ b/netbox/utilities/forms/widgets/modifiers.py @@ -5,9 +5,9 @@ from django.utils.translation import gettext_lazy as _ from utilities.forms.widgets.apiselect import APISelect, APISelectMultiple __all__ = ( - 'FilterModifierWidget', 'MODIFIER_EMPTY_FALSE', 'MODIFIER_EMPTY_TRUE', + 'FilterModifierWidget', ) # Modifier codes for empty/null checking diff --git a/netbox/utilities/htmx.py b/netbox/utilities/htmx.py index a712e9742..20b27ec19 100644 --- a/netbox/utilities/htmx.py +++ b/netbox/utilities/htmx.py @@ -5,8 +5,8 @@ from django.urls import reverse __all__ = ( 'htmx_current_url', - 'htmx_partial', 'htmx_maybe_redirect_current_page', + 'htmx_partial', ) diff --git a/netbox/utilities/templatetags/builtins/tags.py b/netbox/utilities/templatetags/builtins/tags.py index 074605367..34b2b889d 100644 --- a/netbox/utilities/templatetags/builtins/tags.py +++ b/netbox/utilities/templatetags/builtins/tags.py @@ -13,8 +13,8 @@ __all__ = ( 'checkmark', 'copy_content', 'customfield_value', - 'htmx_table', 'formaction', + 'htmx_table', 'static_with_params', 'tag', ) diff --git a/netbox/virtualization/api/serializers_/nested.py b/netbox/virtualization/api/serializers_/nested.py index f09a48299..53a19cce8 100644 --- a/netbox/virtualization/api/serializers_/nested.py +++ b/netbox/virtualization/api/serializers_/nested.py @@ -2,8 +2,8 @@ from netbox.api.serializers import WritableNestedSerializer from virtualization import models __all__ = ( - 'NestedVirtualMachineSerializer', 'NestedVMInterfaceSerializer', + 'NestedVirtualMachineSerializer', ) diff --git a/netbox/virtualization/filtersets.py b/netbox/virtualization/filtersets.py index 8378d56b5..56449f641 100644 --- a/netbox/virtualization/filtersets.py +++ b/netbox/virtualization/filtersets.py @@ -23,9 +23,9 @@ __all__ = ( 'ClusterFilterSet', 'ClusterGroupFilterSet', 'ClusterTypeFilterSet', + 'VMInterfaceFilterSet', 'VirtualDiskFilterSet', 'VirtualMachineFilterSet', - 'VMInterfaceFilterSet', ) diff --git a/netbox/virtualization/forms/bulk_create.py b/netbox/virtualization/forms/bulk_create.py index ebc396c1e..078fb2f43 100644 --- a/netbox/virtualization/forms/bulk_create.py +++ b/netbox/virtualization/forms/bulk_create.py @@ -6,8 +6,8 @@ from utilities.forms.fields import ExpandableNameField from virtualization.models import VirtualDisk, VirtualMachine, VMInterface __all__ = ( - 'VirtualDiskBulkCreateForm', 'VMInterfaceBulkCreateForm', + 'VirtualDiskBulkCreateForm', ) diff --git a/netbox/virtualization/forms/bulk_edit.py b/netbox/virtualization/forms/bulk_edit.py index 2811fb16a..1bd463811 100644 --- a/netbox/virtualization/forms/bulk_edit.py +++ b/netbox/virtualization/forms/bulk_edit.py @@ -21,11 +21,11 @@ __all__ = ( 'ClusterBulkEditForm', 'ClusterGroupBulkEditForm', 'ClusterTypeBulkEditForm', + 'VMInterfaceBulkEditForm', + 'VMInterfaceBulkRenameForm', 'VirtualDiskBulkEditForm', 'VirtualDiskBulkRenameForm', 'VirtualMachineBulkEditForm', - 'VMInterfaceBulkEditForm', - 'VMInterfaceBulkRenameForm', ) diff --git a/netbox/virtualization/forms/bulk_import.py b/netbox/virtualization/forms/bulk_import.py index e3c96c384..5cfb5028f 100644 --- a/netbox/virtualization/forms/bulk_import.py +++ b/netbox/virtualization/forms/bulk_import.py @@ -14,12 +14,12 @@ from virtualization.choices import * from virtualization.models import * __all__ = ( - 'ClusterImportForm', 'ClusterGroupImportForm', + 'ClusterImportForm', 'ClusterTypeImportForm', + 'VMInterfaceImportForm', 'VirtualDiskImportForm', 'VirtualMachineImportForm', - 'VMInterfaceImportForm', ) diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py index 7e1f87f81..5b1b44cb6 100644 --- a/netbox/virtualization/forms/filtersets.py +++ b/netbox/virtualization/forms/filtersets.py @@ -20,9 +20,9 @@ __all__ = ( 'ClusterFilterForm', 'ClusterGroupFilterForm', 'ClusterTypeFilterForm', + 'VMInterfaceFilterForm', 'VirtualDiskFilterForm', 'VirtualMachineFilterForm', - 'VMInterfaceFilterForm', ) diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py index eac686730..99bd49823 100644 --- a/netbox/virtualization/forms/model_forms.py +++ b/netbox/virtualization/forms/model_forms.py @@ -25,9 +25,9 @@ __all__ = ( 'ClusterGroupForm', 'ClusterRemoveDevicesForm', 'ClusterTypeForm', + 'VMInterfaceForm', 'VirtualDiskForm', 'VirtualMachineForm', - 'VMInterfaceForm', ) diff --git a/netbox/virtualization/forms/object_create.py b/netbox/virtualization/forms/object_create.py index b3ecd88f1..20ec3bc16 100644 --- a/netbox/virtualization/forms/object_create.py +++ b/netbox/virtualization/forms/object_create.py @@ -5,8 +5,8 @@ from utilities.forms.fields import ExpandableNameField from .model_forms import VirtualDiskForm, VMInterfaceForm __all__ = ( - 'VirtualDiskCreateForm', 'VMInterfaceCreateForm', + 'VirtualDiskCreateForm', ) diff --git a/netbox/virtualization/graphql/filters.py b/netbox/virtualization/graphql/filters.py index 99c324bf8..a09f106c8 100644 --- a/netbox/virtualization/graphql/filters.py +++ b/netbox/virtualization/graphql/filters.py @@ -31,9 +31,9 @@ __all__ = ( 'ClusterFilter', 'ClusterGroupFilter', 'ClusterTypeFilter', - 'VirtualMachineFilter', 'VMInterfaceFilter', 'VirtualDiskFilter', + 'VirtualMachineFilter', ) diff --git a/netbox/virtualization/graphql/types.py b/netbox/virtualization/graphql/types.py index 3142c5ed1..68a6e19ac 100644 --- a/netbox/virtualization/graphql/types.py +++ b/netbox/virtualization/graphql/types.py @@ -28,12 +28,12 @@ if TYPE_CHECKING: from tenancy.graphql.types import TenantType __all__ = ( - 'ClusterType', 'ClusterGroupType', + 'ClusterType', 'ClusterTypeType', + 'VMInterfaceType', 'VirtualDiskType', 'VirtualMachineType', - 'VMInterfaceType', ) diff --git a/netbox/virtualization/models/virtualmachines.py b/netbox/virtualization/models/virtualmachines.py index c56a07457..5a0f1e9b3 100644 --- a/netbox/virtualization/models/virtualmachines.py +++ b/netbox/virtualization/models/virtualmachines.py @@ -23,9 +23,9 @@ from utilities.tracking import TrackingModelMixin from virtualization.choices import * __all__ = ( + 'VMInterface', 'VirtualDisk', 'VirtualMachine', - 'VMInterface', ) diff --git a/netbox/virtualization/tables/clusters.py b/netbox/virtualization/tables/clusters.py index 265293734..eabb7ffa6 100644 --- a/netbox/virtualization/tables/clusters.py +++ b/netbox/virtualization/tables/clusters.py @@ -6,8 +6,8 @@ from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin from virtualization.models import Cluster, ClusterGroup, ClusterType __all__ = ( - 'ClusterTable', 'ClusterGroupTable', + 'ClusterTable', 'ClusterTypeTable', ) diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index a0b4d1067..d218392c4 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -10,11 +10,11 @@ from virtualization.models import VirtualDisk, VirtualMachine, VMInterface from .template_code import * __all__ = ( + 'VMInterfaceTable', 'VirtualDiskTable', 'VirtualMachineTable', - 'VirtualMachineVirtualDiskTable', 'VirtualMachineVMInterfaceTable', - 'VMInterfaceTable', + 'VirtualMachineVirtualDiskTable', ) diff --git a/netbox/vpn/api/views.py b/netbox/vpn/api/views.py index 741f08c09..5dae411b5 100644 --- a/netbox/vpn/api/views.py +++ b/netbox/vpn/api/views.py @@ -12,8 +12,8 @@ __all__ = ( 'IPSecPolicyViewSet', 'IPSecProfileViewSet', 'IPSecProposalViewSet', - 'L2VPNViewSet', 'L2VPNTerminationViewSet', + 'L2VPNViewSet', 'TunnelGroupViewSet', 'TunnelTerminationViewSet', 'TunnelViewSet', diff --git a/netbox/vpn/forms/bulk_import.py b/netbox/vpn/forms/bulk_import.py index 7b095053a..9034c5e5f 100644 --- a/netbox/vpn/forms/bulk_import.py +++ b/netbox/vpn/forms/bulk_import.py @@ -18,8 +18,8 @@ __all__ = ( 'IPSecProposalImportForm', 'L2VPNImportForm', 'L2VPNTerminationImportForm', - 'TunnelImportForm', 'TunnelGroupImportForm', + 'TunnelImportForm', 'TunnelTerminationImportForm', ) diff --git a/netbox/vpn/graphql/filters.py b/netbox/vpn/graphql/filters.py index 79f3a31e6..770739043 100644 --- a/netbox/vpn/graphql/filters.py +++ b/netbox/vpn/graphql/filters.py @@ -23,16 +23,16 @@ if TYPE_CHECKING: from .enums import * __all__ = ( - 'TunnelGroupFilter', - 'TunnelTerminationFilter', - 'TunnelFilter', - 'IKEProposalFilter', 'IKEPolicyFilter', - 'IPSecProposalFilter', + 'IKEProposalFilter', 'IPSecPolicyFilter', 'IPSecProfileFilter', + 'IPSecProposalFilter', 'L2VPNFilter', 'L2VPNTerminationFilter', + 'TunnelFilter', + 'TunnelGroupFilter', + 'TunnelTerminationFilter', ) diff --git a/netbox/vpn/graphql/types.py b/netbox/vpn/graphql/types.py index 7959f9e52..d23c0a13b 100644 --- a/netbox/vpn/graphql/types.py +++ b/netbox/vpn/graphql/types.py @@ -22,8 +22,8 @@ __all__ = ( 'IPSecPolicyType', 'IPSecProfileType', 'IPSecProposalType', - 'L2VPNType', 'L2VPNTerminationType', + 'L2VPNType', 'TunnelGroupType', 'TunnelTerminationType', 'TunnelType', diff --git a/netbox/vpn/tables/crypto.py b/netbox/vpn/tables/crypto.py index 49a402559..4201bee0a 100644 --- a/netbox/vpn/tables/crypto.py +++ b/netbox/vpn/tables/crypto.py @@ -8,8 +8,8 @@ __all__ = ( 'IKEPolicyTable', 'IKEProposalTable', 'IPSecPolicyTable', - 'IPSecProposalTable', 'IPSecProfileTable', + 'IPSecProposalTable', ) diff --git a/netbox/vpn/tables/tunnels.py b/netbox/vpn/tables/tunnels.py index c6497b165..d1a4fc7c9 100644 --- a/netbox/vpn/tables/tunnels.py +++ b/netbox/vpn/tables/tunnels.py @@ -7,8 +7,8 @@ from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin from vpn.models import * __all__ = ( - 'TunnelTable', 'TunnelGroupTable', + 'TunnelTable', 'TunnelTerminationTable', ) diff --git a/netbox/wireless/forms/bulk_import.py b/netbox/wireless/forms/bulk_import.py index 64f8c8563..22f8e6d49 100644 --- a/netbox/wireless/forms/bulk_import.py +++ b/netbox/wireless/forms/bulk_import.py @@ -12,8 +12,8 @@ from wireless.choices import * from wireless.models import * __all__ = ( - 'WirelessLANImportForm', 'WirelessLANGroupImportForm', + 'WirelessLANImportForm', 'WirelessLinkImportForm', ) diff --git a/netbox/wireless/graphql/filters.py b/netbox/wireless/graphql/filters.py index 10c67d200..a02d7110a 100644 --- a/netbox/wireless/graphql/filters.py +++ b/netbox/wireless/graphql/filters.py @@ -20,8 +20,8 @@ if TYPE_CHECKING: from .enums import * __all__ = ( - 'WirelessLANGroupFilter', 'WirelessLANFilter', + 'WirelessLANGroupFilter', 'WirelessLinkFilter', ) diff --git a/netbox/wireless/graphql/types.py b/netbox/wireless/graphql/types.py index f02ddf978..2e7930074 100644 --- a/netbox/wireless/graphql/types.py +++ b/netbox/wireless/graphql/types.py @@ -14,8 +14,8 @@ if TYPE_CHECKING: from tenancy.graphql.types import TenantType __all__ = ( - 'WirelessLANType', 'WirelessLANGroupType', + 'WirelessLANType', 'WirelessLinkType', )