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

nautobot/core/views/generic.py

@@ -78,7 +78,7 @@ class ObjectView(ObjectPermissionRequiredMixin, View):
     template_name: Name of the template to use
     """
 
-    queryset: ClassVar[QuerySet]
+    queryset: ClassVar[Optional[QuerySet]] = None  # TODO: required, declared Optional only to avoid breaking change
     template_name: ClassVar[Optional[str]] = None
     object_detail_content = None
 
@@ -141,7 +141,7 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
     non_filter_params: List of query parameters that are **not** used for queryset filtering
     """
 
-    queryset: QuerySet
+    queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
     filterset: Optional[type[FilterSet]] = None
     filterset_form: Optional[type[Form]] = None
     table: Optional[type[Table]] = None
@@ -413,8 +413,8 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     template_name: The name of the template
     """
 
-    queryset: QuerySet
-    model_form: type[Form]
+    queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
+    model_form: Optional[type[Form]] = None  # TODO: required, declared Optional only to avoid a breaking change
     template_name = "generic/object_create.html"
 
     def get_required_permission(self):
@@ -458,7 +458,9 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         obj = self.alter_obj(self.get_object(kwargs), request, args, kwargs)
 
         initial_data = normalize_querydict(request.GET, form_class=self.model_form)
-        form = self.model_form(instance=obj, initial=initial_data)
+        if self.model_form is None:
+            raise RuntimeError("self.model_form must not be None")
+        form = self.model_form(instance=obj, initial=initial_data)  # pylint: disable=not-callable
         restrict_form_fields(form, request.user)
 
         return render(
@@ -488,7 +490,9 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     def post(self, request, *args, **kwargs):
         logger = logging.getLogger(__name__ + ".ObjectEditView")
         obj = self.alter_obj(self.get_object(kwargs), request, args, kwargs)
-        form = self.model_form(
+        if self.model_form is None:
+            raise RuntimeError("self.model_form must not be None")
+        form = self.model_form(  # pylint: disable=not-callable
             data=request.POST,
             files=request.FILES,
             initial=normalize_querydict(request.GET, form_class=self.model_form),
@@ -556,7 +560,7 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     template_name: The name of the template
     """
 
-    queryset: QuerySet
+    queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
     template_name = "generic/object_delete.html"
 
     def get_required_permission(self):
@@ -636,9 +640,9 @@ class BulkCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     template_name: The name of the template
     """
 
-    queryset: QuerySet
-    form: type[Form]
-    model_form: type[Form]
+    queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
+    form: Optional[type[Form]] = None  # TODO: required, declared Optional only to avoid a breaking change
+    model_form: Optional[type[Form]] = None  # TODO: required, declared Optional only to avoid a breaking change
     pattern_target = ""
     template_name = None
 
@@ -648,12 +652,14 @@ class BulkCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     def get(self, request):
         # Set initial values for visible form fields from query args
         initial = {}
+        if self.form is None or self.model_form is None:
+            raise RuntimeError("self.form and self.model_form must not be None")
         for field in getattr(self.model_form._meta, "fields", []):
             if request.GET.get(field):
                 initial[field] = request.GET[field]
 
-        form = self.form()
-        model_form = self.model_form(initial=initial)
+        form = self.form()  # pylint: disable=not-callable
+        model_form = self.model_form(initial=initial)  # pylint: disable=not-callable
 
         return render(
             request,
@@ -668,9 +674,11 @@ class BulkCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
 
     def post(self, request):
         logger = logging.getLogger(__name__ + ".BulkCreateView")
+        if self.queryset is None or self.form is None or self.model_form is None:
+            raise RuntimeError("self.queryset, self.form, and self.model_form must not be None")
         model = self.queryset.model
-        form = self.form(request.POST)
-        model_form = self.model_form(request.POST)
+        form = self.form(request.POST)  # pylint: disable=not-callable
+        model_form = self.model_form(request.POST)  # pylint: disable=not-callable
 
         if form.is_valid():
             logger.debug("Form validation was successful")
@@ -683,7 +691,7 @@ class BulkCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                     for value in pattern:
                         # Reinstantiate the model form each time to avoid overwriting the same instance. Use a mutable
                         # copy of the POST QueryDict so that we can update the target field value.
-                        model_form = self.model_form(request.POST.copy())
+                        model_form = self.model_form(request.POST.copy())  # pylint: disable=not-callable
                         model_form.data[self.pattern_target] = value
 
                         # Validate each new object independently.
@@ -745,8 +753,8 @@ class ObjectImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     template_name: The name of the template
     """
 
