nautobot 2.4.6__py3-none-any.whl → 2.4.7__py3-none-any.whl

nautobot/dcim/tests/integration/test_module_bay_position.py

@@ -0,0 +1,125 @@
+from django.urls import reverse
+
+from nautobot.core.testing.integration import ObjectsListMixin, SeleniumTestCase
+from nautobot.dcim.models import DeviceType, Manufacturer, Module, ModuleBay, ModuleType
+from nautobot.extras.models import Status
+from nautobot.extras.tests.integration import create_test_device
+
+
+class ModuleBayPositionTestCase(SeleniumTestCase, ObjectsListMixin):
+    """
+    Test creating a module bay component in device and device type.
+    """
+
+    def _validate_position_field(self):
+        # Fill name pattern
+        name_pattern_field = self.browser.find_by_css("#id_name_pattern")
+        name_pattern_value = "name-0/0/[0-9]"
+        for _ in name_pattern_field.type(name_pattern_value, slowly=True):
+            pass
+
+        # Verify that position is filled
+        position_field = self.browser.find_by_css("#id_position_pattern")
+        self.assertEqual(position_field.value, name_pattern_value, "Position field value is not properly set")
+
+        # Change pattern manually and name to verify if it's not updating then
+        position_field.fill("")
+        for _ in position_field.type("new pattern", slowly=True):
+            pass
+
+        for _ in name_pattern_field.type("v2", slowly=True):
+            pass
+
+        self.assertEqual(position_field.value, "new pattern", "Position field value has unexpectedly changed")
+
+        # Regenerate position
+        self.browser.find_by_css('button[data-original-title="Regenerate position"]').click()
+        self.assertEqual(position_field.value, f"{name_pattern_value}v2", "Position field value is not re-populated")
+
+    def test_create_device_type_module_bay(self):
+        self.login_as_superuser()
+
+        manufacturer, _ = Manufacturer.objects.get_or_create(
+            name="Test Manufacturer",
+        )
+        device_type, _ = DeviceType.objects.get_or_create(manufacturer=manufacturer, model="Test Model Module Bay")
+
+        details_url = self.live_server_url + reverse("dcim:devicetype", kwargs={"pk": device_type.pk})
+        self.browser.visit(details_url)
+
+        # Navigate to module bay create page
+        self.browser.find_by_css("#device-type-add-components-button").click()
+        self.browser.find_by_xpath(
+            "//*[@id='device-type-add-components-button']/following-sibling::*//a[normalize-space()='Module Bays']"
+        ).click()
+
+        self._validate_position_field()
+
+    def test_create_device_module_bay(self):
+        self.login_as_superuser()
+
+        device = create_test_device("Test Device Module Bay Integration Test 1")
+        details_url = self.live_server_url + reverse("dcim:device", kwargs={"pk": device.pk})
+        self.browser.visit(details_url)
+
+        # Navigate to module bay create page
+        self.browser.find_by_css("#device-add-components-button").click()
+        self.browser.find_by_xpath(
+            "//*[@id='device-add-components-button']/following-sibling::*//a[normalize-space()='Module Bays']"
+        ).click()
+
+        self._validate_position_field()
+
+    def test_bulk_create_device_module_bay(self):
+        self.login_as_superuser()
+
+        device = create_test_device("Test Device Module Bay Integration Test 1", test_uuid="a15a58b0b")
+        self.browser.visit(self.live_server_url + reverse("dcim:device_list"))
+
+        self.apply_filter("location", "a15a58b0b")
+
+        self.select_one_item(pk=device.pk)
+        self.browser.find_by_css("#device-bulk-add-components-button").click()
+        self.browser.find_by_xpath(
+            "//*[@id='device-bulk-add-components-button']/following-sibling::*//a[normalize-space()='Module Bays']"
+        ).click()
+
+        self._validate_position_field()
+
+    def test_create_module_type_module_bay(self):
+        self.login_as_superuser()
+
+        manufacturer, _ = Manufacturer.objects.get_or_create(name="Test Manufacturer")
+        module_type = ModuleType.objects.create(model="Module_Type", manufacturer=manufacturer)
+
+        details_url = self.live_server_url + reverse("dcim:moduletype", kwargs={"pk": module_type.pk})
+        self.browser.visit(details_url)
+
+        self.browser.find_by_css("#module-type-add-components-button").click()
+        self.browser.find_by_xpath(
+            "//*[@id='module-type-add-components-button']/following-sibling::*//a[normalize-space()='Module Bays']"
+        ).click()
+
+        self._validate_position_field()
+
+    def test_bulk_create_module_module_bay(self):
+        self.login_as_superuser()
+
+        device = create_test_device("Test Device Module Bay Integration Test 2", test_uuid="60a7d5e")
+        module_type = ModuleType.objects.create(model="Module_Type", manufacturer=device.device_type.manufacturer)
+        device_module_bay = ModuleBay.objects.create(parent_device=device, name="Test Bay")
+        module = Module.objects.create(
+            module_type=module_type,
+            status=Status.objects.get_for_model(Module).first(),
+            parent_module_bay=device_module_bay,
+        )
+
+        self.browser.visit(self.live_server_url + reverse("dcim:module_list"))
+        self.select_one_item(pk=module.pk)
+
+        self.browser.find_by_css("#module-bulk-add-components-button").click()
+        self.browser.find_by_xpath(
+            "//*[@id='module-bulk-add-components-button']/following-sibling::*//a[normalize-space()='Module Bays']"
+        ).click()
+
+        self._validate_position_field()

