nautobot 2.2.3__py3-none-any.whl → 2.2.5__py3-none-any.whl

nautobot/dcim/views.py

@@ -199,6 +199,7 @@ class LocationTypeView(generic.ObjectView):
         return {
             "children_table": children_table,
             "locations_table": locations_table,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -297,6 +298,7 @@ class LocationView(generic.ObjectView):
             "contact_association_permission": ["extras.add_contactassociation"],
             # show the button if any of these fields have non-empty value.
             "show_convert_to_contact_button": instance.contact_name or instance.contact_phone or instance.contact_email,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -494,9 +496,7 @@ class RackGroupView(generic.ObjectView):
         }
         RequestConfig(request, paginate).configure(rack_table)
 
-        return {
-            "rack_table": rack_table,
-        }
+        return {"rack_table": rack_table, **super().get_extra_context(request, instance)}
 
 
 class RackGroupEditView(generic.ObjectEditView):
@@ -615,6 +615,7 @@ class RackView(generic.ObjectView):
             "nonracked_devices": nonracked_devices,
             "next_rack": next_rack,
             "prev_rack": prev_rack,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -709,6 +710,7 @@ class ManufacturerListView(generic.ObjectListView):
         platform_count=count_related(Platform, "manufacturer"),
     )
     filterset = filters.ManufacturerFilterSet
+    filterset_form = forms.ManufacturerFilterForm
     table = tables.ManufacturerTable
 
 
@@ -731,9 +733,7 @@ class ManufacturerView(generic.ObjectView):
         }
         RequestConfig(request, paginate).configure(device_table)
 
-        return {
-            "device_table": device_table,
-        }
+        return {"device_table": device_table, **super().get_extra_context(request, instance)}
 
 
 class ManufacturerEditView(generic.ObjectEditView):
@@ -839,6 +839,7 @@ class DeviceTypeView(generic.ObjectView):
             "rear_port_table": rear_port_table,
             "devicebay_table": devicebay_table,
             "software_image_files_table": software_image_files_table,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -1212,6 +1213,7 @@ class PlatformListView(generic.ObjectListView):
         virtual_machine_count=count_related(VirtualMachine, "platform"),
     )
     filterset = filters.PlatformFilterSet
+    filterset_form = forms.PlatformFilterForm
     table = tables.PlatformTable
 
 
@@ -1237,6 +1239,7 @@ class PlatformView(generic.ObjectView):
         return {
             "device_table": device_table,
             "network_driver_tool_names": get_network_driver_mapping_tool_names(),
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -1246,7 +1249,10 @@ class PlatformEditView(generic.ObjectEditView):
     template_name = "dcim/platform_edit.html"
 
     def get_extra_context(self, request, instance):
-        return {"network_driver_names": sorted(get_all_network_driver_mappings().keys())}
+        return {
+            "network_driver_names": sorted(get_all_network_driver_mappings().keys()),
+            **super().get_extra_context(request, instance),
+        }
 
 
 class PlatformDeleteView(generic.ObjectDeleteView):
@@ -1637,7 +1643,7 @@ class ConsolePortView(generic.ObjectView):
     queryset = ConsolePort.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_consoleports"}
+        return {"breadcrumb_url": "dcim:device_consoleports", **super().get_extra_context(request, instance)}
 
 
 class ConsolePortCreateView(generic.ComponentCreateView):
@@ -1699,7 +1705,7 @@ class ConsoleServerPortView(generic.ObjectView):
     queryset = ConsoleServerPort.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_consoleserverports"}
+        return {"breadcrumb_url": "dcim:device_consoleserverports", **super().get_extra_context(request, instance)}
 
 
 class ConsoleServerPortCreateView(generic.ComponentCreateView):
@@ -1761,7 +1767,7 @@ class PowerPortView(generic.ObjectView):
     queryset = PowerPort.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_powerports"}
+        return {"breadcrumb_url": "dcim:device_powerports", **super().get_extra_context(request, instance)}
 
 
 class PowerPortCreateView(generic.ComponentCreateView):
@@ -1823,7 +1829,7 @@ class PowerOutletView(generic.ObjectView):
     queryset = PowerOutlet.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_poweroutlets"}
+        return {"breadcrumb_url": "dcim:device_poweroutlets", **super().get_extra_context(request, instance)}
 
 
 class PowerOutletCreateView(generic.ComponentCreateView):
@@ -1919,6 +1925,7 @@ class InterfaceView(generic.ObjectView):
             "breadcrumb_url": "dcim:device_interfaces",
             "child_interfaces_table": child_interfaces_tables,
             "redundancy_table": redundancy_table,
+            **super().get_extra_context(request, instance),
         }
 
     def _get_interface_redundancy_groups_table(self, request, instance):
