nautobot 2.3.0__py3-none-any.whl → 2.3.0b1__py3-none-any.whl

nautobot/extras/factory.py

@@ -251,24 +251,6 @@ class MetadataTypeFactory(PrimaryModelFactory):
                 )
 
 
-def _available_field_names(metadata_type, assigned_object):
-    field_names = [field.name for field in assigned_object._meta.get_fields()]
-    # Avoid collisions, see ObjectMetadata.clean()
-    existing_metadata_scoped_fields = ObjectMetadata.objects.filter(
-        metadata_type=metadata_type,
-        assigned_object_type=ContentType.objects.get_for_model(assigned_object),
-        assigned_object_id=assigned_object.pk,
-    ).values_list("scoped_fields", flat=True)
-    for existing_scoped_fields in existing_metadata_scoped_fields:
-        if existing_scoped_fields:
-            field_names = sorted(set(field_names).difference(existing_scoped_fields))
-        else:
-            field_names = []
-            break
-
-    return field_names
-
-
 class ObjectMetadataFactory(BaseModelFactory):
     """ObjectMetadata model factory"""
 
@@ -281,6 +263,7 @@ class ObjectMetadataFactory(BaseModelFactory):
         MetadataType.objects.all(),
         allow_null=False,
     )
+    scoped_fields = factory.Faker("pylist", allowed_types=[str])
 
     @factory.lazy_attribute
     def contact(self):
@@ -325,43 +308,22 @@ class ObjectMetadataFactory(BaseModelFactory):
             raise RuntimeError(f"Unsupported metadatatype datatype {metadata_type_data_type}")
 
     @factory.lazy_attribute
-    def assigned_object(self):
-        allowed_content_types = list(self.metadata_type.content_types.all())
-        for content_type in factory.random.randgen.sample(allowed_content_types, len(allowed_content_types)):
+    def assigned_object_type(self):
+        while True:
+            allowed_content_types = list(self.metadata_type.content_types.values_list("pk", flat=True))
+            content_type = factory.random.randgen.choice(
+                ContentType.objects.filter(FeatureQuery("metadata").get_query(), pk__in=allowed_content_types)
+            )
             # It does not have a get_absolute_url attribute and is causing failure in API unittests
             if content_type.app_label == "extras" and content_type.model == "taggeditem":
                 continue
-
-            assigned_model = content_type.model_class()
-            queryset = assigned_model.objects.all()
-
-            if not queryset.exists():
-                continue
-
-            for _ in range(10):
-                assigned_object = factory.random.randgen.choice(queryset)
-                if _available_field_names(self.metadata_type, assigned_object):
-                    return assigned_object
-
-        raise RuntimeError(f"Couldn't find any suitable instances not already covered by {self.metadata_type}")
+            if content_type.model_class().objects.exists():
+                return content_type
 
     @factory.lazy_attribute
-    def scoped_fields(self):
-        all_field_names = [field.name for field in self.assigned_object._meta.get_fields()]
-        field_names = _available_field_names(self.metadata_type, self.assigned_object)
-        if not field_names:
-            raise RuntimeError(
-                f"All existing scoped_fields for {self.metadata_type} are covered by existing ObjectMetadata for {self.assigned_object}"
-            )
-
-        if len(field_names) < len(all_field_names):
-            minimum_fields = 1  # don't allow an empty list since that would cover all fields
-        else:
-            minimum_fields = 0
-
-        return factory.random.randgen.sample(
-            field_names, k=factory.random.randgen.randint(minimum_fields, len(field_names))
-        )
+    def assigned_object_id(self):
+        queryset = self.assigned_object_type.model_class().objects.all()
+        return factory.random.randgen.choice(queryset).pk
 
 
 class ObjectChangeFactory(BaseModelFactory):

nautobot/extras/forms/base.py

