nautobot 2.4.21__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/dcim/{filters/__init__.py → filters.py}

@@ -7,6 +7,7 @@ from timezone_field import TimeZoneField
 from nautobot.core.filters import (
     BaseFilterSet,
     ContentTypeMultipleChoiceFilter,
+    ModelMultipleChoiceFilter,
     MultiValueCharFilter,
     MultiValueMACAddressFilter,
     MultiValueUUIDFilter,
@@ -17,7 +18,6 @@ from nautobot.core.filters import (
     TreeNodeMultipleChoiceFilter,
 )
 from nautobot.core.utils.data import is_uuid
-from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
 from nautobot.dcim.choices import (
     CableTypeChoices,
     ConsolePortTypeChoices,
@@ -34,7 +34,7 @@ from nautobot.dcim.constants import (
     VIRTUAL_IFACE_TYPES,
     WIRELESS_IFACE_TYPES,
 )
-from nautobot.dcim.filters.mixins import (
+from nautobot.dcim.filter_mixins import (
     CableTerminationModelFilterSetMixin,
     DeviceComponentModelFilterSetMixin,
     DeviceComponentTemplateModelFilterSetMixin,
@@ -56,6 +56,7 @@ from nautobot.dcim.models import (
     Device,
     DeviceBay,
     DeviceBayTemplate,
+    DeviceClusterAssignment,
     DeviceFamily,
     DeviceRedundancyGroup,
     DeviceType,
@@ -102,14 +103,13 @@ from nautobot.extras.filters import (
 from nautobot.extras.models import ExternalIntegration, SecretsGroup
 from nautobot.extras.utils import FeatureQuery
 from nautobot.ipam.models import IPAddress, VLAN, VLANGroup
-from nautobot.tenancy.filters.mixins import TenancyModelFilterSetMixin
+from nautobot.tenancy.filter_mixins import TenancyModelFilterSetMixin
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import Cluster, VirtualMachine
 from nautobot.wireless.models import RadioProfile, WirelessNetwork
 
 __all__ = (
     "CableFilterSet",
-    "CableTerminationFilterSet",
     "CableTerminationModelFilterSetMixin",
     "ConsoleConnectionFilterSet",
     "ConsolePortFilterSet",
@@ -120,6 +120,7 @@ __all__ = (
     "ControllerManagedDeviceGroupFilterSet",
     "DeviceBayFilterSet",
     "DeviceBayTemplateFilterSet",
+    "DeviceClusterAssignmentFilterSet",
     "DeviceFamilyFilterSet",
     "DeviceFilterSet",
     "DeviceRedundancyGroupFilterSet",
@@ -132,6 +133,7 @@ __all__ = (
     "InterfaceRedundancyGroupAssociationFilterSet",
     "InterfaceRedundancyGroupFilterSet",
     "InterfaceTemplateFilterSet",
+    "InterfaceVDCAssignmentFilterSet",
     "InventoryItemFilterSet",
     "LocationFilterSet",
     "LocationTypeFilterSet",
@@ -141,7 +143,6 @@ __all__ = (
     "ModuleFamilyFilterSet",
     "ModuleFilterSet",
     "ModuleTypeFilterSet",
-    "PathEndpointFilterSet",
     "PathEndpointModelFilterSetMixin",
     "PlatformFilterSet",
     "PowerConnectionFilterSet",
@@ -198,7 +199,6 @@ class LocationFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyMod
     location_type = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=LocationType.objects.all(),
         to_field_name="name",
-        label="Location type (name or ID)",
     )
     parent = NaturalKeyOrPKMultipleChoiceFilter(
         prefers_id=True,
@@ -231,7 +231,6 @@ class LocationFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyMod
         prefers_id=True,
         queryset=Device.objects.all(),
         to_field_name="name",
-        label="Devices (name or ID)",
     )
     has_devices = RelatedMembershipBooleanFilter(
         field_name="devices",
@@ -240,7 +239,6 @@ class LocationFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyMod
     power_panels = NaturalKeyOrPKMultipleChoiceFilter(
         to_field_name="name",
         queryset=PowerPanel.objects.all(),
-        label="Power panels (name or ID)",
     )
     has_power_panels = RelatedMembershipBooleanFilter(
         field_name="power_panels",
@@ -250,7 +248,6 @@ class LocationFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyMod
         prefers_id=True,
         queryset=RackGroup.objects.all(),
         to_field_name="name",
-        label="Rack groups (name or ID)",
     )
     has_rack_groups = RelatedMembershipBooleanFilter(
         field_name="rack_groups",
@@ -263,7 +260,6 @@ class LocationFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyMod
     racks = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Rack.objects.all(),
         to_field_name="name",
-        label="Rack (name or ID)",
     )
     has_prefixes = RelatedMembershipBooleanFilter(
         field_name="prefixes",
@@ -295,7 +291,6 @@ class LocationFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyMod
     clusters = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Cluster.objects.all(),
         to_field_name="name",
-        label="Clusters (name or ID)",
     )
     time_zone = django_filters.MultipleChoiceFilter(
         choices=[(str(obj), name) for obj, name in TimeZoneField().choices],
@@ -362,7 +357,6 @@ class RackGroupFilterSet(LocatableModelFilterSetMixin, NautobotFilterSet, NameSe
     parent = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=RackGroup.objects.all(),
         to_field_name="name",
-        label="Parent (name or ID)",
     )
     ancestors = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Location.objects.all(),
@@ -373,7 +367,6 @@ class RackGroupFilterSet(LocatableModelFilterSetMixin, NautobotFilterSet, NameSe
     children = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=RackGroup.objects.all(),
         to_field_name="name",
-        label="Children (name or ID)",
     )
     has_children = RelatedMembershipBooleanFilter(
         field_name="children",
@@ -385,7 +378,6 @@ class RackGroupFilterSet(LocatableModelFilterSetMixin, NautobotFilterSet, NameSe
         field_name="power_panels",
         to_field_name="name",
         queryset=PowerPanel.objects.all(),
-        label="Power panels (name or ID)",
     )
     has_power_panels = RelatedMembershipBooleanFilter(
         field_name="power_panels",
@@ -463,7 +455,6 @@ class RackFilterSet(
         field_name="power_feeds",
         to_field_name="name",
         queryset=PowerFeed.objects.all(),
-        label="Power feeds (name or ID)",
     )
     has_power_feeds = RelatedMembershipBooleanFilter(
         field_name="power_feeds",
@@ -512,14 +503,12 @@ class RackReservationFilterSet(TenancyModelFilterSetMixin, NautobotFilterSet):
     user = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=get_user_model().objects.all(),
         to_field_name="username",
-        label="User (username or ID)",
     )
     # TODO: solve https://github.com/nautobot/nautobot/issues/2875 to use this filter correctly
     rack = NaturalKeyOrPKMultipleChoiceFilter(
         prefers_id=True,
         queryset=Rack.objects.all(),
         to_field_name="name",
-        label="Rack (name or ID)",
     )
 
     class Meta:
@@ -533,7 +522,6 @@ class ManufacturerFilterSet(NautobotFilterSet, NameSearchFilterSet):
         prefers_id=True,
         queryset=InventoryItem.objects.all(),
         to_field_name="name",
-        label="Inventory items (name or ID)",
     )
     has_inventory_items = RelatedMembershipBooleanFilter(
         field_name="inventory_items",
@@ -542,7 +530,6 @@ class ManufacturerFilterSet(NautobotFilterSet, NameSearchFilterSet):
     device_types = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=DeviceType.objects.all(),
         to_field_name="model",
-        label="Device types (model or ID)",
     )
     has_device_types = RelatedMembershipBooleanFilter(
         field_name="device_types",
@@ -551,7 +538,6 @@ class ManufacturerFilterSet(NautobotFilterSet, NameSearchFilterSet):
     platforms = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Platform.objects.all(),
         to_field_name="name",
-        label="Platforms (name or ID)",
     )
     has_platforms = RelatedMembershipBooleanFilter(
         field_name="platforms",
@@ -567,7 +553,6 @@ class DeviceFamilyFilterSet(NautobotFilterSet, NameSearchFilterSet):
     device_types = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=DeviceType.objects.all(),
         to_field_name="model",
-        label="Device types (model or ID)",
     )
     has_device_types = RelatedMembershipBooleanFilter(
         field_name="device_types",
@@ -590,7 +575,8 @@ class DeviceTypeFilterSet(DeviceTypeModuleTypeCommonFiltersMixin, NautobotFilter
         },
     )
     device_family = NaturalKeyOrPKMultipleChoiceFilter(
-        queryset=DeviceFamily.objects.all(), to_field_name="name", label="Device family (name or ID)"
+        queryset=DeviceFamily.objects.all(),
+        to_field_name="name",
     )
     console_ports = django_filters.BooleanFilter(
         method="_console_ports",
@@ -629,7 +615,6 @@ class DeviceTypeFilterSet(DeviceTypeModuleTypeCommonFiltersMixin, NautobotFilter
         prefers_id=True,
         to_field_name="name",
         queryset=DeviceBayTemplate.objects.all(),
-        label="Device bay templates (name or ID)",
     )
     has_device_bay_templates = RelatedMembershipBooleanFilter(
         field_name="device_bay_templates",
@@ -642,7 +627,6 @@ class DeviceTypeFilterSet(DeviceTypeModuleTypeCommonFiltersMixin, NautobotFilter
     software_image_files = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SoftwareImageFile.objects.all(),
         to_field_name="image_file_name",
-        label="Software image files (image file name or ID)",
     )
 
     class Meta:
@@ -680,12 +664,6 @@ class DeviceTypeFilterSet(DeviceTypeModuleTypeCommonFiltersMixin, NautobotFilter
         return queryset.exclude(device_bay_templates__isnull=value)
 
 
-# TODO: remove in 2.2
-@class_deprecated_in_favor_of(DeviceComponentTemplateModelFilterSetMixin)
-class DeviceTypeComponentFilterSet(DeviceComponentTemplateModelFilterSetMixin):
-    pass
-
-
 class ConsolePortTemplateFilterSet(ModularDeviceComponentTemplateModelFilterSetMixin, BaseFilterSet):
     class Meta:
         model = ConsolePortTemplate
@@ -704,7 +682,6 @@ class PowerPortTemplateFilterSet(ModularDeviceComponentTemplateModelFilterSetMix
         prefers_id=True,
         to_field_name="name",
         queryset=PowerOutletTemplate.objects.all(),
-        label="Power outlet templates (name or ID)",
     )
     has_power_outlet_templates = RelatedMembershipBooleanFilter(
         field_name="power_outlet_templates",
@@ -726,7 +703,6 @@ class PowerOutletTemplateFilterSet(ModularDeviceComponentTemplateModelFilterSetM
         prefers_id=True,
         to_field_name="name",
         queryset=PowerPortTemplate.objects.all(),
-        label="Power port template (name or ID)",
     )
 
     class Meta:
@@ -741,21 +717,12 @@ class InterfaceTemplateFilterSet(ModularDeviceComponentTemplateModelFilterSetMix
 
 
 class FrontPortTemplateFilterSet(ModularDeviceComponentTemplateModelFilterSetMixin, BaseFilterSet):
-    rear_port_template = django_filters.ModelMultipleChoiceFilter(
-        queryset=RearPortTemplate.objects.all(),
-        label="Rear port template",
-    )
-
     class Meta:
         model = FrontPortTemplate
-        fields = ["type", "rear_port_position"]
+        fields = ["type", "rear_port_position", "rear_port_template"]
 
 
 class RearPortTemplateFilterSet(ModularDeviceComponentTemplateModelFilterSetMixin, BaseFilterSet):
-    front_port_templates = django_filters.ModelMultipleChoiceFilter(
-        queryset=FrontPortTemplate.objects.all(),
-        label="Front port templates",
-    )
     has_front_port_templates = RelatedMembershipBooleanFilter(
         field_name="front_port_templates",
         label="Has front port templates",
@@ -763,7 +730,7 @@ class RearPortTemplateFilterSet(ModularDeviceComponentTemplateModelFilterSetMixi
 
     class Meta:
         model = RearPortTemplate
-        fields = ["type", "positions"]
+        fields = ["type", "positions", "front_port_templates"]
 
 
 class DeviceBayTemplateFilterSet(DeviceComponentTemplateModelFilterSetMixin, BaseFilterSet):
@@ -774,7 +741,8 @@ class DeviceBayTemplateFilterSet(DeviceComponentTemplateModelFilterSetMixin, Bas
 
 class PlatformFilterSet(NautobotFilterSet, NameSearchFilterSet):
     manufacturer = NaturalKeyOrPKMultipleChoiceFilter(
-        queryset=Manufacturer.objects.all(), to_field_name="name", label="Manufacturer (name or ID)"
+        queryset=Manufacturer.objects.all(),
+        to_field_name="name",
     )
     has_devices = RelatedMembershipBooleanFilter(
         field_name="devices",
@@ -849,10 +817,10 @@ class DeviceFilterSet(
     device_type = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=DeviceType.objects.all(),
         to_field_name="model",
-        label="Device type (model or ID)",
     )
     platform = NaturalKeyOrPKMultipleChoiceFilter(
-        queryset=Platform.objects.all(), to_field_name="name", label="Platform (name or ID)"
+        queryset=Platform.objects.all(),
+        to_field_name="name",
     )
     rack_group = TreeNodeMultipleChoiceFilter(
         prefers_id=True,
@@ -866,13 +834,20 @@ class DeviceFilterSet(
         prefers_id=True,
         queryset=Rack.objects.all(),
         to_field_name="name",
-        label="Rack (name or ID)",
     )
+    # TODO: This is deprecated, left for backwards compatibility.
     cluster = NaturalKeyOrPKMultipleChoiceFilter(
+        field_name="clusters",
         queryset=Cluster.objects.all(),
         to_field_name="name",
         label="VM cluster (name or ID)",
     )
+    clusters = NaturalKeyOrPKMultipleChoiceFilter(
+        field_name="clusters",
+        queryset=Cluster.objects.all(),
+        to_field_name="name",
+        label="VM clusters (name or ID)",
+    )
     is_full_depth = django_filters.BooleanFilter(
         field_name="device_type__is_full_depth",
         label="Is full depth",
@@ -885,12 +860,10 @@ class DeviceFilterSet(
     secrets_group = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SecretsGroup.objects.all(),
         to_field_name="name",
-        label="Secrets group (name or ID)",
     )
     virtual_chassis = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=VirtualChassis.objects.all(),
         to_field_name="name",
-        label="Virtual chassis (name or ID)",
     )
     is_virtual_chassis_member = RelatedMembershipBooleanFilter(
         field_name="virtual_chassis",
@@ -900,23 +873,17 @@ class DeviceFilterSet(
         field_name="device_redundancy_group",
         queryset=DeviceRedundancyGroup.objects.all(),
         to_field_name="name",
-        label="Device Redundancy Groups (name or ID)",
     )
     controller_managed_device_group = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="controller_managed_device_group",
         queryset=ControllerManagedDeviceGroup.objects.all(),
         to_field_name="name",
-        label="Controller Managed Device Groups (name or ID)",
     )
     virtual_chassis_member = is_virtual_chassis_member
     has_device_bays = RelatedMembershipBooleanFilter(
         field_name="device_bays",
         label="Has device bays",
     )
-    device_bays = django_filters.ModelMultipleChoiceFilter(
-        queryset=DeviceBay.objects.all(),
-        label="Device Bays",
-    )
     has_software_image_files = RelatedMembershipBooleanFilter(
         field_name="software_image_files",
         label="Has software image files",
@@ -924,7 +891,6 @@ class DeviceFilterSet(
     software_image_files = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SoftwareImageFile.objects.all(),
         to_field_name="image_file_name",
-        label="Software image files (image file name or ID)",
     )
     has_software_version = RelatedMembershipBooleanFilter(
         field_name="software_version",
@@ -933,7 +899,6 @@ class DeviceFilterSet(
     software_version = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SoftwareVersion.objects.all(),
         to_field_name="version",
-        label="Software version (version or ID)",
     )
     ip_addresses = MultiValueCharFilter(
         method="filter_ip_addresses",
@@ -945,7 +910,6 @@ class DeviceFilterSet(
         field_name="controller_managed_device_group__radio_profiles",
         queryset=RadioProfile.objects.all(),
         to_field_name="name",
-        label="Radio Profiles (name or ID)",
     )
     has_radio_profiles = RelatedMembershipBooleanFilter(
         field_name="controller_managed_device_group__radio_profiles",
@@ -955,7 +919,6 @@ class DeviceFilterSet(
         field_name="controller_managed_device_group__wireless_networks",
         queryset=WirelessNetwork.objects.all(),
         to_field_name="name",
-        label="Wireless Networks (name or ID)",
     )
     has_wireless_networks = RelatedMembershipBooleanFilter(
         field_name="controller_managed_device_group__wireless_networks",
@@ -987,6 +950,7 @@ class DeviceFilterSet(
             "vc_priority",
             "device_redundancy_group_priority",
             "tags",
+            "device_bays",
             "interfaces",
             "has_software_image_files",
             "software_image_files",
@@ -1005,24 +969,6 @@ class DeviceFilterSet(
         return queryset.filter(params)
 
 
-# TODO: remove in 2.2
-@class_deprecated_in_favor_of(DeviceComponentModelFilterSetMixin)
-class DeviceComponentFilterSet(DeviceComponentModelFilterSetMixin):
-    pass
-
-
-# TODO: remove in 2.2
-@class_deprecated_in_favor_of(CableTerminationModelFilterSetMixin)
-class CableTerminationFilterSet(CableTerminationModelFilterSetMixin):
-    pass
-
-
-# TODO: remove in 2.2
-@class_deprecated_in_favor_of(PathEndpointModelFilterSetMixin)
-class PathEndpointFilterSet(PathEndpointModelFilterSetMixin):
-    pass
-
-
 class ConsolePortFilterSet(
     ModularDeviceComponentModelFilterSetMixin,
     CableTerminationModelFilterSetMixin,
@@ -1062,7 +1008,6 @@ class PowerPortFilterSet(
         field_name="power_outlets",
         to_field_name="name",
         queryset=PowerOutlet.objects.all(),
-        label="Power outlets (name or ID)",
     )
     has_power_outlets = RelatedMembershipBooleanFilter(
         field_name="power_outlets",
@@ -1081,14 +1026,10 @@ class PowerOutletFilterSet(
     BaseFilterSet,
 ):
     type = django_filters.MultipleChoiceFilter(choices=PowerOutletTypeChoices, null_value=None)
-    power_port = django_filters.ModelMultipleChoiceFilter(
-        queryset=PowerPort.objects.all(),
-        label="Power port",
-    )
 
     class Meta:
         model = PowerOutlet
-        fields = ["id", "name", "feed_leg", "description", "label", "tags"]
+        fields = ["id", "name", "feed_leg", "power_port", "description", "label", "tags"]
 
 
 class InterfaceFilterSet(
@@ -1104,11 +1045,10 @@ class InterfaceFilterSet(
     device = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Device.objects.all(),
         to_field_name="name",
-        label="Device (name or ID)",
         method="filter_device",
     )
     # TODO 3.0: Remove this filter. Deprecated in favor of above NaturalKeyOrPKMultipleChoiceFilter `device`
-    device_id = django_filters.ModelMultipleChoiceFilter(
+    device_id = ModelMultipleChoiceFilter(
         queryset=Device.objects.all(),
         method="filter_device_id",
         field_name="device",
@@ -1128,33 +1068,28 @@ class InterfaceFilterSet(
         prefers_id=True,
         queryset=Interface.objects.all(),
         to_field_name="name",
-        label="Parent interface (name or ID)",
     )
     # TODO: solve https://github.com/nautobot/nautobot/issues/2875 to use this filter correctly
     bridge = NaturalKeyOrPKMultipleChoiceFilter(
         prefers_id=True,
         queryset=Interface.objects.all(),
         to_field_name="name",
-        label="Bridge interface (name or ID)",
     )
     # TODO: solve https://github.com/nautobot/nautobot/issues/2875 to use this filter correctly
     lag = NaturalKeyOrPKMultipleChoiceFilter(
         prefers_id=True,
         to_field_name="name",
         queryset=Interface.objects.filter(type=InterfaceTypeChoices.TYPE_LAG),
-        label="LAG interface (name or ID)",
     )
     untagged_vlan = NaturalKeyOrPKMultipleChoiceFilter(
         prefers_id=True,
         to_field_name="vid",
         queryset=VLAN.objects.all(),
-        label="Untagged VLAN (VID or ID)",
     )
     tagged_vlans = NaturalKeyOrPKMultipleChoiceFilter(
         prefers_id=True,
         to_field_name="vid",
         queryset=VLAN.objects.all(),
-        label="Tagged VLANs (VID or ID)",
     )
     has_tagged_vlans = RelatedMembershipBooleanFilter(
         field_name="tagged_vlans",
@@ -1165,7 +1100,6 @@ class InterfaceFilterSet(
         prefers_id=True,
         queryset=Interface.objects.all(),
         to_field_name="name",
-        label="Child interfaces (name or ID)",
     )
     has_child_interfaces = RelatedMembershipBooleanFilter(
         field_name="child_interfaces",
@@ -1176,7 +1110,6 @@ class InterfaceFilterSet(
         prefers_id=True,
         to_field_name="name",
         queryset=Interface.objects.all(),
-        label="Bridged interfaces (name or ID)",
     )
     has_bridged_interfaces = RelatedMembershipBooleanFilter(
         field_name="bridged_interfaces",
@@ -1187,7 +1120,6 @@ class InterfaceFilterSet(
         prefers_id=True,
         to_field_name="name",
         queryset=Interface.objects.all(),
-        label="Member interfaces (name or ID)",
     )
     has_member_interfaces = RelatedMembershipBooleanFilter(
         field_name="member_interfaces",
@@ -1210,7 +1142,6 @@ class InterfaceFilterSet(
     virtual_device_contexts = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=VirtualDeviceContext.objects.all(),
         to_field_name="name",
-        label="Virtual Device Context (name or ID)",
     )
     has_virtual_device_contexts = RelatedMembershipBooleanFilter(
         field_name="virtual_device_contexts",
@@ -1309,7 +1240,6 @@ class FrontPortFilterSet(ModularDeviceComponentModelFilterSetMixin, CableTermina
         prefers_id=True,
         to_field_name="name",
         queryset=RearPort.objects.all(),
-        label="Rear port (name or ID)",
     )
 
     class Meta:
@@ -1321,7 +1251,6 @@ class RearPortFilterSet(ModularDeviceComponentModelFilterSetMixin, CableTerminat
     front_ports = NaturalKeyOrPKMultipleChoiceFilter(
         to_field_name="name",
         queryset=FrontPort.objects.all(),
-        label="Front ports (name or ID)",
     )
     has_front_ports = RelatedMembershipBooleanFilter(
         field_name="front_ports",
@@ -1340,7 +1269,6 @@ class DeviceBayFilterSet(DeviceComponentModelFilterSetMixin, BaseFilterSet):
         field_name="installed_device",
         to_field_name="name",
         queryset=Device.objects.all(),
-        label="Installed device (name or ID)",
     )
 
     class Meta:
@@ -1368,14 +1296,12 @@ class InventoryItemFilterSet(DeviceComponentModelFilterSetMixin, BaseFilterSet):
         queryset=Location.objects.all(),
         field_name="device__location",
         to_field_name="name",
-        label="Location (name or ID)",
     )
     # TODO: solve https://github.com/nautobot/nautobot/issues/2875 to use this filter correctly
     device = NaturalKeyOrPKMultipleChoiceFilter(
         prefers_id=True,
         queryset=Device.objects.all(),
         to_field_name="name",
-        label="Device (name or ID)",
     )
     # TODO: solve https://github.com/nautobot/nautobot/issues/2875 to use this filter correctly
     parent = NaturalKeyOrPKMultipleChoiceFilter(
@@ -1387,7 +1313,6 @@ class InventoryItemFilterSet(DeviceComponentModelFilterSetMixin, BaseFilterSet):
     manufacturer = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Manufacturer.objects.all(),
         to_field_name="name",
-        label="Manufacturer (name or ID)",
     )
     # TODO: solve https://github.com/nautobot/nautobot/issues/2875 to use this filter correctly
     children = NaturalKeyOrPKMultipleChoiceFilter(
@@ -1408,7 +1333,6 @@ class InventoryItemFilterSet(DeviceComponentModelFilterSetMixin, BaseFilterSet):
     software_image_files = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SoftwareImageFile.objects.all(),
         to_field_name="image_file_name",
-        label="Software image files (image file name or ID)",
     )
     has_software_version = RelatedMembershipBooleanFilter(
         field_name="software_version",
@@ -1417,7 +1341,6 @@ class InventoryItemFilterSet(DeviceComponentModelFilterSetMixin, BaseFilterSet):
     software_version = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SoftwareVersion.objects.all(),
         to_field_name="version",
-        label="Software version (version or ID)",
     )
 
     class Meta:
@@ -1451,7 +1374,6 @@ class VirtualChassisFilterSet(NautobotFilterSet):
         prefers_id=True,
         queryset=Device.objects.all(),
         to_field_name="name",
-        label="Master (name or ID)",
     )
     # TODO Check this filter as it is not using TreeNode...
     location = NaturalKeyOrPKMultipleChoiceFilter(
@@ -1575,12 +1497,6 @@ class ConnectionFilterSetMixin:
         return queryset.filter(**{f"{name}__in": value})
 
 
-# TODO: remove in 2.2
-@class_deprecated_in_favor_of(ConnectionFilterSetMixin)
-class ConnectionFilterSet(ConnectionFilterSetMixin):
-    pass
-
-
 class ConsoleConnectionFilterSet(ConnectionFilterSetMixin, BaseFilterSet):
     location = django_filters.CharFilter(
         method="filter_location",
@@ -1633,7 +1549,6 @@ class PowerPanelFilterSet(LocatableModelFilterSetMixin, NautobotFilterSet):
         prefers_id=True,
         to_field_name="name",
         queryset=PowerFeed.objects.all(),
-        label="Power feeds (name or ID)",
     )
     has_power_feeds = RelatedMembershipBooleanFilter(
         field_name="power_feeds",
@@ -1668,7 +1583,6 @@ class PowerFeedFilterSet(
         prefers_id=True,
         queryset=PowerPanel.objects.all(),
         to_field_name="name",
-        label="Power panel (name or ID)",
     )
     destination_panel = NaturalKeyOrPKMultipleChoiceFilter(
         prefers_id=True,
@@ -1681,7 +1595,6 @@ class PowerFeedFilterSet(
         prefers_id=True,
         queryset=Rack.objects.all(),
         to_field_name="name",
-        label="Rack (name or ID)",
     )
 
     class Meta:
@@ -1710,7 +1623,6 @@ class DeviceRedundancyGroupFilterSet(NautobotFilterSet, StatusModelFilterSetMixi
     secrets_group = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SecretsGroup.objects.all(),
         to_field_name="name",
-        label="Secrets group (name or ID)",
     )
 
     class Meta:
@@ -1726,7 +1638,6 @@ class InterfaceRedundancyGroupFilterSet(NameSearchFilterSet, BaseFilterSet):
         field_name="secrets_group",
         queryset=SecretsGroup.objects.all(),
         to_field_name="name",
-        label="Secrets group",
     )
     virtual_ip = MultiValueCharFilter(
         method="filter_virtual_ip",
@@ -1758,13 +1669,11 @@ class InterfaceRedundancyGroupAssociationFilterSet(BaseFilterSet):
     interface_redundancy_group = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=InterfaceRedundancyGroup.objects.all(),
         to_field_name="name",
-        label="Interface Redundancy Groups (name or ID)",
     )
 
     interface = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Interface.objects.all(),
         to_field_name="name",
-        label="Interface (name or ID)",
     )
 
     class Meta:
@@ -1789,12 +1698,10 @@ class SoftwareImageFileFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
     software_version = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SoftwareVersion.objects.all(),
         to_field_name="version",
-        label="Software version (version or ID)",
     )
     device_types = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=DeviceType.objects.all(),
         to_field_name="model",
-        label="Device types (model or ID)",
     )
     has_device_types = RelatedMembershipBooleanFilter(
         field_name="device_types",
@@ -1802,7 +1709,6 @@ class SoftwareImageFileFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
     )
     devices = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Device.objects.all(),
-        label="Devices (name or ID)",
     )
     has_devices = RelatedMembershipBooleanFilter(
         field_name="devices",
@@ -1814,7 +1720,6 @@ class SoftwareImageFileFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
     external_integration = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ExternalIntegration.objects.all(),
         to_field_name="name",
-        label="External integration (name or ID)",
     )
 
     class Meta:
@@ -1834,7 +1739,6 @@ class SoftwareVersionFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
     )
     devices = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Device.objects.all(),
-        label="Devices (name or ID)",
     )
     has_devices = RelatedMembershipBooleanFilter(
         field_name="devices",
@@ -1842,7 +1746,6 @@ class SoftwareVersionFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
     )
     inventory_items = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=InventoryItem.objects.all(),
-        label="Inventory items (name or ID)",
     )
     has_inventory_items = RelatedMembershipBooleanFilter(
         field_name="inventory_items",
@@ -1850,7 +1753,6 @@ class SoftwareVersionFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
     )
     virtual_machines = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=VirtualMachine.objects.all(),
-        label="Virtual machines (name or ID)",
     )
     has_virtual_machines = RelatedMembershipBooleanFilter(
         field_name="virtual_machines",
@@ -1859,7 +1761,6 @@ class SoftwareVersionFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
     platform = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Platform.objects.all(),
         to_field_name="name",
-        label="Platform (name or ID)",
     )
     device_types = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="software_image_files__device_types",
@@ -1874,7 +1775,6 @@ class SoftwareVersionFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
     software_image_files = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SoftwareImageFile.objects.all(),
         to_field_name="image_file_name",
-        label="Software image files (image file name or ID)",
     )
 
     class Meta:
@@ -1895,12 +1795,10 @@ class DeviceTypeToSoftwareImageFileFilterSet(BaseFilterSet):
     device_type = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=DeviceType.objects.all(),
         to_field_name="model",
-        label="Device type (model or ID)",
     )
     software_image_file = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SoftwareImageFile.objects.all(),
         to_field_name="image_file_name",
-        label="Software image file (image file name or ID)",
     )
 
     class Meta:
@@ -1926,12 +1824,10 @@ class ControllerFilterSet(
     platform = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Platform.objects.all(),
         to_field_name="name",
-        label="Platform (name or ID)",
     )
     external_integration = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ExternalIntegration.objects.all(),
         to_field_name="name",
-        label="External integration (name or ID)",
     )
     capabilities = django_filters.MultipleChoiceFilter(
         choices=ControllerCapabilitiesChoices,
@@ -1942,12 +1838,10 @@ class ControllerFilterSet(
     controller_device = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Device.objects.all(),
         to_field_name="name",
-        label="Controller device (name or ID)",
     )
     controller_device_redundancy_group = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=DeviceRedundancyGroup.objects.all(),
         to_field_name="name",
-        label="Controller device redundancy group (name or ID)",
     )
     wireless_networks = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="controller_managed_device_groups__wireless_networks",
@@ -1981,7 +1875,6 @@ class ControllerManagedDeviceGroupFilterSet(
     controller = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Controller.objects.all(),
         to_field_name="name",
-        label="Controller (name or ID)",
     )
     parent = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ControllerManagedDeviceGroup.objects.all(),
@@ -1996,7 +1889,6 @@ class ControllerManagedDeviceGroupFilterSet(
     )
     radio_profiles = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=RadioProfile.objects.all(),
-        label="Radio Profiles (name or ID)",
     )
     has_radio_profiles = RelatedMembershipBooleanFilter(
         field_name="radio_profiles",
@@ -2004,7 +1896,6 @@ class ControllerManagedDeviceGroupFilterSet(
     )
     wireless_networks = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=WirelessNetwork.objects.all(),
-        label="Wireless Networks (name or ID)",
     )
     has_wireless_networks = RelatedMembershipBooleanFilter(
         field_name="wireless_networks",
@@ -2090,7 +1981,6 @@ class ModuleFilterSet(
     module_type = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ModuleType.objects.all(),
         to_field_name="model",
-        label="Module type (model or ID)",
     )
     module_family = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="module_type__module_family",
@@ -2098,16 +1988,12 @@ class ModuleFilterSet(
         to_field_name="name",
         label="Module family (name or ID)",
     )
-    parent_module_bay = django_filters.ModelMultipleChoiceFilter(
-        queryset=ModuleBay.objects.all(),
-        label="Parent Module Bay",
-    )
     device = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Device.objects.all(),
         to_field_name="name",
-        label="Device (name or ID)",
         method="filter_device",
     )
+    # TODO: change to a ModelMultipleChoiceFilter as a breaking change for Dynamic Group and permission definitions
     compatible_with_module_bay = extend_schema_field({"type": "string", "format": "uuid"})(
         django_filters.ModelChoiceFilter(
             queryset=ModuleBay.objects.all(),
@@ -2175,13 +2061,12 @@ class ModuleTypeFilterSet(DeviceTypeModuleTypeCommonFiltersMixin, NautobotFilter
     manufacturer = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Manufacturer.objects.all(),
         to_field_name="name",
-        label="Manufacturer (name or ID)",
     )
     module_family = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ModuleFamily.objects.all(),
         to_field_name="name",
-        label="Module family (name or ID)",
     )
+    # TODO: change to a ModelMultipleChoiceFilter as a breaking change for Dynamic Group and permission definitions
     compatible_with_module_bay = extend_schema_field({"type": "string", "format": "uuid"})(
         django_filters.ModelChoiceFilter(
             queryset=ModuleBay.objects.all(),
@@ -2237,7 +2122,6 @@ class ModuleBayTemplateFilterSet(ModularDeviceComponentTemplateModelFilterSetMix
     module_family = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ModuleFamily.objects.all(),
         to_field_name="name",
-        label="Module family (name or ID)",
     )
     requires_first_party_modules = django_filters.BooleanFilter(
         label="Requires first-party modules",
@@ -2276,23 +2160,18 @@ class ModuleBayFilterSet(NautobotFilterSet):
     parent_device = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Device.objects.all(),
         to_field_name="name",
-        label="Parent device (name or ID)",
     )
     has_parent_device = RelatedMembershipBooleanFilter(
         field_name="parent_device",
         label="Has parent device",
     )
-    parent_module = django_filters.ModelMultipleChoiceFilter(
-        queryset=Module.objects.all(),
-        label="Parent module (ID)",
-    )
     has_parent_module = RelatedMembershipBooleanFilter(
         field_name="parent_module",
         label="Has parent module",
     )
-    installed_module = django_filters.ModelMultipleChoiceFilter(
+    # needed because this is a *reverse* OneToOneField and so doesn't get included automatically in "__all__"
+    installed_module = ModelMultipleChoiceFilter(
         queryset=Module.objects.all(),
-        label="Installed module (ID)",
     )
     has_installed_module = RelatedMembershipBooleanFilter(
         field_name="installed_module",
@@ -2301,7 +2180,6 @@ class ModuleBayFilterSet(NautobotFilterSet):
     module_family = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ModuleFamily.objects.all(),
         to_field_name="name",
-        label="Module family (name or ID)",
     )
     requires_first_party_modules = django_filters.BooleanFilter(
         field_name="requires_first_party_modules",
@@ -2347,13 +2225,11 @@ class VirtualDeviceContextFilterSet(
     device = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Device.objects.all(),
         to_field_name="name",
-        label="Device (name or ID)",
     )
     interfaces = NaturalKeyOrPKMultipleChoiceFilter(
         prefers_id=True,
         queryset=Interface.objects.all(),
         to_field_name="name",
-        label="Interface (name or ID)",
     )
     has_interfaces = RelatedMembershipBooleanFilter(
         field_name="interfaces",
@@ -2425,13 +2301,11 @@ class InterfaceVDCAssignmentFilterSet(NautobotFilterSet):
     virtual_device_context = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=VirtualDeviceContext.objects.all(),
         to_field_name="name",
-        label="Virtual Device Context (name or ID)",
     )
     interface = NaturalKeyOrPKMultipleChoiceFilter(
         prefers_id=True,
         queryset=Interface.objects.all(),
         to_field_name="name",
-        label="Interface (name or ID)",
     )
 
     class Meta:
@@ -2470,11 +2344,10 @@ class ModuleFamilyFilterSet(NautobotFilterSet):
     module_types = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ModuleType.objects.all(),
         to_field_name="model",
-        label="Module types (model or ID)",
     )
 
     module_bay_id = extend_schema_field({"type": "array", "items": {"type": "string", "format": "uuid"}})(
-        django_filters.ModelMultipleChoiceFilter(
+        ModelMultipleChoiceFilter(
             queryset=ModuleBay.objects.all(),
             label="Module bay (ID)",
         )
@@ -2490,3 +2363,43 @@ class ModuleFamilyFilterSet(NautobotFilterSet):
             "module_bay_id",
             "tags",
         ]
+
+
+class DeviceClusterAssignmentFilterSet(NautobotFilterSet):
+    """Filters for DeviceClusterAssignment model."""
+
+    q = SearchFilter(
+        filter_predicates={
+            "device__name": {
+                "lookup_expr": "icontains",
+                "preprocessor": str.strip,
+            },
+            "device__asset_tag": {
+                "lookup_expr": "icontains",
+                "preprocessor": str.strip,
+            },
+            "device__serial": {
+                "lookup_expr": "icontains",
+                "preprocessor": str.strip,
+            },
+            "cluster__name": {
+                "lookup_expr": "icontains",
+                "preprocessor": str.strip,
+            },
+        }
+    )
+
+    device = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Device.objects.all(),
+        to_field_name="name",
+        label="Device (name or ID)",
+    )
+    cluster = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Cluster.objects.all(),
+        to_field_name="name",
+        label="Cluster (name or ID)",
+    )
+
+    class Meta:
+        model = DeviceClusterAssignment
+        fields = ["device", "cluster"]