-    queryset: QuerySet
-    model_form: type[Form]
+    queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
+    model_form: Optional[type[Form]] = None  # TODO: required, declared Optional only to avoid a breaking change
     related_object_forms = {}
     template_name = "generic/object_import.html"
 
@@ -770,12 +778,15 @@ class ObjectImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         logger = logging.getLogger(__name__ + ".ObjectImportView")
         form = ImportForm(request.POST)
 
+        if self.model_form is None or self.queryset is None:
+            raise RuntimeError("self.model_form and self.queryset must not be None")
+
         if form.is_valid():
             logger.debug("Import form validation was successful")
 
             # Initialize model form
             data = form.cleaned_data["data"]
-            model_form = self.model_form(data)
+            model_form = self.model_form(data)  # pylint: disable=not-callable
             restrict_form_fields(model_form, request.user)
 
             # Assign default values for any fields which were not specified. We have to do this manually because passing
@@ -890,8 +901,8 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):  #
     template_name: The name of the template
     """
 
-    queryset: QuerySet
-    table: type[Table]
+    queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
+    table: Optional[type[Table]] = None  # TODO: required, declared Optional only to avoid a breaking change
     template_name = "generic/object_bulk_import.html"
 
     def __init__(self, *args, **kwargs):
@@ -935,6 +946,9 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):  #
         if form.is_valid():
             logger.debug("Form validation was successful")
 
+            if self.queryset is None or self.table is None:
+                raise RuntimeError("self.queryset and self.table must not be None")
+
             try:
                 # Iterate through CSV data and bind each row to a new model form instance.
                 with transaction.atomic():
@@ -945,7 +959,7 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):  #
                         raise ObjectDoesNotExist
 
                 # Compile a table containing the imported objects
-                obj_table = self.table(new_objs)
+                obj_table = self.table(new_objs)  # pylint: disable=not-callable
 
                 if new_objs:
                     msg = f"Imported {len(new_objs)} {new_objs[0]._meta.verbose_name_plural}"
@@ -996,10 +1010,10 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, BulkEditAnd
     template_name: The name of the template
     """
 
-    queryset: QuerySet
+    queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
     filterset: Optional[type[FilterSet]] = None
-    table: type[Table]
-    form: type[Form]
+    table: Optional[type[Table]] = None  # TODO: required, declared Optional only to avoid a breaking change
+    form: Optional[type[Form]] = None  # TODO: required, declared Optional only to avoid a breaking change
     template_name = "generic/object_bulk_edit.html"
 
     def get_required_permission(self):
@@ -1018,6 +1032,8 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, BulkEditAnd
 
     def post(self, request, **kwargs):
         logger = logging.getLogger(__name__ + ".BulkEditView")
+        if self.queryset is None or self.form is None or self.table is None:
+            raise RuntimeError("self.queryset, self.form, and self.table must not be None")
         model = self.queryset.model
         edit_all = request.POST.get("_all")
 
@@ -1030,7 +1046,7 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, BulkEditAnd
             queryset = self.queryset.filter(pk__in=pk_list)
 
         if "_apply" in request.POST:
-            form = self.form(model, request.POST, edit_all=edit_all)
+            form = self.form(model, request.POST, edit_all=edit_all)  # pylint: disable=not-callable
             restrict_form_fields(form, request.user)
 
             if form.is_valid():
@@ -1051,13 +1067,13 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, BulkEditAnd
             elif "device_type" in request.GET:
                 initial_data["device_type"] = request.GET.get("device_type")
 
-            form = self.form(model, initial=initial_data, edit_all=edit_all)
+            form = self.form(model, initial=initial_data, edit_all=edit_all)  # pylint: disable=not-callable
             restrict_form_fields(form, request.user)
 
         # Retrieve objects being edited
         table = None
         if not edit_all:
-            table = self.table(queryset, orderable=False)
+            table = self.table(queryset, orderable=False)  # pylint: disable=not-callable
             if not table.rows:
                 messages.warning(request, f"No {model._meta.verbose_name_plural} were selected.")
                 return redirect(self.get_return_url(request))
@@ -1084,7 +1100,7 @@ class BulkRenameView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     An extendable view for renaming objects in bulk.
     """
 
-    queryset: QuerySet
+    queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
     template_name = "generic/object_bulk_rename.html"
 
     def __init__(self, *args, **kwargs):
@@ -1190,9 +1206,9 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, BulkEditA
     template_name: The name of the template
     """
 