nautobot/dcim/tests/test_models.py

@@ -1338,6 +1338,19 @@ class LocationTestCase(ModelTestCases.BaseModelTestCase):
             str(cm.exception),
         )
 
+    def test_default_treemodel_display(self):
+        location_1 = Location(name="Building 1", location_type=self.root_type, status=self.status)
+        location_1.validated_save()
+        location_2 = Location(name="Room 1", location_type=self.leaf_type, parent=location_1, status=self.status)
+        self.assertEqual(location_2.display, "Building 1 → Room 1")
+
+    @override_settings(LOCATION_NAME_AS_NATURAL_KEY=True)
+    def test_location_name_as_natural_key_display(self):
+        location_1 = Location(name="Building 1", location_type=self.root_type, status=self.status)
+        location_1.validated_save()
+        location_2 = Location(name="Room 1", location_type=self.leaf_type, parent=location_1, status=self.status)
+        self.assertEqual(location_2.display, "Room 1")
+
 
 class PlatformTestCase(TestCase):
     def setUp(self):

nautobot/dcim/tests/test_views.py

@@ -760,7 +760,7 @@ class DeviceFamilyTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         DeviceFamily.objects.create(name="Deletable Device Family 3")
 
 
-class ManufacturerTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
+class ManufacturerTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases.BulkEditObjectsViewTestCase):
     model = Manufacturer
 
     @classmethod
@@ -769,6 +769,9 @@ class ManufacturerTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
             "name": "Manufacturer X",
             "description": "A new manufacturer",
         }
+        cls.bulk_edit_data = {
+            "description": "Updated manufacturer description",
+        }
 
     def get_deletable_object(self):
         mf = Manufacturer.objects.create(name="Deletable Manufacturer")

nautobot/dcim/urls.py

