nautobot 2.4.1__py3-none-any.whl → 2.4.2__py3-none-any.whl

nautobot/extras/migrations/0122_add_graphqlquery_owner_content_type.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.2.17 on 2025-01-08 16:59
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+import nautobot.extras.utils
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("contenttypes", "0002_remove_content_type_name"),
+        ("extras", "0121_alter_team_contacts"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="graphqlquery",
+            name="owner_content_type",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                limit_choices_to=nautobot.extras.utils.FeatureQuery("graphql_query_owners"),
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="graphql_queries",
+                to="contenttypes.contenttype",
+            ),
+        ),
+        migrations.AddField(
+            model_name="graphqlquery",
+            name="owner_object_id",
+            field=models.UUIDField(blank=True, default=None, null=True),
+        ),
+    ]

nautobot/extras/models/customfields.py

@@ -370,11 +370,11 @@ class CustomFieldManager(BaseManager.from_queryset(RestrictedQuerySet)):
 
     def get_for_model(self, model, exclude_filter_disabled=False):
         """
-        Return all CustomFields assigned to the given model.
+        Return (and cache) all CustomFields assigned to the given model.
 
         Args:
-            model: The django model to which custom fields are registered
-            exclude_filter_disabled: Exclude any custom fields which have filter logic disabled
+            model (Model): The django model to which custom fields are registered
+            exclude_filter_disabled (bool): Exclude any custom fields which have filter logic disabled
         """
         concrete_model = model._meta.concrete_model
         cache_key = (
@@ -521,6 +521,26 @@ class CustomField(
     def __str__(self):
         return self.label
 
+    @property
+    def choices_cache_key(self):
+        return f"nautobot.extras.customfield.choices.{self.pk}"
+
+    @property
+    def choices(self) -> list[str]:
+        """
+        Cacheable shorthand for retrieving custom_field_choices values associated with this model.
+
+        Returns:
+            list[str]: List of choice values, ordered by weight.
+        """
+        if self.type not in [CustomFieldTypeChoices.TYPE_SELECT, CustomFieldTypeChoices.TYPE_MULTISELECT]:
+            return []
+        choices = cache.get(self.choices_cache_key)
+        if choices is None:
+            choices = list(self.custom_field_choices.order_by("weight", "value").values_list("value", flat=True))
+            cache.set(self.choices_cache_key, choices)
+        return choices
+
     def save(self, *args, **kwargs):
         self.clean()
         super().save(*args, **kwargs)
@@ -679,12 +699,11 @@ class CustomField(
 
         # Select or Multi-select
         else:
-            choices = [(cfc.value, cfc.value) for cfc in self.custom_field_choices.all()]
-            default_choice = self.custom_field_choices.filter(value=self.default).first()
+            choices = [(value, value) for value in self.choices]
 
             # Set the initial value to the first available choice (if any)
             if self.type == CustomFieldTypeChoices.TYPE_SELECT and not for_filter_form:
-                if not required or default_choice is None:
+                if not required or self.default not in self.choices:
                     choices = add_blank_choice(choices)
                 field_class = CSVChoiceField if for_csv_import else forms.ChoiceField
                 field = field_class(
@@ -779,17 +798,15 @@ class CustomField(
 
             # Validate selected choice
             elif self.type == CustomFieldTypeChoices.TYPE_SELECT:
-                if value not in self.custom_field_choices.values_list("value", flat=True):
-                    raise ValidationError(
-                        f"Invalid choice ({value}). Available choices are: {', '.join(self.custom_field_choices.values_list('value', flat=True))}"
-                    )
+                if value not in self.choices:
+                    raise ValidationError(f"Invalid choice ({value}). Available choices are: {', '.join(self.choices)}")
 
             elif self.type == CustomFieldTypeChoices.TYPE_MULTISELECT:
                 if isinstance(value, str):
                     value = value.split(",")
-                if not set(value).issubset(self.custom_field_choices.values_list("value", flat=True)):
+                if not set(value).issubset(self.choices):
                     raise ValidationError(
-                        f"Invalid choice(s) ({value}). Available choices are: {', '.join(self.custom_field_choices.values_list('value', flat=True))}"
+                        f"Invalid choice(s) ({value}). Available choices are: {', '.join(self.choices)}"
                     )
 
         elif self.required:

nautobot/extras/models/datasources.py

@@ -1,7 +1,11 @@
 """Models for representing external data sources."""
 
+from contextlib import contextmanager
 from importlib.util import find_spec
+import logging
 import os
+import shutil
+import tempfile
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -12,12 +16,16 @@ from nautobot.core.constants import CHARFIELD_MAX_LENGTH
 from nautobot.core.models.fields import AutoSlugField, LaxURLField, slugify_dashes_to_underscores
 from nautobot.core.models.generics import PrimaryModel
 from nautobot.core.models.validators import EnhancedURLValidator
+from nautobot.core.utils.git import GitRepo
 from nautobot.extras.utils import check_if_key_is_graphql_safe, extras_features
 
+logger = logging.getLogger(__name__)
+
 
 @extras_features(
     "config_context_owners",
     "export_template_owners",
+    "graphql_query_owners",
     "graphql",
     "job_results",
     "webhooks",
@@ -167,3 +175,80 @@ class GitRepository(PrimaryModel):
         if dry_run:
             return enqueue_git_repository_diff_origin_and_local(self, user)
         return enqueue_pull_git_repository_and_refresh_data(self, user)
+
+    @contextmanager
+    def clone_to_directory_context(self, path=None, branch=None, head=None, depth=0):
+        """
+        Context manager to perform a (shallow or full) clone of the Git repository in a temporary directory.
+
+        Args:
+            path (str, optional): The absolute directory path to clone into. If not specified, `tempfile.gettempdir()` will be used.
+            branch (str, optional): The branch to checkout. If not set, the GitRepository.branch will be used.
+            head (str, optional): Git commit hash to check out instead of pulling branch latest.
+            depth (int, optional): The depth of the clone. If set to 0, a full clone will be performed.
+
+        Returns:
+            Returns the absolute path of the cloned repo if clone was successful, otherwise returns None.
+        """
+
+        if branch and head:
+            raise ValueError("Cannot specify both branch and head")
+
+        path_name = None
+        try:
+            path_name = self.clone_to_directory(path=path, branch=branch, head=head, depth=depth)
+            yield path_name
+        finally:
+            # Cleanup the temporary directory
+            if path_name:
+                self.cleanup_cloned_directory(path_name)
+
+    def clone_to_directory(self, path=None, branch=None, head=None, depth=0):
+        """
+        Perform a (shallow or full) clone of the Git repository in a temporary directory.
+
+        Args:
+            path (str, optional): The absolute directory path to clone into. If not specified, `tempfile.gettempdir()` will be used.
+            branch (str, optional): The branch to checkout. If not set, the GitRepository.branch will be used.
+            head (str, optional): Git commit hash to check out instead of pulling branch latest.
+            depth (int, optional): The depth of the clone. If set to 0, a full clone will be performed.
+
+        Returns:
+            Returns the absolute path of the cloned repo if clone was successful, otherwise returns None.
+        """
+        if branch and head:
+            raise ValueError("Cannot specify both branch and head")
+
+        try:
+            path_name = tempfile.mkdtemp(dir=path, prefix=self.slug)
+        except PermissionError as e:
+            logger.error(f"Failed to create temporary directory at {path}: {e}")
+            raise e
+
+        if not branch:
+            branch = self.branch
+
+        try:
+            repo_helper = GitRepo(path_name, self.remote_url, depth=depth, branch=branch)
+            if head:
+                repo_helper.checkout(branch, head)
+        except Exception as e:
+            logger.error(f"Failed to clone repository {self.name} to {path_name}: {e}")
+            raise e
+
+        logger.info(f"Cloned repository {self.name} to {path_name}")
+        return path_name
+
+    def cleanup_cloned_directory(self, path):
+        """
+        Cleanup the cloned directory.
+
+        Args:
+            path (str): The absolute directory path to cleanup.
+        """
+
+        try:
+            shutil.rmtree(path)
+        except OSError as os_error:
+            # log error if the cleanup fails
+            logger.error(f"Failed to cleanup temporary directory at {path}: {os_error}")

nautobot/extras/models/models.py

@@ -680,6 +680,21 @@ class GraphQLQuery(
     SavedViewMixin,
     BaseModel,
 ):
+    # A Graphql Query *may* be owned by another model, such as a GitRepository, or it may be un-owned
+    owner_content_type = models.ForeignKey(
+        to=ContentType,
+        on_delete=models.CASCADE,
+        limit_choices_to=FeatureQuery("graphql_query_owners"),
+        default=None,
+        null=True,
+        blank=True,
+        related_name="graphql_queries",
+    )
+    owner_object_id = models.UUIDField(default=None, null=True, blank=True)
+    owner = GenericForeignKey(
+        ct_field="owner_content_type",
+        fk_field="owner_object_id",
+    )
     name = models.CharField(max_length=CHARFIELD_MAX_LENGTH, unique=True)
     query = models.TextField()
     variables = models.JSONField(encoder=DjangoJSONEncoder, default=dict, blank=True)

nautobot/extras/models/relationships.py

@@ -261,15 +261,27 @@ class RelationshipModel(models.Model):
                 remote_model = remote_ct.model_class()
                 if remote_model is not None:
                     if not relationship.symmetric:
-                        query_params = {f"{peer_side}_for_associations__relationship": relationship.pk}
-                        resp[side][relationship] = remote_model.objects.filter(**query_params)
+                        query_params = {
+                            f"{peer_side}_for_associations__relationship": relationship,
+                            f"{peer_side}_for_associations__{side}_id": self.pk,
+                        }
+                        # Get the related objects for this relationship on the opposite side.
+                        resp[side][relationship] = remote_model.objects.filter(**query_params).distinct()
                         if not relationship.has_many(peer_side):
                             resp[side][relationship] = resp[side][relationship].first()
                     else:
+                        side_query_params = {
+                            f"{peer_side}_for_associations__relationship": relationship,
+                            f"{peer_side}_for_associations__{side}_id": self.pk,
+                        }
+                        peer_side_query_params = {
+                            f"{side}_for_associations__relationship": relationship,
+                            f"{side}_for_associations__{peer_side}_id": self.pk,
+                        }
+                        # Get the related objects based on the pks we gathered.
                         resp[RelationshipSideChoices.SIDE_PEER][relationship] = remote_model.objects.filter(
-                            Q(source_for_associations__relationship=relationship.pk)
-                            | Q(destination_for_associations__relationship=relationship.pk)
-                        ).exclude(pk=self.pk)
+                            Q(**side_query_params) | Q(**peer_side_query_params)
+                        ).distinct()
                         if not relationship.has_many(peer_side):
                             resp[side][relationship] = resp[side][relationship].first()
                 else:

nautobot/extras/signals.py

@@ -28,6 +28,7 @@ from nautobot.extras.models import (
     ComputedField,
     ContactAssociation,
     CustomField,
+    CustomFieldChoice,
     DynamicGroup,
     DynamicGroupMembership,
     GitRepository,
@@ -97,6 +98,19 @@ def invalidate_models_cache(sender, **kwargs):
             cache.delete_pattern(f"{manager.keys_for_model.cache_key_prefix}.*")
 
 
+@receiver(post_delete, sender=CustomField)
+@receiver(post_delete, sender=CustomFieldChoice)
+@receiver(post_save, sender=CustomFieldChoice)
+@receiver(post_save, sender=CustomField)
+def invalidate_choices_cache(sender, instance, **kwargs):
+    """Invalidate the choices cache for CustomFields."""
+    with contextlib.suppress(redis.exceptions.ConnectionError):
+        if sender is CustomField:
+            cache.delete(instance.choices_cache_key)
+        else:
+            cache.delete(instance.custom_field.choices_cache_key)
+
+
 @receiver(post_save, sender=Relationship)
 @receiver(m2m_changed, sender=Relationship)
 @receiver(post_delete, sender=Relationship)
@@ -376,7 +390,7 @@ def git_repository_pre_delete(instance, **kwargs):
         app.control.broadcast("discard_git_repository", repository_slug=instance.slug)
         # But we don't have an equivalent way to broadcast to any other Django instances.
         # For now we just delete the one that we have locally and rely on other methods,
-        # such as the import_jobs() signal that runs on server startup,
+        # such as the import_jobs() signal that runs on post migrate,
         # to clean up other clones as they're encountered.
         if os.path.isdir(instance.filesystem_path):
             shutil.rmtree(instance.filesystem_path)

nautobot/extras/templates/extras/computedfield.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/templates/extras/configcontext.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/templates/extras/configcontextschema.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load buttons %}
 {% load plugins %}
 {% load helpers %}

nautobot/extras/templates/extras/customfield.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load buttons %}
 {% load helpers %}
 

nautobot/extras/templates/extras/customlink.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/templates/extras/dynamicgroup.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_nav_tabs %}

nautobot/extras/templates/extras/exporttemplate.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/templates/extras/gitrepository.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_buttons %}

nautobot/extras/templates/extras/graphqlquery.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/templates/extras/job_detail.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 {% load perms %}
 {% load plugins %}

nautobot/extras/templates/extras/jobbutton_retrieve.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/templates/extras/jobhook.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/templates/extras/jobresult.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 {% load custom_links %}
 {% load form_helpers %}

nautobot/extras/templates/extras/objectchange.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block title %}{{ object }}{% endblock %}

nautobot/extras/templates/extras/plugin_detail.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block header %}