-    queryset: QuerySet
+    queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
     filterset: Optional[type[FilterSet]] = None
-    table: type[Table]
+    table: Optional[type[Table]] = None  # TODO: required, declared Optional only to avoid a breaking change
     form: Optional[type[Form]] = None
     template_name = "generic/object_bulk_delete.html"
 
@@ -1204,6 +1220,8 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, BulkEditA
 
     def post(self, request, **kwargs):
         logger = logging.getLogger(f"{__name__}.BulkDeleteView")
+        if self.queryset is None or self.table is None:
+            raise RuntimeError("self.queryset and self.table must not be None")
         model = self.queryset.model
         delete_all = request.POST.get("_all")
 
@@ -1240,7 +1258,7 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, BulkEditA
         # Retrieve objects being deleted
         table = None
         if not delete_all:
-            table = self.table(queryset, orderable=False)
+            table = self.table(queryset, orderable=False)  # pylint: disable=not-callable
             if not table.rows:
                 messages.warning(
                     request,
@@ -1293,17 +1311,19 @@ class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View
     Add one or more components (e.g. interfaces, console ports, etc.) to a Device or VirtualMachine.
     """
 
-    queryset: QuerySet
-    form: type[Form]
-    model_form: type[Form]
+    queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
+    form: Optional[type[Form]] = None  # TODO: required, declared Optional only to avoid a breaking change
+    model_form: Optional[type[Form]] = None  # TODO: required, declared Optional only to avoid a breaking change
     template_name = "dcim/device_component_add.html"
 
     def get_required_permission(self):
         return get_permission_for_model(self.queryset.model, "add")
 
     def get(self, request):
-        form = self.form(initial=normalize_querydict(request.GET, form_class=self.form))
-        model_form = self.model_form(request.GET)
+        if self.form is None or self.model_form is None:
+            raise RuntimeError("self.form and self.model_form must not be None")
+        form = self.form(initial=normalize_querydict(request.GET, form_class=self.form))  # pylint: disable=not-callable
+        model_form = self.model_form(request.GET)  # pylint: disable=not-callable
 
         return render(
             request,
@@ -1318,8 +1338,10 @@ class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View
 
     def post(self, request):
         logger = logging.getLogger(__name__ + ".ComponentCreateView")
-        form = self.form(request.POST, initial=normalize_querydict(request.GET, form_class=self.form))
-        model_form = self.model_form(request.POST, initial=normalize_querydict(request.GET, form_class=self.model_form))
+        if self.form is None or self.model_form is None or self.queryset is None:
+            raise RuntimeError("self.form, self.model_form, and self.queryset must not be None")
+        form = self.form(request.POST, initial=normalize_querydict(request.GET, form_class=self.form))  # pylint: disable=not-callable
+        model_form = self.model_form(request.POST, initial=normalize_querydict(request.GET, form_class=self.model_form))  # pylint: disable=not-callable
 
         if form.is_valid():
             new_components = []
@@ -1334,7 +1356,7 @@ class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View
                 data["label"] = label
                 if hasattr(form, "get_iterative_data"):
                     data.update(form.get_iterative_data(i))
-                component_form = self.model_form(
+                component_form = self.model_form(  # pylint: disable=not-callable
                     data, initial=normalize_querydict(request.GET, form_class=self.model_form)
                 )
 
@@ -1395,13 +1417,13 @@ class BulkComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin,
     Add one or more components (e.g. interfaces, console ports, etc.) to a set of Devices or VirtualMachines.
     """
 
-    parent_model: type[Model]
+    parent_model: Optional[type[Model]] = None  # TODO: required, declared Optional only to avoid a breaking change
     parent_field = None
-    form: type[Form]
-    queryset: QuerySet
-    model_form: type[Form]
+    form: Optional[type[Form]] = None  # TODO: required, declared Optional only to avoid a breaking change
+    queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
+    model_form: Optional[type[Form]] = None  # TODO: required, declared Optional only to avoid a breaking change
     filterset: Optional[type[FilterSet]] = None
-    table: type[Table]
+    table: Optional[type[Table]] = None  # TODO: required, declared Optional only to avoid a breaking change
     template_name = "generic/object_bulk_add_component.html"
 
     def get_required_permission(self):
@@ -1409,6 +1431,16 @@ class BulkComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin,
 
     def post(self, request):
         logger = logging.getLogger(__name__ + ".BulkComponentCreateView")
+        if (
+            self.form is None
+            or self.model_form is None
+            or self.parent_model is None
+            or self.queryset is None
+            or self.table is None
+        ):
+            raise RuntimeError(
+                "self.form, self.model_form, self.parent_model, self.queryset, and self.table must not be None"
+            )
         parent_model_name = self.parent_model._meta.verbose_name_plural
         model_name = self.queryset.model._meta.verbose_name_plural
         model = self.queryset.model
@@ -1426,10 +1458,10 @@ class BulkComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin,
                 f"No {self.parent_model._meta.verbose_name_plural} were selected.",
             )
             return redirect(self.get_return_url(request))