@@ -17,7 +17,6 @@ from .models import (
     Interface,
     InventoryItem,
     Location,
-    Manufacturer,
     Platform,
     PowerFeed,
     PowerOutlet,
@@ -40,6 +39,7 @@ router.register("device-redundancy-groups", views.DeviceRedundancyGroupUIViewSet
 router.register("interface-redundancy-groups", views.InterfaceRedundancyGroupUIViewSet)
 router.register("interface-redundancy-groups-associations", views.InterfaceRedundancyGroupAssociationUIViewSet)
 router.register("location-types", views.LocationTypeUIViewSet)
+router.register("manufacturers", views.ManufacturerUIViewSet)
 router.register("module-bays", views.ModuleBayUIViewSet)
 router.register("module-bay-templates", views.ModuleBayTemplateUIViewSet)
 router.register("modules", views.ModuleUIViewSet)
@@ -208,50 +208,6 @@ urlpatterns = [
         name="rack_add_image",
         kwargs={"model": Rack},
     ),
-    # Manufacturers
-    path("manufacturers/", views.ManufacturerListView.as_view(), name="manufacturer_list"),
-    path(
-        "manufacturers/add/",
-        views.ManufacturerEditView.as_view(),
-        name="manufacturer_add",
-    ),
-    path(
-        "manufacturers/import/",
-        views.ManufacturerBulkImportView.as_view(),  # 3.0 TODO: remove, unused
-        name="manufacturer_import",
-    ),
-    path(
-        "manufacturers/delete/",
-        views.ManufacturerBulkDeleteView.as_view(),
-        name="manufacturer_bulk_delete",
-    ),
-    path(
-        "manufacturers/<uuid:pk>/",
-        views.ManufacturerView.as_view(),
-        name="manufacturer",
-    ),
-    path(
-        "manufacturers/<uuid:pk>/edit/",
-        views.ManufacturerEditView.as_view(),
-        name="manufacturer_edit",
-    ),
-    path(
-        "manufacturers/<uuid:pk>/delete/",
-        views.ManufacturerDeleteView.as_view(),
-        name="manufacturer_delete",
-    ),
-    path(
-        "manufacturers/<uuid:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="manufacturer_changelog",
-        kwargs={"model": Manufacturer},
-    ),
-    path(
-        "manufacturers/<uuid:pk>/notes/",
-        ObjectNotesView.as_view(),
-        name="manufacturer_notes",
-        kwargs={"model": Manufacturer},
-    ),
     # Device types
     path("device-types/", views.DeviceTypeListView.as_view(), name="devicetype_list"),
     path("device-types/add/", views.DeviceTypeEditView.as_view(), name="devicetype_add"),

nautobot/dcim/views.py

@@ -28,7 +28,6 @@ from rest_framework.exceptions import MethodNotAllowed
 from rest_framework.response import Response
 
 from nautobot.circuits.models import Circuit
-from nautobot.cloud.models import CloudAccount
 from nautobot.cloud.tables import CloudAccountTable
 from nautobot.core.choices import ButtonColorChoices
 from nautobot.core.exceptions import AbortTransaction
@@ -304,7 +303,7 @@ class LocationView(generic.ObjectView):
             .select_related("parent", "location_type")
         )
 
-        children_table = tables.LocationTable(children)
+        children_table = tables.LocationTable(children, hide_hierarchy_ui=True)
 
         paginate = {
             "paginator_class": EnhancedPaginator,
@@ -724,71 +723,40 @@ class RackReservationBulkDeleteView(generic.BulkDeleteView):
 #
 
 
-class ManufacturerListView(generic.ObjectListView):
+class ManufacturerUIViewSet(NautobotUIViewSet):
+    bulk_update_form_class = forms.ManufacturerBulkEditForm
+    filterset_class = filters.ManufacturerFilterSet
+    filterset_form_class = forms.ManufacturerFilterForm
+    form_class = forms.ManufacturerForm
+    serializer_class = serializers.ManufacturerSerializer
+    table_class = tables.ManufacturerTable
     queryset = Manufacturer.objects.all()
-    filterset = filters.ManufacturerFilterSet
-    filterset_form = forms.ManufacturerFilterForm
-    table = tables.ManufacturerTable
 
-
-class ManufacturerView(generic.ObjectView):
-    queryset = Manufacturer.objects.all()
-
-    def get_extra_context(self, request, instance):
-        # Devices
-        devices = (
-            Device.objects.restrict(request.user, "view")
-            .filter(device_type__manufacturer=instance)
-            .select_related("status", "location", "tenant", "role", "rack", "device_type")
-        )
-
-        device_table = tables.DeviceTable(devices)
-
-        paginate = {
-            "paginator_class": EnhancedPaginator,
-            "per_page": get_paginate_count(request),
-        }
-        RequestConfig(request, paginate).configure(device_table)
-
-        # Cloud Accounts
-        cloud_accounts = (
-            CloudAccount.objects.restrict(request.user, "view")
-            .filter(provider=instance)
-            .select_related("secrets_group")
-        )
-
-        cloud_account_table = CloudAccountTable(cloud_accounts)
-        paginate = {
-            "paginator_class": EnhancedPaginator,
-            "per_page": get_paginate_count(request),
-        }
-        RequestConfig(request, paginate).configure(cloud_account_table)
-
-        return {
-            "device_table": device_table,
-            "cloud_account_table": cloud_account_table,
-            **super().get_extra_context(request, instance),
-        }
-
-
-class ManufacturerEditView(generic.ObjectEditView):
-    queryset = Manufacturer.objects.all()
-    model_form = forms.ManufacturerForm
-
-
-class ManufacturerDeleteView(generic.ObjectDeleteView):
-    queryset = Manufacturer.objects.all()
-
-
-class ManufacturerBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
-    queryset = Manufacturer.objects.all()
-    table = tables.ManufacturerTable
-
-
-class ManufacturerBulkDeleteView(generic.BulkDeleteView):
-    queryset = Manufacturer.objects.all()
-    table = tables.ManufacturerTable
-    filterset = filters.ManufacturerFilterSet
+    # Object detail content with devices and cloud accounts related to the manufacturer
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=(
+            object_detail.ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields="__all__",
+            ),
+            object_detail.ObjectsTablePanel(
+                weight=100,
+                section=SectionChoices.FULL_WIDTH,
+                table_class=tables.DeviceTable,
+                table_filter="device_type__manufacturer",
+                related_field_name="manufacturer",
+                exclude_columns=["manufacturer"],
+            ),
+            object_detail.ObjectsTablePanel(
+                weight=100,
+                section=SectionChoices.FULL_WIDTH,
+                table_class=CloudAccountTable,
+                table_filter="provider",
+                exclude_columns=["provider"],
+            ),
+        ),
+    )
 
 
 #