nautobot/extras/templates/extras/relationship.html

@@ -1,63 +1 @@
-{% extends 'generic/object_detail.html' %}
-{% load buttons %}
-{% load plugins %}
-{% load perms %}
-{% load helpers %}
-
-{% block content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Relationship</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Description</td>
-                <td>{{ object.description | placeholder }}</td>
-            </tr>
-            <tr>
-                <td>Type</td>
-                <td>{{ object.type }}</td>
-            </tr>
-            <tr>
-                <td>Required On</td>
-                <td>{{ object.get_required_on_display }}</td>
-            </tr>
-            <tr>
-                <td>On Advanced Tab</td>
-                <td>{{ object.advanced_ui | render_boolean }}</td>
-            </tr>
-            <tr>
-                <td>Source Content Type</td>
-                <td>{{ object.source_type }}</td>
-            </tr>
-            <tr>
-                <td>Source Label</td>
-                <td>{{ object.source_label | placeholder }}</td>
-            </tr>
-            <tr>
-                <td>Source Filter</td>
-                <td>{% if object.source_filter %}<pre>{{ object.source_filter | render_json }}</pre>{% else %}{{ None | placeholder }}{% endif %}</td>
-            </tr>
-            <tr>
-                <td>Hide on Source Object</td>
-                <td>{{ object.source_hidden | render_boolean }}</td>
-            </tr>
-            <tr>
-                <td>Destination Content Type</td>
-                <td>{{ object.destination_type }}</td>
-            </tr>
-            <tr>
-                <td>Destination Label</td>
-                <td>{{ object.destination_label | placeholder }}</td>
-            </tr>
-            <tr>
-                <td>Destination Filter</td>
-                <td>{% if object.destination_filter %}<pre>{{ object.destination_filter | render_json }}</pre>{% else %}{{ None | placeholder }}{% endif %}</td>
-            </tr>
-            <tr>
-                <td>Hide on Destination Object</td>
-                <td>{{ object.destination_hidden | render_boolean }}</td>
-            </tr>
-        </table>
-    </div>
-{% endblock content_left_page %}
+{% extends 'generic/object_retrieve.html' %}

nautobot/extras/templates/extras/role_retrieve.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/templates/extras/scheduledjob.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load buttons %}
 {% load custom_links %}
 {% load helpers %}