-        table = self.table(selected_objects)
+        table = self.table(selected_objects)  # pylint: disable=not-callable
 
         if "_create" in request.POST:
-            form = self.form(model, request.POST)
+            form = self.form(model, request.POST)  # pylint: disable=not-callable
 
             if form.is_valid():
                 logger.debug("Form validation was successful")
@@ -1451,7 +1483,7 @@ class BulkComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin,
                                     "label": label,
                                 }
                                 component_data.update(data)
-                                component_form = self.model_form(component_data)
+                                component_form = self.model_form(component_data)  # pylint: disable=not-callable
                                 if component_form.is_valid():
                                     instance = component_form.save()
                                     logger.debug(f"Created {instance} on {instance.parent}")
@@ -1493,7 +1525,7 @@ class BulkComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin,
                 logger.debug("Form validation failed")
 
         else:
-            form = self.form(model, initial={"pk": pk_list})
+            form = self.form(model, initial={"pk": pk_list})  # pylint: disable=not-callable
 
         return render(
             request,

nautobot/core/views/mixins.py

@@ -31,6 +31,7 @@ from rest_framework.parsers import FormParser, MultiPartParser
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
 
+from nautobot.core import exceptions as core_exceptions
 from nautobot.core.api.views import BulkDestroyModelMixin, BulkUpdateModelMixin
 from nautobot.core.forms import (
     BootstrapMixin,
@@ -40,7 +41,7 @@ from nautobot.core.forms import (
     restrict_form_fields,
 )
 from nautobot.core.jobs import BulkDeleteObjects, BulkEditObjects
-from nautobot.core.utils import lookup, permissions
+from nautobot.core.utils import filtering, lookup, permissions
 from nautobot.core.utils.requests import get_filterable_params_from_filter_params, normalize_querydict
 from nautobot.core.views.renderers import NautobotHTMLRenderer
 from nautobot.core.views.utils import (
@@ -925,6 +926,8 @@ class BulkEditAndBulkDeleteModelMixin:
     UI mixin to bulk destroy and bulk edit all model instances.
     """
 
+    logger = logging.getLogger(__name__)
+
     def _get_bulk_edit_delete_all_queryset(self, request):
         """
         Retrieve the queryset of model instances to be bulk-deleted or bulk-deleted, filtered based on request parameters.
@@ -957,7 +960,19 @@ class BulkEditAndBulkDeleteModelMixin:
         if filterset_class := lookup.get_filterset_for_model(model):
             filter_query_params = normalize_querydict(request.GET, filterset=filterset_class())
         else:
-            filter_query_params = None
+            filter_query_params = {}
+
+        # Discarding non-filter query params
+        new_filter_query_params = {}
+
+        for key, value in filter_query_params.items():
+            try:
+                filtering.get_filterset_field(filterset_class(), key)
+                new_filter_query_params[key] = value
+            except core_exceptions.FilterSetFieldNotFound:
+                self.logger.debug(f"Query parameter `{key}` not found in `{filterset_class}`, discarding it")
+
+        filter_query_params = new_filter_query_params
 
         job_form = BulkDeleteObjects.as_form(
             data={
@@ -984,7 +999,20 @@ class BulkEditAndBulkDeleteModelMixin:
         if filterset_class := lookup.get_filterset_for_model(model):
             filter_query_params = normalize_querydict(request.GET, filterset=filterset_class())
         else:
-            filter_query_params = None
+            filter_query_params = {}
+
+        # Discarding non-filter query params
+        new_filter_query_params = {}
+
+        for key, value in filter_query_params.items():
+            try:
+                filtering.get_filterset_field(filterset_class(), key)
+                new_filter_query_params[key] = value
+            except core_exceptions.FilterSetFieldNotFound:
+                self.logger.debug(f"Query parameter `{key}` not found in `{filterset_class}`, discarding it")
+
+        filter_query_params = new_filter_query_params
+
         job_form = BulkEditObjects.as_form(
             data={
                 "form_data": form_data,
@@ -1164,7 +1192,7 @@ class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin, Bulk
             for field in form.fields
             if field not in form_custom_fields + form_relationships + ["pk"] + ["object_note"]
         ]
-        nullified_fields = request.POST.getlist("_nullify")
+        nullified_fields = request.POST.getlist("_nullify") or []
         with deferred_change_logging_for_bulk_operation():
             updated_objects = []
             edit_all = self.request.POST.get("_all")
@@ -1183,7 +1211,7 @@ class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin, Bulk
                         # This form field is used to modify a field rather than set its value directly
                         model_field = None
                     # Handle nullification
-                    if name in form.nullable_fields and name in nullified_fields:
+                    if name in form.nullable_fields and nullified_fields and name in nullified_fields:
                         if isinstance(model_field, ManyToManyField):
                             getattr(obj, name).set([])
                         else:
@@ -1197,7 +1225,7 @@ class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin, Bulk
                         setattr(obj, name, form.cleaned_data[name])
                 # Update custom fields
                 for field_name in form_custom_fields:
-                    if field_name in form.nullable_fields and field_name in nullified_fields:
+                    if field_name in form.nullable_fields and nullified_fields and field_name in nullified_fields:
                         obj.cf[remove_prefix_from_cf_key(field_name)] = None
                     elif form.cleaned_data.get(field_name) not in (None, "", []):
                         obj.cf[remove_prefix_from_cf_key(field_name)] = form.cleaned_data[field_name]

nautobot/dcim/api/serializers.py

@@ -981,7 +981,7 @@ class DeviceTypeToSoftwareImageFileSerializer(ValidatedModelSerializer):
 
 class ControllerSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
     capabilities = serializers.ListField(
-        child=ChoiceField(choices=ControllerCapabilitiesChoices, required=False), allow_empty=True
+        child=ChoiceField(choices=ControllerCapabilitiesChoices, required=False), allow_empty=True, required=False
     )
 
     class Meta:
@@ -991,7 +991,7 @@ class ControllerSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
 
 class ControllerManagedDeviceGroupSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
     capabilities = serializers.ListField(
-        child=ChoiceField(choices=ControllerCapabilitiesChoices, required=False), allow_empty=True
+        child=ChoiceField(choices=ControllerCapabilitiesChoices, required=False), allow_empty=True, required=False
     )
 
     class Meta:

nautobot/dcim/constants.py

@@ -27,19 +27,12 @@ REARPORT_POSITIONS_MAX = 1024
 INTERFACE_MTU_MIN = 1
 INTERFACE_MTU_MAX = 32767  # Max value of a signed 16-bit integer
 
-VIRTUAL_IFACE_TYPES = [
-    InterfaceTypeChoices.TYPE_VIRTUAL,
-    InterfaceTypeChoices.TYPE_BRIDGE,
-    InterfaceTypeChoices.TYPE_LAG,
-]
-
-WIRELESS_IFACE_TYPES = [
-    InterfaceTypeChoices.TYPE_80211A,
-    InterfaceTypeChoices.TYPE_80211G,
-    InterfaceTypeChoices.TYPE_80211N,
-    InterfaceTypeChoices.TYPE_80211AC,
-    InterfaceTypeChoices.TYPE_80211AD,
-]
+interface_type_by_category = {}
+for category_name, category_item_tuples in InterfaceTypeChoices.CHOICES:
+    interface_type_by_category[category_name] = [item_tuple[0] for item_tuple in category_item_tuples]
+
+WIRELESS_IFACE_TYPES = interface_type_by_category["Wireless"]
+VIRTUAL_IFACE_TYPES = interface_type_by_category["Virtual interfaces"]
 
 NONCONNECTABLE_IFACE_TYPES = VIRTUAL_IFACE_TYPES + WIRELESS_IFACE_TYPES
 

nautobot/dcim/factory.py

@@ -201,7 +201,12 @@ class DeviceFactory(PrimaryModelFactory):
         if extracted:
             self.software_image_files.set(extracted)
         else:
-            self.software_image_files.set(get_random_instances(SoftwareImageFile))
+            self.software_image_files.set(
+                get_random_instances(
+                    SoftwareImageFile.objects.filter(default_image=True)
+                    | SoftwareImageFile.objects.filter(device_types=self.device_type)
+                )
+            )
 
     # TODO to be done after these model factories are done.
     # has_cluster = NautobotBoolIterator()