@@ -1769,6 +1737,7 @@ class DeviceView(generic.ObjectView):
                 weight=100,
                 color=ButtonColorChoices.BLUE,
                 label="Add Components",
+                attributes={"id": "device-add-components-button"},
                 icon="mdi-plus-thick",
                 required_permissions=["dcim.change_device"],
                 children=(
@@ -3436,7 +3405,7 @@ class ModuleBayUIViewSet(ModuleBayCommonViewSetMixin, NautobotUIViewSet):
     model_form_class = forms.ModuleBayForm
     serializer_class = serializers.ModuleBaySerializer
     table_class = tables.ModuleBayTable
-    create_template_name = "dcim/modulebay_create.html"
+    create_template_name = "dcim/device_component_add.html"
 
     def get_extra_context(self, request, instance):
         if instance:

nautobot/extras/choices.py

@@ -488,6 +488,8 @@ class SecretsGroupSecretTypeChoices(ChoiceSet):
     TYPE_SECRET = "secret"  # noqa: S105  # hardcoded-password-string -- false positive
     TYPE_TOKEN = "token"  # noqa: S105  # hardcoded-password-string -- false positive
     TYPE_USERNAME = "username"
+    TYPE_URL = "url"
+    TYPE_NOTES = "notes"
 
     CHOICES = (
         (TYPE_KEY, "Key"),
@@ -495,6 +497,8 @@ class SecretsGroupSecretTypeChoices(ChoiceSet):
         (TYPE_SECRET, "Secret"),
         (TYPE_TOKEN, "Token"),
         (TYPE_USERNAME, "Username"),
+        (TYPE_URL, "URL"),
+        (TYPE_NOTES, "Notes"),
     )
 
 

nautobot/extras/filters/__init__.py

@@ -526,6 +526,12 @@ class ContactTeamFilterSet(NameSearchFilterSet, NautobotFilterSet):
 
 
 class ContactFilterSet(ContactTeamFilterSet):
+    teams = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Team.objects.all(),
+        to_field_name="name",
+        label="Team (name or ID)",
+    )
+
     class Meta:
         model = Contact
         fields = "__all__"