@@ -2005,7 +2012,7 @@ class FrontPortView(generic.ObjectView):
     queryset = FrontPort.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_frontports"}
+        return {"breadcrumb_url": "dcim:device_frontports", **super().get_extra_context(request, instance)}
 
 
 class FrontPortCreateView(generic.ComponentCreateView):
@@ -2067,7 +2074,7 @@ class RearPortView(generic.ObjectView):
     queryset = RearPort.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_rearports"}
+        return {"breadcrumb_url": "dcim:device_rearports", **super().get_extra_context(request, instance)}
 
 
 class RearPortCreateView(generic.ComponentCreateView):
@@ -2129,7 +2136,7 @@ class DeviceBayView(generic.ObjectView):
     queryset = DeviceBay.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_devicebays"}
+        return {"breadcrumb_url": "dcim:device_devicebays", **super().get_extra_context(request, instance)}
 
 
 class DeviceBayCreateView(generic.ComponentCreateView):
@@ -2281,6 +2288,7 @@ class InventoryItemView(generic.ObjectView):
         return {
             "breadcrumb_url": "dcim:device_inventory",
             "software_version_images": software_version_images,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -2488,6 +2496,7 @@ class PathTraceView(generic.ObjectView):
             "path": path,
             "related_paths": related_paths,
             "total_length": path.get_total_length() if path else None,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -2698,9 +2707,7 @@ class VirtualChassisView(generic.ObjectView):
     def get_extra_context(self, request, instance):
         members = Device.objects.restrict(request.user).filter(virtual_chassis=instance)
 
-        return {
-            "members": members,
-        }
+        return {"members": members, **super().get_extra_context(request, instance)}
 
 
 class VirtualChassisCreateView(generic.ObjectEditView):
@@ -2938,9 +2945,7 @@ class PowerPanelView(generic.ObjectView):
         powerfeed_table = tables.PowerFeedTable(data=power_feeds, orderable=False)
         powerfeed_table.exclude = ["power_panel"]
 
-        return {
-            "powerfeed_table": powerfeed_table,
-        }
+        return {"powerfeed_table": powerfeed_table, **super().get_extra_context(request, instance)}
 
 
 class PowerPanelEditView(generic.ObjectEditView):
@@ -3100,6 +3105,7 @@ class InterfaceRedundancyGroupAssociationUIViewSet(ObjectEditViewMixin, ObjectDe
 
 class DeviceFamilyUIViewSet(NautobotUIViewSet):
     filterset_class = filters.DeviceFamilyFilterSet
+    filterset_form_class = forms.DeviceFamilyFilterForm
     form_class = forms.DeviceFamilyForm
     bulk_update_form_class = forms.DeviceFamilyBulkEditForm
     queryset = DeviceFamily.objects.annotate(device_type_count=count_related(DeviceType, "device_family"))

nautobot/extras/api/serializers.py

@@ -223,17 +223,28 @@ class ContactAssociationSerializer(NautobotModelSerializer):
         }
 
     def validate(self, data):
-        # Validate uniqueness of (contact/team, role)
+        # Validate uniqueness of (associated object, associated object type, contact/team, role)
+        unique_together_fields = None
+
         if data.get("contact") and data.get("role"):
-            validator = UniqueTogetherValidator(
-                queryset=ContactAssociation.objects.all(),
-                fields=("contact", "role"),
+            unique_together_fields = (
+                "associated_object_type",
+                "associated_object_id",
+                "contact",
+                "role",
             )
-            validator(data, self)
         elif data.get("team") and data.get("role"):
+            unique_together_fields = (
+                "associated_object_type",
+                "associated_object_id",
+                "team",
+                "role",
+            )
+
+        if unique_together_fields is not None:
             validator = UniqueTogetherValidator(
                 queryset=ContactAssociation.objects.all(),
-                fields=("team", "role"),
+                fields=unique_together_fields,
             )
             validator(data, self)
 

nautobot/extras/api/views.py

@@ -304,13 +304,13 @@ class DynamicGroupViewSet(NotesViewSetMixin, ModelViewSet):
     # @extend_schema(methods=["get"], responses={200: member_response})
     @action(detail=True, methods=["get"])
     def members(self, request, pk, *args, **kwargs):
-        """List member objects of the same type as the `content_type` for this dynamic group."""
+        """List the member objects of this dynamic group."""
         instance = get_object_or_404(self.queryset, pk=pk)
 
         # Retrieve the serializer for the content_type and paginate the results
         member_model_class = instance.content_type.model_class()
         member_serializer_class = get_serializer_for_model(member_model_class)
-        members = self.paginate_queryset(instance.members)
+        members = self.paginate_queryset(instance.members.restrict(request.user, "view"))
         member_serializer = member_serializer_class(members, many=True, context={"request": request})
         return self.get_paginated_response(member_serializer.data)
 

nautobot/extras/context_managers.py

@@ -91,9 +91,12 @@ class ChangeContext:
                 for entry in self.deferred_object_changes[key]:
                     objectchange = entry["instance"].to_objectchange(entry["action"])
                     objectchange.user = entry["user"]
+                    objectchange.user_name = objectchange.user.username
                     objectchange.request_id = self.change_id
                     objectchange.change_context = self.context
                     objectchange.change_context_detail = self.context_detail[:CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL]
+                    if not objectchange.changed_object_id:
+                        objectchange.changed_object_id = entry.get("changed_object_id")
                     create_object_changes.append(objectchange)
                 self.deferred_object_changes.pop(key, None)
             ObjectChange.objects.bulk_create(create_object_changes, batch_size=batch_size)

nautobot/extras/filters/__init__.py

@@ -504,7 +504,7 @@ class ContactFilterSet(ContactTeamFilterSet):
         fields = "__all__"
 
 
-class ContactAssociationFilterSet(NautobotFilterSet):
+class ContactAssociationFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, RoleModelFilterSetMixin):
     q = SearchFilter(
         filter_predicates={
             "contact__name": "icontains",
@@ -512,6 +512,19 @@ class ContactAssociationFilterSet(NautobotFilterSet):
         },
     )
 
+    contact = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Contact.objects.all(),
+        to_field_name="name",
+        label="Contact (name or ID)",
+    )
+    team = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Team.objects.all(),
+        to_field_name="name",
+        label="Team (name or ID)",
+    )
+
+    associated_object_type = ContentTypeFilter()
+
     class Meta:
         model = ContactAssociation
         fields = "__all__"