@@ -26,12 +26,11 @@ __all__ = (
 
 
 class NautobotModelForm(
-    BootstrapMixin,
-    # The below must be listed *after* BootstrapMixin so that BootstrapMixin applies to their dynamic form fields
     CustomFieldModelFormMixin,
     DynamicGroupModelFormMixin,
     NoteModelFormMixin,
     RelationshipModelFormMixin,
+    BootstrapMixin,
 ):
     """
     This class exists to combine common functionality and is used to inherit from throughout the
@@ -41,10 +40,9 @@ class NautobotModelForm(
 
 
 class NautobotFilterForm(
-    BootstrapMixin,
-    # The below must be listed *after* BootstrapMixin so that BootstrapMixin applies to their dynamic form fields
     ContactTeamModelFilterFormMixin,
-    CustomFieldModelFilterFormMixin,
+    BootstrapMixin,
+    CustomFieldModelFilterFormMixin,  # currently must come *after* BootstrapMixin to get proper CSS classes applied
     RelationshipModelFilterFormMixin,
 ):
     """
@@ -55,10 +53,6 @@ class NautobotFilterForm(
 
 
 class NautobotBulkEditForm(
-    BootstrapMixin,
-    # The below must be listed *after* BootstrapMixin so that BootstrapMixin applies to their dynamic form fields
-    CustomFieldModelBulkEditFormMixin,
-    NoteModelBulkEditFormMixin,
-    RelationshipModelBulkEditFormMixin,
+    BootstrapMixin, CustomFieldModelBulkEditFormMixin, RelationshipModelBulkEditFormMixin, NoteModelBulkEditFormMixin
 ):
     """Base class for bulk-edit forms for models that support relationships, custom fields and notes."""

nautobot/extras/homepage.py

@@ -7,24 +7,14 @@ def get_job_results(request):
     """Callback function to collect job history for panel."""
     return (
         JobResult.objects.filter(status__in=JobResultStatusChoices.READY_STATES)
-        .restrict(request.user, "view")
-        .only("id", "name", "status", "date_done", "user")
+        .defer("result")
         .order_by("-date_done")[:10]
     )
 
 
 def get_changelog(request):
     """Callback function to collect changelog for panel."""
-    return ObjectChange.objects.restrict(request.user, "view").only(
-        "id",
-        "action",
-        "changed_object",
-        "changed_object_id",
-        "changed_object_type",
-        "object_repr",
-        "user_name",
-        "time",
-    )[:15]
+    return ObjectChange.objects.restrict(request.user, "view")[:15]
 
 
 layout = (

nautobot/extras/jobs.py

@@ -20,7 +20,7 @@ from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files.base import ContentFile
-from django.core.files.uploadedfile import UploadedFile
+from django.core.files.uploadedfile import InMemoryUploadedFile
 from django.core.validators import RegexValidator
 from django.db.models import Model
 from django.db.models.query import QuerySet
@@ -539,7 +539,7 @@ class BaseJob:
             elif isinstance(value, Model):
                 return_data[field_name] = value.pk
             # FileVar (Save each FileVar as a FileProxy)
-            elif isinstance(value, UploadedFile):
+            elif isinstance(value, InMemoryUploadedFile):
                 return_data[field_name] = BaseJob._save_file_to_proxy(value)
             # IPAddressVar, IPAddressWithMaskVar, IPNetworkVar
             elif isinstance(value, netaddr.ip.BaseIP):

nautobot/extras/migrations/0111_metadata.py

@@ -72,7 +72,7 @@ class Migration(migrations.Migration):
                 ("last_updated", models.DateTimeField(auto_now=True, null=True)),
                 (
                     "scoped_fields",
-                    nautobot.core.models.fields.JSONArrayField(base_field=models.CharField(max_length=255), blank=True),
+                    nautobot.core.models.fields.JSONArrayField(base_field=models.CharField(max_length=255)),
                 ),
                 ("_value", models.JSONField(blank=True, null=True)),
                 ("assigned_object_id", models.UUIDField(db_index=True)),
@@ -91,7 +91,7 @@ class Migration(migrations.Migration):
                         blank=True,
                         null=True,
                         on_delete=django.db.models.deletion.PROTECT,
-                        related_name="object_metadata",
+                        related_name="object_metadatas",
                         to="extras.contact",
                     ),
                 ),
@@ -99,7 +99,7 @@ class Migration(migrations.Migration):
                     "metadata_type",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.PROTECT,
-                        related_name="object_metadata",
+                        related_name="object_metadatas",
                         to="extras.metadatatype",
                     ),
                 ),