nautobot/extras/forms/forms.py

@@ -142,6 +142,7 @@ __all__ = (
     "DynamicGroupFilterForm",
     "DynamicGroupForm",
     "DynamicGroupMembershipFormSet",
+    "ExportTemplateBulkEditForm",
     "ExportTemplateFilterForm",
     "ExportTemplateForm",
     "ExternalIntegrationBulkEditForm",
@@ -180,6 +181,7 @@ __all__ = (
     "ObjectMetadataFilterForm",
     "PasswordInputWithPlaceholder",
     "RelationshipAssociationFilterForm",
+    "RelationshipBulkEditForm",
     "RelationshipFilterForm",
     "RelationshipForm",
     "RoleBulkEditForm",
@@ -519,10 +521,11 @@ class CustomFieldBulkDeleteForm(ConfirmationForm):
         else:
             context = change_context.as_dict(queryset)
             context["context_detail"] = "bulk delete custom field data"
-        tasks = [
-            delete_custom_field_data.si(obj.key, set(obj.content_types.values_list("pk", flat=True)), context)
-            for obj in queryset
-        ]
+        tasks = []
+        for obj in queryset:
+            pk_set = set(obj.content_types.values_list("pk", flat=True))
+            if pk_set:
+                tasks.append(delete_custom_field_data.si(obj.key, pk_set, context))
         return tasks
 
     def perform_pre_delete(self, queryset):
@@ -533,10 +536,11 @@ class CustomFieldBulkDeleteForm(ConfirmationForm):
             logger.error("Celery worker process not running. Object custom fields may fail to reflect this deletion.")
             return
         tasks = self.construct_custom_field_delete_tasks(queryset)
-        # Executing the tasks in the background sequentially using chain() aligns with how a single
-        # CustomField object is deleted.  We decided to not check the result because it needs at least one worker
-        # to be active and comes with extra performance penalty.
-        chain(*tasks).apply_async()
+        if tasks:
+            # Executing the tasks in the background sequentially using chain() aligns with how a single
+            # CustomField object is deleted.  We decided to not check the result because it needs at least one worker
+            # to be active and comes with extra performance penalty.
+            chain(*tasks).apply_async()
 
 
 #
@@ -749,6 +753,31 @@ class StaticGroupAssociationFilterForm(NautobotFilterForm):
 #
 # Export Templates
 #
+class ExportTemplateBulkEditForm(NautobotBulkEditForm):
+    pk = forms.ModelMultipleChoiceField(queryset=ExportTemplate.objects.all(), widget=forms.MultipleHiddenInput())
+
+    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    mime_type = forms.CharField(
+        max_length=CHARFIELD_MAX_LENGTH,
+        required=False,
+        label="MIME type",
+        help_text="Defaults to <code>text/plain</code>",
+    )
+    file_extension = forms.CharField(
+        max_length=CHARFIELD_MAX_LENGTH, required=False, help_text="Extension to append to the rendered filename"
+    )
+
+    content_type = forms.ModelChoiceField(
+        queryset=ContentType.objects.filter(FeatureQuery("export_templates").get_query()).order_by(
+            "app_label", "model"
+        ),
+        required=False,
+        label="Content Type",
+    )
+
+    class Meta:
+        model = ExportTemplate
+        nullable_fields = ["description", "mime_type", "file_extension"]
 
 
 class ExportTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1774,6 +1803,45 @@ class ObjectChangeFilterForm(BootstrapMixin, forms.Form):
 #
 
 
+class RelationshipBulkEditForm(BootstrapMixin, CustomFieldModelBulkEditFormMixin, NoteModelBulkEditFormMixin):
+    pk = forms.ModelMultipleChoiceField(queryset=Relationship.objects.all(), widget=forms.MultipleHiddenInput())
+    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    type = forms.ChoiceField(
+        required=False,
+        label="type",
+        choices=add_blank_choice(RelationshipTypeChoices),
+    )
+    source_hidden = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect)
+    destination_hidden = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect)
+    source_filter = forms.JSONField(required=False, widget=forms.Textarea, help_text="Filter for the source")
+    destination_filter = forms.JSONField(required=False, widget=forms.Textarea, help_text="Filter for the destination")
+    source_type = CSVContentTypeField(
+        queryset=ContentType.objects.filter(FeatureQuery("relationships").get_query()), required=False
+    )
+    destination_type = CSVContentTypeField(
+        queryset=ContentType.objects.filter(FeatureQuery("relationships").get_query()), required=False
+    )
+    source_label = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    destination_label = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    advanced_ui = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect)
+
+    class Meta:
+        model = Relationship
+        fields = [
+            "description",
+            "type",
+            "source_hidden",
+            "destination_hidden",
+            "source_filter",
+            "destination_filter",
+            "source_type",
+            "destination_type",
+            "source_label",
+            "destination_label",
+            "advanced_ui",
+        ]
+
+
 class RelationshipForm(BootstrapMixin, forms.ModelForm):
     key = SlugField(
         help_text="Internal name of this relationship. Please use underscores rather than dashes.",

nautobot/extras/models/customfields.py

@@ -822,16 +822,17 @@ class CustomField(
 
         super().delete(*args, **kwargs)
 
-        # Circular Import
-        from nautobot.extras.signals import change_context_state
+        if content_types:
+            # Circular Import
+            from nautobot.extras.signals import change_context_state
 
-        change_context = change_context_state.get()
-        if change_context is None:
-            context = None
-        else:
-            context = change_context.as_dict(instance=self)
-            context["context_detail"] = "delete custom field data"
-        delete_custom_field_data.delay(self.key, content_types, context)
+            change_context = change_context_state.get()
+            if change_context is None:
+                context = None
+            else:
+                context = change_context.as_dict(instance=self)
+                context["context_detail"] = "delete custom field data"
+            delete_custom_field_data.delay(self.key, content_types, context)
 
     def add_prefix_to_cf_key(self):
         return "cf_" + str(self.key)

nautobot/extras/signals.py

@@ -125,6 +125,17 @@ def invalidate_relationship_models_cache(sender, **kwargs):
             cache.delete_pattern(f"{method.cache_key_prefix}.*")
 
 
+@receiver(post_save, sender=CustomField)
+@receiver(post_delete, sender=CustomField)
+@receiver(post_save, sender=Relationship)
+@receiver(m2m_changed, sender=Relationship)
+@receiver(post_delete, sender=Relationship)
+def invalidate_openapi_schema_cache(sender, **kwargs):
+    """Invalidate the openapi schema cache."""
+    with contextlib.suppress(redis.exceptions.ConnectionError):
+        cache.delete_pattern("openapi_schema_cache_*")
+
+
 @receiver(post_save)
 @receiver(m2m_changed)
 def _handle_changed_object(sender, instance, raw=False, **kwargs):
@@ -327,7 +338,9 @@ def post_migrate_clear_content_type_caches(sender, app_config, signal, **kwargs)
 
 def handle_cf_removed_obj_types(instance, action, pk_set, **kwargs):
     """
-    Handle the cleanup of old custom field data when a CustomField is removed from one or more ContentTypes.
+    Handle provisioning/deprovisioning of custom_field_data when there are changes to CustomField.content_types.
+
+    The name of this function is misleading as this signal applies to *added* content-types as well.
     """
 
     change_context = change_context_state.get()
@@ -335,13 +348,39 @@ def handle_cf_removed_obj_types(instance, action, pk_set, **kwargs):
         context = None
     else:
         context = change_context.as_dict(instance=instance)
-    if action == "post_remove":
-        # Existing content types have been removed from the custom field, delete their data
+
+    if action == "pre_remove":
+        # Existing content types may be removed from the custom field, delete their data if so.
+        # CAUTION: pk_set in this _remove case is the content-types that were *requested* to remove,
+        # **not** the content-types that actually *will need to be* removed. In other words, this is not idempotent:
+        # my_cf.content_types.remove(device_ct) --> pk_set = {device_ct.pk}
+        # my_cf.content_types.remove(device_ct) --> pk_set = {device_ct.pk} again even though it was already gone
+        # So we need to check which content types will actually be removed to not create unnecessary tasks:
+        removed_pk_set = pk_set.intersection(instance.content_types.values_list("pk", flat=True))
+        if not removed_pk_set:
+            return
+
+        if context:
+            context["context_detail"] = "delete custom field data from existing content types"
+        transaction.on_commit(lambda: delete_custom_field_data.delay(instance.key, removed_pk_set, context))
+
+    elif action == "pre_clear":
+        # In this case, the provided pk_set is always empty, so we need to look at the current values instead:
+        cleared_pk_set = set(instance.content_types.values_list("pk", flat=True))
+        if not cleared_pk_set:
+            return
+
         if context:
             context["context_detail"] = "delete custom field data from existing content types"
-        transaction.on_commit(lambda: delete_custom_field_data.delay(instance.key, pk_set, context))
+        transaction.on_commit(lambda: delete_custom_field_data.delay(instance.key, cleared_pk_set, context))
 
     elif action == "post_add":
+        # Unlike the above _remove case, in the _add case pk_set is the *new* content-types only,
+        # and for whatever reason, Django triggers this signal even if there was no actual change.
+        # To avoid creating unnecessary background tasks, we need to check for this case ourselves:
+        if not pk_set:
+            return
+
         # New content types have been added to the custom field, provision them
         if context:
             context["context_detail"] = "provision custom field data for new content types"

nautobot/extras/tasks.py

@@ -121,12 +121,13 @@ def delete_custom_field_data(field_key, content_type_pk_set, change_context=None
     for ct in ContentType.objects.filter(pk__in=content_type_pk_set):
         model = ct.model_class()
         queryset = model.objects.filter(**{f"_custom_field_data__{field_key}__isnull": False})
+        pk_list = []
         if change_context is not None:
             pk_list = list(queryset.values_list("pk", flat=True))
         task_logger.info("Deleting existing values for custom field `%s` from %s records...", field_key, ct.model)
         count = queryset.update(_custom_field_data=JSONRemove("_custom_field_data", field_key))
         task_logger.info("Updated %d records", count)
-        if change_context is not None:
+        if count and change_context is not None:
             # Since we used update() above, we bypassed ObjectChange automatic creation via signals. Create them now
             _generate_bulk_object_changes(change_context, model.objects.filter(pk__in=pk_list), task_logger)
 
@@ -155,6 +156,7 @@ def provision_field(field_id, content_type_pk_set, change_context=None):
     for ct in ContentType.objects.filter(pk__in=content_type_pk_set):
         model = ct.model_class()
         queryset = model.objects.filter(**{f"_custom_field_data__{field.key}__isnull": True})
+        pk_list = []
         if change_context is not None:
             pk_list = list(queryset.values_list("pk", flat=True))
         task_logger.info(
@@ -165,7 +167,7 @@ def provision_field(field_id, content_type_pk_set, change_context=None):
         )
         count = queryset.update(_custom_field_data=JSONSet("_custom_field_data", field.key, field.default))
         task_logger.info("Updated %d records.", count)
-        if change_context is not None:
+        if count and change_context is not None:
             # Since we used update() above, we bypassed ObjectChange automatic creation via signals. Create them now
             _generate_bulk_object_changes(change_context, model.objects.filter(pk__in=pk_list), task_logger)