nautobot/extras/templates/extras/secret.html

@@ -1 +1 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}

nautobot/extras/templates/extras/secretsgroup.html

@@ -1,4 +1,4 @@
-{% extends "generic/object_detail.html" %}
+{% extends "generic/object_retrieve.html" %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/templates/extras/status.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/templates/extras/tag.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/templates/extras/webhook.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/extras/tests/git_data/01-valid-files/graphql_queries/device_interfaces.gql

@@ -0,0 +1,8 @@
+query {
+  devices {
+    name
+    interfaces {
+      name
+    }
+  }
+}

nautobot/extras/tests/git_data/01-valid-files/graphql_queries/device_names.gql

@@ -0,0 +1,5 @@
+{
+    device {
+        name
+    }
+}

nautobot/extras/tests/git_data/02-invalid-files/graphql_queries/bad_device_names.gql

@@ -0,0 +1,5 @@
+{
+    device {
+
+    
+}

nautobot/extras/tests/git_helper.py

@@ -14,7 +14,7 @@ logger = logging.getLogger(__name__)
 SOURCE_DIR = os.path.join(os.path.dirname(__file__), "git_data")
 
 
-def create_and_populate_git_repository(target_path):
+def create_and_populate_git_repository(target_path, divergent_branch=None):
     """
     Create a Git repository in `target_path` and populate it with commits and tags based on contents of `SOURCE_DIR`.
 
@@ -40,6 +40,9 @@ def create_and_populate_git_repository(target_path):
     Note that each commit is fully defined by the files in the appropriate subdirectory; if you want a file to exist
     across multiple separate commits, it must exist in multiple subdirectories. Use of symlinks is encouraged in such
     a scenario.
+
+    You can optionally create and check out a divergent branch from the main branch by passing a branch name as the `divergent_branch`.
+    This will write a commit to the divergent branch and tag it with the branch name with the `-tag` suffix.
     """
     os.makedirs(target_path, exist_ok=True)
     repo = Repo.init(target_path, initial_branch="main")
@@ -69,6 +72,11 @@ def create_and_populate_git_repository(target_path):
         # Directory "01-valid-files" --> tag "valid-files" so that we won't break tests if we renumber the directories
         repo.create_tag(dirname[3:], message=f"Tag based on {dirname} files")
 
+    if divergent_branch:
+        repo.create_head(divergent_branch)
+        repo.index.commit("divergent-branch")
+        repo.create_tag(f"{divergent_branch}-tag", message=f"Tag for divergent branch {divergent_branch}")
+
 
 if __name__ == "__main__":
     directory_path = tempfile.TemporaryDirectory().name  # pylint: disable=consider-using-with

nautobot/extras/tests/integration/__init__.py

@@ -6,28 +6,41 @@ from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Man
 from nautobot.extras.models import Role, Status
 
 
-def create_test_device():
-    test_uuid = str(uuid.uuid4())
-    device_role, _ = Role.objects.get_or_create(name="Device Role")
-    device_ct = ContentType.objects.get_for_model(Device)
-    device_role.content_types.add(device_ct)
-    manufacturer = Manufacturer.objects.create(
-        name=f"Test Manufacturer {test_uuid}",
-    )
-    device_type = DeviceType.objects.create(manufacturer=manufacturer, model=f"Test Model {test_uuid}")
-    location_type = LocationType.objects.create(name=f"Test Location Type {test_uuid}")
-    location_type.content_types.add(ContentType.objects.get_for_model(Device))
+def create_test_device(name=None, location_name=None, test_uuid=None):
+    if not test_uuid:
+        test_uuid = str(uuid.uuid4())
+    if not name:
+        name = f"Test Device {test_uuid}"
+    if not location_name:
+        location_name = f"Test Location {test_uuid}"
+
+    location_type, location_type_created = LocationType.objects.get_or_create(name=f"Test Location Type {test_uuid}")
+    if location_type_created:
+        location_type.content_types.add(ContentType.objects.get_for_model(Device))
+        location_type.save()
+
     location_status = Status.objects.get_for_model(Location).first()
-    location = Location.objects.create(
-        name=f"Test Location {test_uuid}",
+    location, _ = Location.objects.get_or_create(
+        name=location_name,
         status=location_status,
         location_type=location_type,
     )
-    device = Device.objects.create(
-        name=f"Test Device {test_uuid}",
+
+    device_role, device_role_created = Role.objects.get_or_create(name="Device Role")
+    if device_role_created:
+        device_role.content_types.add(ContentType.objects.get_for_model(Device))
+        device_role.save()
+
+    manufacturer, _ = Manufacturer.objects.get_or_create(
+        name=f"Test Manufacturer {test_uuid}",
+    )
+
+    device_type, _ = DeviceType.objects.get_or_create(manufacturer=manufacturer, model=f"Test Model {test_uuid}")
+
+    return Device.objects.create(
+        name=name,
         role=device_role,
         device_type=device_type,
         location=location,
         status=location_status,
     )
-    return device