@@ -109,7 +109,7 @@ class Migration(migrations.Migration):
                         blank=True,
                         null=True,
                         on_delete=django.db.models.deletion.PROTECT,
-                        related_name="object_metadata",
+                        related_name="object_metadatas",
                         to="extras.team",
                     ),
                 ),

nautobot/extras/models/jobs.py

@@ -456,8 +456,6 @@ class JobLogEntry(BaseModel):
     log_object = models.CharField(max_length=JOB_LOG_MAX_LOG_OBJECT_LENGTH, blank=True, default="")
     absolute_url = models.CharField(max_length=JOB_LOG_MAX_ABSOLUTE_URL_LENGTH, blank=True, default="")
 
-    is_metadata_associable_model = False
-
     documentation_static_path = "docs/user-guide/platform-functionality/jobs/models.html"
 
     def __str__(self):
@@ -1077,87 +1075,6 @@ class ScheduledJob(BaseModel):
             day_of_week=day_of_week,
         )
 
-    @classmethod
-    def create_schedule(
-        cls,
-        job_model,
-        user,
-        name=None,
-        start_time=None,
-        interval=JobExecutionType.TYPE_IMMEDIATELY,
-        crontab="",
-        profile=False,
-        approval_required=False,
-        task_queue=None,
-        **job_kwargs,
-    ):
-        """
-        Schedule a job with the specified parameters.
-
-        This method creates a schedule for a job to be executed at a specific time
-        or interval. It handles immediate execution, custom start times, and
-        crontab-based scheduling.
-
-        Parameters:
-            job_model (JobModel): The job model instance.
-            user (User): The user who is scheduling the job.
-            name (str, optional): The name of the scheduled job. Defaults to None.
-            start_time (datetime, optional): The start time for the job. Defaults to None.
-            interval (JobExecutionType, optional): The interval type for the job execution.
-                Defaults to JobExecutionType.TYPE_IMMEDIATELY.
-            crontab (str, optional): The crontab string for the schedule. Defaults to "".
-            profile (bool, optional): Flag indicating whether to profile the job. Defaults to False.
-            approval_required (bool, optional): Flag indicating if approval is required. Defaults to False.
-            task_queue (str, optional): The task queue for the job. Defaults to None, which will use the configured default celery queue.
-            **job_kwargs: Additional keyword arguments to pass to the job.
-
-        Returns:
-            ScheduledJob instance
-        """
-
-        if interval == JobExecutionType.TYPE_IMMEDIATELY:
-            start_time = timezone.now()
-            name = name or f"{job_model.name} - {start_time}"
-        elif interval == JobExecutionType.TYPE_CUSTOM:
-            if start_time is None:
-                # "start_time" is checked against models.ScheduledJob.earliest_possible_time()
-                # which returns timezone.now() + timedelta(seconds=15)
-                start_time = timezone.now() + timedelta(seconds=20)
-
-        celery_kwargs = {
-            "nautobot_job_profile": profile,
-            "queue": task_queue,
-        }
-        if job_model.soft_time_limit > 0:
-            celery_kwargs["soft_time_limit"] = job_model.soft_time_limit
-        if job_model.time_limit > 0:
-            celery_kwargs["time_limit"] = job_model.time_limit
-
-        # 2.0 TODO: To revisit this as part of a larger Jobs cleanup in 2.0.
-        #
-        # We pass in task and job_model here partly for forward/backward compatibility logic, and
-        # part fallback safety. It's mildly useful to store both the task module/class name and the JobModel
-        # FK on the ScheduledJob, as in the case where the JobModel gets deleted (and the FK becomes
-        # null) you still have a bit of context on the ScheduledJob as to what it was originally
-        # scheduled for.
-        scheduled_job = cls(
-            name=name,
-            task=job_model.class_path,
-            job_model=job_model,
-            start_time=start_time,
-            description=f"Nautobot job {name} scheduled by {user} for {start_time}",
-            kwargs=job_kwargs,
-            celery_kwargs=celery_kwargs,
-            interval=interval,
-            one_off=(interval == JobExecutionType.TYPE_FUTURE),
-            user=user,
-            approval_required=approval_required,
-            crontab=crontab,
-            queue=task_queue,
-        )
-        scheduled_job.validated_save()
-        return scheduled_job
-
     def to_cron(self):
         t = self.start_time
         if self.interval == JobExecutionType.TYPE_HOURLY:

nautobot/extras/models/metadata.py

@@ -61,7 +61,7 @@ class MetadataType(PrimaryModel):
 
     objects = MetadataTypeManager()
     clone_fields = ["data_type"]
-    documentation_static_path = "docs/user-guide/platform-functionality/objectmetadata.html"
+    documentation_static_path = "docs/user-guide/platform-functionality/metadata.html"
 
     class Meta:
         ordering = ["name"]
@@ -106,7 +106,7 @@ class MetadataChoice(ChangeLoggedModel, BaseModel):
     weight = models.PositiveSmallIntegerField(default=100, help_text="Higher weights appear later in the list")
     is_metadata_associable_model = False
 
-    documentation_static_path = "docs/user-guide/platform-functionality/objectmetadata.html"
+    documentation_static_path = "docs/user-guide/platform-functionality/metadata.html"
 
     class Meta:
         ordering = ["metadata_type", "weight", "value"]
@@ -166,19 +166,19 @@ class ObjectMetadata(ChangeLoggedModel, BaseModel):
     metadata_type = models.ForeignKey(
         to=MetadataType,
         on_delete=models.PROTECT,
-        related_name="object_metadata",
+        related_name="object_metadatas",
     )
     contact = models.ForeignKey(
         to=Contact,
         on_delete=models.PROTECT,
-        related_name="object_metadata",
+        related_name="object_metadatas",
         blank=True,
         null=True,
     )
     team = models.ForeignKey(
         to=Team,
         on_delete=models.PROTECT,
-        related_name="object_metadata",
+        related_name="object_metadatas",
         blank=True,
         null=True,
     )
@@ -186,7 +186,6 @@ class ObjectMetadata(ChangeLoggedModel, BaseModel):
         base_field=models.CharField(
             max_length=CHARFIELD_MAX_LENGTH,
         ),
-        blank=True,
         help_text="List of scoped fields, only direct fields on the model",
     )
     _value = models.JSONField(
@@ -200,7 +199,7 @@ class ObjectMetadata(ChangeLoggedModel, BaseModel):
 
     objects = ObjectMetadataManager()
     natural_key_field_names = ["pk"]
-    documentation_static_path = "docs/user-guide/platform-functionality/objectmetadata.html"
+    documentation_static_path = "docs/user-guide/platform-functionality/metadata.html"
 
     class Meta:
         ordering = ["metadata_type"]
@@ -362,17 +361,12 @@ class ObjectMetadata(ChangeLoggedModel, BaseModel):
                         raise ValidationError("Date values must be in the format YYYY-MM-DD.")
             # Validate datetime
             elif metadata_type_data_type == MetadataTypeDataTypeChoices.TYPE_DATETIME:
-                if isinstance(value, datetime):
-                    # check if datetime object has tzinfo
-                    if value.tzinfo is None:
-                        value = value.replace(tzinfo=timezone.utc)  # pylint: disable=unexpected-keyword-arg,no-value-for-parameter
-                    value = value.replace(microsecond=0).isoformat()  # pylint: disable=unexpected-keyword-arg,no-value-for-parameter
-                else:
-                    acceptable_datetime_formats = [
-                        "YYYY-MM-DDTHH:MM:SS",
-                        "YYYY-MM-DDTHH:MM:SS(+,-)zzzz",
-                        "YYYY-MM-DDTHH:MM:SS(+,-)zz:zz",
-                    ]
+                acceptable_datetime_formats = [
+                    "YYYY-MM-DDTHH:MM:SS",
+                    "YYYY-MM-DDTHH:MM:SS(+,-)zzzz",
+                    "YYYY-MM-DDTHH:MM:SS(+,-)zz:zz",
+                ]
+                if not isinstance(value, datetime):
                     try:
                         datetime.strptime(value, "%Y-%m-%dT%H:%M:%S%z")
                     except ValueError:
@@ -386,6 +380,12 @@ class ObjectMetadata(ChangeLoggedModel, BaseModel):
                             )
                     except TypeError:
                         raise ValidationError("Value must be a datetime or str object.")