@@ -610,6 +623,7 @@ class ExportTemplateFilterSet(BaseFilterSet):
         },
     )
     owner_content_type = ContentTypeFilter()
+    content_type = ContentTypeFilter()
 
     class Meta:
         model = ExportTemplate

nautobot/extras/forms/forms.py

@@ -104,6 +104,7 @@ __all__ = (
     "ConfigContextSchemaBulkEditForm",
     "ConfigContextSchemaFilterForm",
     "CustomFieldForm",
+    "CustomFieldFilterForm",
     "CustomFieldModelCSVForm",
     "CustomFieldBulkCreateForm",  # 2.0 TODO remove this deprecated class
     "CustomFieldChoiceFormSet",
@@ -114,6 +115,7 @@ __all__ = (
     "DynamicGroupMembershipFormSet",
     "ExportTemplateForm",
     "ExportTemplateFilterForm",
+    "ExternalIntegrationFilterForm",
     "ExternalIntegrationForm",
     "ExternalIntegrationBulkEditForm",
     "GitRepositoryForm",
@@ -144,6 +146,7 @@ __all__ = (
     "RelationshipFilterForm",
     "RelationshipAssociationFilterForm",
     "RoleBulkEditForm",
+    "RoleFilterForm",
     "RoleForm",
     "ScheduledJobFilterForm",
     "SecretForm",
@@ -421,6 +424,17 @@ class CustomFieldForm(BootstrapMixin, forms.ModelForm):
             self.fields["key"].widget.attrs["readonly"] = True
 
 
+class CustomFieldFilterForm(NautobotFilterForm):
+    model = CustomField
+    q = forms.CharField(required=False, label="Search")
+    content_types = MultipleContentTypeField(
+        queryset=ContentType.objects.filter(FeatureQuery("custom_fields").get_query()),
+        choices_as_strings=True,
+        required=False,
+        label="Content Type(s)",
+    )
+
+
 class CustomFieldModelCSVForm(CSVModelForm, CustomFieldModelFormMixin):
     """
     Base class for CSV/JSON/YAML import of models that support custom fields.
@@ -638,6 +652,14 @@ class ExternalIntegrationBulkEditForm(NautobotBulkEditForm):
         nullable_fields = ["extra_config", "secrets_group", "headers"]
 
 
+class ExternalIntegrationFilterForm(NautobotFilterForm):
+    model = ExternalIntegration
+    q = forms.CharField(required=False, label="Search")
+    secrets_group = DynamicModelMultipleChoiceField(
+        queryset=SecretsGroup.objects.all(), to_field_name="name", required=False
+    )
+
+
 #
 # Git repositories and other data sources
 #
@@ -1429,6 +1451,17 @@ class RoleBulkEditForm(NautobotBulkEditForm):
         nullable_fields = ["weight"]
 
 
+class RoleFilterForm(NautobotFilterForm):
+    model = Role
+    q = forms.CharField(required=False, label="Search")
+    content_types = MultipleContentTypeField(
+        queryset=RoleModelsQuery().as_queryset(),
+        required=False,
+        choices_as_strings=True,
+        label="Content Type(s)",
+    )
+
+
 #
 # Secrets
 #

nautobot/extras/forms/mixins.py

@@ -45,7 +45,6 @@ __all__ = (
     # 2.0 TODO: remove the below deprecated aliases
     "AddRemoveTagsForm",
     "CustomFieldBulkEditForm",
-    "CustomFieldFilterForm",
     "CustomFieldModelForm",
     "RelationshipModelForm",
     "RoleModelBulkEditFormMixin",
@@ -767,11 +766,6 @@ class CustomFieldBulkEditForm(CustomFieldModelBulkEditFormMixin):
     pass
 
 
-@class_deprecated_in_favor_of(CustomFieldModelFilterFormMixin)
-class CustomFieldFilterForm(CustomFieldModelFilterFormMixin):
-    pass
-
-
 @class_deprecated_in_favor_of(CustomFieldModelFormMixin)
 class CustomFieldModelForm(CustomFieldModelFormMixin):
     pass

nautobot/extras/signals.py

@@ -246,7 +246,12 @@ def _handle_deleted_object(sender, instance, **kwargs):
 
         if save_new_objectchange:
             change_context.deferred_object_changes.setdefault(unique_object_change_id, []).append(
-                {"action": ObjectChangeActionChoices.ACTION_DELETE, "instance": instance, "user": user}
+                {
+                    "action": ObjectChangeActionChoices.ACTION_DELETE,
+                    "instance": instance,
+                    "user": user,
+                    "changed_object_id": instance.pk,
+                }
             )
             if not change_context.defer_object_changes:
                 objectchange = instance.to_objectchange(ObjectChangeActionChoices.ACTION_DELETE)

nautobot/extras/tests/test_api.py

@@ -17,6 +17,7 @@ from nautobot.core.models.fields import slugify_dashes_to_underscores
 from nautobot.core.testing import APITestCase, APIViewTestCases
 from nautobot.core.testing.utils import disable_warnings
 from nautobot.core.utils.lookup import get_route_for_model
+from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.dcim.models import (
     Controller,
     Device,
@@ -768,7 +769,7 @@ class DynamicGroupTestMixin:
 
         # Then the DynamicGroups.
         cls.content_type = ContentType.objects.get_for_model(Device)
-        cls.groups = cls.groups = [
+        cls.groups = [
             DynamicGroup.objects.create(
                 name="API DynamicGroup 1",
                 content_type=cls.content_type,
@@ -811,13 +812,34 @@ class DynamicGroupTest(DynamicGroupTestMixin, APIViewTestCases.APIViewTestCase):
     def test_get_members(self):
         """Test that the `/members/` API endpoint returns what is expected."""
         self.add_permissions("extras.view_dynamicgroup")
-        instance = DynamicGroup.objects.first()
+        instance = self.groups[0]
+        self.add_permissions(get_permission_for_model(instance.content_type.model_class(), "view"))
         member_count = instance.members.count()
         url = reverse("extras-api:dynamicgroup-members", kwargs={"pk": instance.pk})
         response = self.client.get(url, **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(member_count, len(response.json()["results"]))
 
+    def test_get_members_with_constrained_permission(self):
+        """Test that the `/members/` API endpoint enforces permissions on the member model."""
+        self.add_permissions("extras.view_dynamicgroup")
+        instance = self.groups[0]
+        obj1 = instance.members.first()
+        obj_perm = ObjectPermission(
+            name="Test permission",
+            constraints={"pk__in": [obj1.pk]},
+            actions=["view"],
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.object_types.add(instance.content_type)
+
+        url = reverse("extras-api:dynamicgroup-members", kwargs={"pk": instance.pk})
+        response = self.client.get(url, **self.header)
+        self.assertHttpStatus(response, status.HTTP_200_OK)
+        self.assertEqual(len(response.json()["results"]), 1)
+        self.assertEqual(response.json()["results"][0]["id"], str(obj1.pk))
+
 
 class DynamicGroupMembershipTest(DynamicGroupTestMixin, APIViewTestCases.APIViewTestCase):
     model = DynamicGroupMembership

nautobot/extras/tests/test_context_managers.py

@@ -5,13 +5,23 @@ from django.test import TestCase
 from nautobot.core.celery import app
 from nautobot.core.testing import TransactionTestCase
 from nautobot.core.utils.lookup import get_changes_for_model
-from nautobot.dcim.models import Location, LocationType
+from nautobot.dcim.models import (
+    DeviceType,
+    DeviceTypeToSoftwareImageFile,
+    Location,
+    LocationType,
+    Manufacturer,
+    Platform,
+    SoftwareImageFile,
+    SoftwareVersion,
+)
 from nautobot.extras.choices import ObjectChangeActionChoices, ObjectChangeEventContextChoices
 from nautobot.extras.context_managers import (
     deferred_change_logging_for_bulk_operation,
     web_request_context,
 )
 from nautobot.extras.models import Status, Webhook
+from nautobot.extras.utils import bulk_delete_with_bulk_change_logging
 
 # Use the proper swappable User model
 User = get_user_model()
@@ -231,6 +241,23 @@ class BulkEditDeleteChangeLogging(TestCase):
                     location.save()
                     location.delete()
 
+    def test_bulk_delete_has_user_in_change_log(self):
+        """Test that the bulk delete operation adds the user to the change log"""
+        location_type = LocationType.objects.get(name="Campus")
+        location_status = Status.objects.get_for_model(Location).first()
+        with web_request_context(self.user):
+            location = Location(name="Test Location 1", location_type=location_type, status=location_status)
+            location.save()
+            location_pk = location.pk
+            location_qs = Location.objects.filter(pk=location_pk)
+            bulk_delete_with_bulk_change_logging(location_qs)
+
+        oc_list = get_changes_for_model(location)
+        self.assertEqual(len(oc_list), 2)
+        self.assertEqual(oc_list[0].action, ObjectChangeActionChoices.ACTION_DELETE)
+        self.assertEqual(oc_list[0].user, self.user)
+        self.assertEqual(oc_list[0].user_name, self.user.username)
+
     def test_create_then_update(self):
         """Test that a create followed by an update is logged as a single create"""
         location_type = LocationType.objects.get(name="Campus")
@@ -276,6 +303,29 @@ class BulkEditDeleteChangeLogging(TestCase):
             self.assertIsNone(snapshots["differences"]["removed"])
             self.assertEqual(snapshots["differences"]["added"]["description"], "changed")
 
+    def test_bulk_edit_device_type_software_image_file(self):
+        """Test that bulk edits to null does not cause integrity error"""
+        manufacturer = Manufacturer.objects.create(name="Test")
+        platform = Platform.objects.create(name="Test")
+        software_status = Status.objects.get_for_model(SoftwareVersion).first()
+        software_version = SoftwareVersion.objects.create(version="1.0.0", platform=platform, status=software_status)
+        software_image_file = SoftwareImageFile.objects.create(
+            image_file_name="test.iso", software_version=software_version, status=software_status
+        )
+        device_type = DeviceType.objects.create(manufacturer=manufacturer, model="test123")
+        device_type.software_image_files.set([software_image_file])
+        with web_request_context(self.user):
+            with deferred_change_logging_for_bulk_operation():
+                device_type.software_image_files.set([])
+                device_type.save()
+
+        oc_list = get_changes_for_model(DeviceTypeToSoftwareImageFile)
+        self.assertEqual(len(oc_list), 1)
+        self.assertEqual(oc_list[0].action, ObjectChangeActionChoices.ACTION_DELETE)
+        self.assertIsNotNone(oc_list[0].changed_object_id)
+        self.assertEqual(oc_list[0].user, self.user)
+        self.assertEqual(oc_list[0].user_name, self.user.username)
+
     def test_change_log_context(self):
         location_type = LocationType.objects.get(name="Campus")
         location_status = Status.objects.get_for_model(Location).first()

nautobot/extras/tests/test_filters.py

@@ -30,6 +30,7 @@ from nautobot.extras.constants import HTTP_CONTENT_TYPE_JSON
 from nautobot.extras.filters import (
     ComputedFieldFilterSet,
     ConfigContextFilterSet,
+    ContactAssociationFilterSet,
     ContactFilterSet,
     ContentTypeFilterSet,
     CustomFieldChoiceFilterSet,
@@ -555,6 +556,74 @@ class ContactFilterSetTestCase(ContactAndTeamFilterSetTestCaseMixin, FilterTestC
     )
 
 
+class ContactAssociationFilterSetTestCase(FilterTestCases.FilterTestCase):
+    queryset = ContactAssociation.objects.all()
+    filterset = ContactAssociationFilterSet
+
+    generic_filter_tests = (
+        ["status", "status__id"],
+        ["status", "status__name"],
+        ["contact", "contact__id"],
+        ["contact", "contact__name"],
+        ["team", "team__id"],
+        ["team", "team__name"],
+        ["role", "role__id"],
+        ["role", "role__name"],
+    )
+
+    @classmethod
+    def setUpTestData(cls):
+        roles = Role.objects.get_for_model(ContactAssociation)
+        statuses = Status.objects.get_for_model(ContactAssociation)
+        ip_addresses = IPAddress.objects.all()
+        locations = Location.objects.all()
+
+        cls.location_ct = ContentType.objects.get_for_model(Location)
+        ipaddress_ct = ContentType.objects.get_for_model(IPAddress)
+
+        ContactAssociation.objects.create(
+            contact=Contact.objects.first(),
+            associated_object_type=ipaddress_ct,
+            associated_object_id=ip_addresses[0].pk,
+            role=roles[2],
+            status=statuses[1],
+        )
+        ContactAssociation.objects.create(
+            contact=Contact.objects.last(),
+            associated_object_type=ipaddress_ct,
+            associated_object_id=ip_addresses[1].pk,
+            role=roles[1],
+            status=statuses[2],
+        )
+        ContactAssociation.objects.create(
+            team=Team.objects.first(),
+            associated_object_type=cls.location_ct,
+            associated_object_id=locations[0].pk,
+            role=roles[3],
+            status=statuses[0],
+        )
+        ContactAssociation.objects.create(
+            team=Team.objects.last(),
+            associated_object_type=cls.location_ct,
+            associated_object_id=locations[1].pk,
+            role=roles[0],
+            status=statuses[1],
+        )
+
+    def test_associated_object_type(self):
+        params = {"associated_object_type": "dcim.location"}
+        self.assertEqual(
+            self.filterset(params, self.queryset).qs.count(),
+            ContactAssociation.objects.filter(associated_object_type=self.location_ct).count(),
+        )
+
+        params = {"associated_object_type": self.location_ct.pk}
+        self.assertEqual(
+            self.filterset(params, self.queryset).qs.count(),
+            ContactAssociation.objects.filter(associated_object_type=self.location_ct).count(),
+        )
+
+
 class CustomFieldChoiceFilterSetTestCase(FilterTestCases.FilterTestCase):
     queryset = CustomFieldChoice.objects.all()
     filterset = CustomFieldChoiceFilterSet

nautobot/extras/tests/test_forms.py

@@ -14,7 +14,6 @@ from nautobot.extras.forms import (
     ConfigContextFilterForm,
     ConfigContextForm,
     CustomFieldModelBulkEditFormMixin,
-    CustomFieldModelFilterFormMixin,
     CustomFieldModelFormMixin,
     JobButtonForm,
     JobEditForm,
@@ -1089,7 +1088,6 @@ class DeprecatedAliasesTestCase(TestCase):
             AddRemoveTagsForm,
             CustomFieldBulkCreateForm,
             CustomFieldBulkEditForm,
-            CustomFieldFilterForm,
             CustomFieldModelForm,
             RelationshipModelForm,
             StatusBulkEditFormMixin,
@@ -1100,7 +1098,6 @@ class DeprecatedAliasesTestCase(TestCase):
             (AddRemoveTagsForm, TagsBulkEditFormMixin),
             (CustomFieldBulkEditForm, CustomFieldModelBulkEditFormMixin),
             (CustomFieldBulkCreateForm, CustomFieldModelBulkEditFormMixin),
-            (CustomFieldFilterForm, CustomFieldModelFilterFormMixin),
             (CustomFieldModelForm, CustomFieldModelFormMixin),
             (RelationshipModelForm, RelationshipModelFormMixin),
             (StatusBulkEditFormMixin, StatusModelBulkEditFormMixin),