+                else:
+                    # if value is a datetime object
+                    # check if datetime object has tzinfo
+                    if value.tzinfo is None:
+                        value = value.replace(tzinfo=timezone.utc)
+                    value = value.replace(microsecond=0).isoformat()
             # Validate selected choice
             elif metadata_type_data_type == MetadataTypeDataTypeChoices.TYPE_SELECT:
                 if value not in self.metadata_type.choices.values_list("value", flat=True):

nautobot/extras/models/models.py

@@ -822,8 +822,6 @@ class Note(ChangeLoggedModel, BaseModel):
     note = models.TextField()
     objects = BaseManager.from_queryset(NotesQuerySet)()
 
-    is_metadata_associable_model = False
-
     class Meta:
         ordering = ["created"]
         unique_together = [["assigned_object_type", "assigned_object_id", "user_name", "created"]]

nautobot/extras/signals.py

@@ -13,7 +13,7 @@ from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.core.files.storage import get_storage_class
 from django.db import transaction
-from django.db.models.signals import m2m_changed, post_delete, post_migrate, post_save, pre_delete, pre_save
+from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
 from django.dispatch import receiver
 from django.utils import timezone
 from django_prometheus.models import model_deletes, model_inserts, model_updates
@@ -289,19 +289,6 @@ def _handle_deleted_object(sender, instance, **kwargs):
     model_deletes.labels(instance._meta.model_name).inc()
 
 
-#
-# Content types
-#
-
-
-@receiver(post_migrate)
-def post_migrate_clear_content_type_caches(sender, app_config, signal, **kwargs):
-    """Clear various content-type caches after a migration."""
-    with contextlib.suppress(redis.exceptions.ConnectionError):
-        cache.delete("nautobot.extras.utils.change_logged_models_queryset")
-        cache.delete_pattern("nautobot.extras.utils.FeatureQuery.*")
-
-
 #
 # Custom fields
 #

nautobot/extras/tables.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.utils.html import format_html, format_html_join
+from django.utils.html import format_html
 import django_tables2 as tables
 from django_tables2.utils import Accessor
 from jsonschema.exceptions import ValidationError as JSONSchemaValidationError
@@ -107,7 +107,6 @@ GITREPOSITORY_BUTTONS = """
 
 JOB_BUTTONS = """
 <a href="{% url 'extras:job' pk=record.pk %}" class="btn btn-default btn-xs" title="Details"><i class="mdi mdi-information-outline" aria-hidden="true"></i></a>
-<a href="{% url 'extras:jobresult_list' %}?job_model={{ record.name | urlencode }}" class="btn btn-default btn-xs" title="Job Results"><i class="mdi mdi-format-list-bulleted" aria-hidden="true"></i></a>
 """
 
 OBJECTCHANGE_OBJECT = """
@@ -716,10 +715,7 @@ class JobTable(BaseTable):
         return render_markdown(value)
 
     def render_name(self, value):
-        return format_html(
-            '<span class="btn btn-primary btn-xs"><i class="mdi mdi-play"></i></span>{}',
-            value,
-        )
+        return format_html('<span class="btn btn-primary btn-xs"><i class="mdi mdi-play"></i></span>{}', value)
 
     class Meta(BaseTable.Meta):
         model = JobModel
@@ -891,16 +887,7 @@ class JobResultTable(BaseTable):
             "summary",
             "actions",
         )
-        default_columns = (
-            "pk",
-            "date_created",
-            "name",
-            "job_model",
-            "user",
-            "status",
-            "summary",
-            "actions",
-        )
+        default_columns = ("pk", "date_created", "name", "job_model", "user", "status", "summary", "actions")
 
 
 class JobButtonTable(BaseTable):
@@ -970,8 +957,10 @@ class MetadataTypeTable(BaseTable):
 class ObjectMetadataTable(BaseTable):
     pk = ToggleColumn()
     metadata_type = tables.Column(linkify=True)
-    assigned_object = tables.TemplateColumn(
-        template_code=ASSIGNED_OBJECT, verbose_name="Assigned object", orderable=False
+    assigned_object = tables.TemplateColumn(template_code=ASSIGNED_OBJECT, orderable=False)
+    actions = ButtonsColumn(
+        ObjectMetadata,
+        buttons=("delete"),
     )
     # This is needed so that render_value method below does not skip itself
     # when metadata_type.data_type is TYPE_CONTACT_TEAM and we need it to display either contact or team
@@ -985,6 +974,7 @@ class ObjectMetadataTable(BaseTable):
             "metadata_type",
             "scoped_fields",
             "value",
+            "actions",
         )
         default_columns = (
             "pk",
@@ -992,12 +982,11 @@ class ObjectMetadataTable(BaseTable):
             "scoped_fields",
             "value",
             "metadata_type",
+            "actions",
         )
 
-    def render_scoped_fields(self, value):
-        if not value:
-            return "(all fields)"
-        return format_html_join(", ", "<code>{}</code>", ([v] for v in sorted(value)))
+    def render_scoped_fields(self, record):
+        return render_json(record.scoped_fields, pretty_print=True)
 
     def render_value(self, record):
         if record.value is not None and record.metadata_type.data_type == MetadataTypeDataTypeChoices.TYPE_JSON:
@@ -1119,15 +1108,7 @@ class RelationshipAssociationTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = RelationshipAssociation
-        fields = (
-            "pk",
-            "relationship",
-            "source_type",
-            "source",
-            "destination_type",
-            "destination",
-            "actions",
-        )
+        fields = ("pk", "relationship", "source_type", "source", "destination_type", "destination", "actions")
         default_columns = ("pk", "relationship", "source", "destination", "actions")
 
 
@@ -1243,15 +1224,7 @@ class TagTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = Tag
-        fields = (
-            "pk",
-            "name",
-            "items",
-            "color",
-            "content_types",
-            "description",
-            "actions",
-        )
+        fields = ("pk", "name", "items", "color", "content_types", "description", "actions")
 
 
 class TaggedItemTable(BaseTable):
@@ -1331,9 +1304,7 @@ class WebhookTable(BaseTable):
 class AssociatedContactsTable(StatusTableMixin, RoleTableMixin, BaseTable):
     pk = ToggleColumn()
     contact_type = tables.TemplateColumn(
-        CONTACT_OR_TEAM_ICON,
-        verbose_name="Type",
-        attrs={"td": {"style": "width:20px;"}},
+        CONTACT_OR_TEAM_ICON, verbose_name="Type", attrs={"td": {"style": "width:20px;"}}
     )
     name = tables.TemplateColumn(CONTACT_OR_TEAM, verbose_name="Name")
     contact_or_team_phone = tables.TemplateColumn(PHONE, accessor="contact_or_team.phone", verbose_name="Phone")

nautobot/extras/templates/extras/job_detail.html

@@ -115,17 +115,6 @@
                 <td>{{ object.enabled | render_boolean }}</td>
                 <td></td>
             </tr>
-            <tr>
-                <td>Job Results</td>
-                <td>
-                    {% if object.job_results.exists %}
-                        <a href="{% url 'extras:jobresult_list' %}?job_model={{ object.name | urlencode }}">{{ object.job_results.count }}</a>
-                    {% else %}
-                        {{ None|placeholder }}
-                    {% endif %}
-                </td>
-                <td></td>
-            </tr>
         </table>
     </div>
 {% endblock content_left_page %}

nautobot/extras/tests/test_api.py

@@ -15,7 +15,7 @@ from rest_framework import status
 from nautobot.core.choices import ColorChoices
 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, get_deletable_objects
+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 (
@@ -2741,21 +2741,21 @@ class ObjectMetadataTest(APIViewTestCases.APIViewTestCase):
             value="Hey",
             scoped_fields=["parent", "status"],
             assigned_object_type=ContentType.objects.get_for_model(IPAddress),
-            assigned_object_id=IPAddress.objects.filter(associated_object_metadata__isnull=True).first().pk,
+            assigned_object_id=IPAddress.objects.first().pk,
         )
         ObjectMetadata.objects.create(
             metadata_type=mdts[0],
             value="Hello",
             scoped_fields=["namespace"],
             assigned_object_type=ContentType.objects.get_for_model(Prefix),
-            assigned_object_id=Prefix.objects.filter(associated_object_metadata__isnull=True).first().pk,
+            assigned_object_id=Prefix.objects.first().pk,
         )
         ObjectMetadata.objects.create(
             metadata_type=mdts[2],
             contact=Contact.objects.first(),
             scoped_fields=["status"],
             assigned_object_type=ContentType.objects.get_for_model(Prefix),
-            assigned_object_id=Prefix.objects.filter(associated_object_metadata__isnull=True).last().pk,
+            assigned_object_id=Prefix.objects.last().pk,
         )
         cls.create_data = [
             {
@@ -2763,41 +2763,34 @@ class ObjectMetadataTest(APIViewTestCases.APIViewTestCase):
                 "scoped_fields": ["location_type"],
                 "value": "random words",
                 "assigned_object_type": "dcim.location",
-                "assigned_object_id": Location.objects.filter(associated_object_metadata__isnull=True).first().pk,
+                "assigned_object_id": Location.objects.first().pk,
             },
             {
                 "metadata_type": mdts[1].pk,
                 "scoped_fields": ["name"],
                 "value": "random words",
                 "assigned_object_type": "dcim.location",
-                "assigned_object_id": Location.objects.filter(associated_object_metadata__isnull=True).first().pk,
+                "assigned_object_id": Location.objects.first().pk,
             },
             {
                 "metadata_type": mdts[2].pk,
-                "scoped_fields": [],
+                "scoped_fields": ["device_type"],
                 "contact": Contact.objects.first().pk,
                 "assigned_object_type": "dcim.device",
-                "assigned_object_id": Device.objects.filter(associated_object_metadata__isnull=True).first().pk,
+                "assigned_object_id": Device.objects.first().pk,
             },
             {
                 "metadata_type": mdts[2].pk,
                 "scoped_fields": ["interfaces"],
                 "team": Team.objects.first().pk,
                 "assigned_object_type": "dcim.device",
-                "assigned_object_id": Device.objects.filter(associated_object_metadata__isnull=True).last().pk,
+                "assigned_object_id": Device.objects.first().pk,
             },
         ]
         cls.update_data = {
             "scoped_fields": ["pk"],
         }
 
-    def get_deletable_object(self):
-        # TODO: CSV round-trip doesn't work for empty scoped_fields values at present. :-(
-        instance = get_deletable_objects(self.model, self._get_queryset().exclude(scoped_fields=[])).first()
-        if instance is None:
-            self.fail("Couldn't find a single deletable object with non-empty scoped_fields")
-        return instance
-
 
 class NoteTest(APIViewTestCases.APIViewTestCase):
     model = Note