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

nautobot/dcim/migrations/0069_softwareimagefile_external_integration.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.20 on 2025-03-11 19:10
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0122_add_graphqlquery_owner_content_type"),
+        ("dcim", "0068_alter_softwareimagefile_download_url"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="softwareimagefile",
+            name="external_integration",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="software_image_files",
+                to="extras.externalintegration",
+            ),
+        ),
+    ]

nautobot/dcim/models/devices.py

@@ -14,7 +14,7 @@ import yaml
 
 from nautobot.core.constants import CHARFIELD_MAX_LENGTH
 from nautobot.core.models import BaseManager, RestrictedQuerySet
-from nautobot.core.models.fields import JSONArrayField, NaturalOrderingField
+from nautobot.core.models.fields import JSONArrayField, LaxURLField, NaturalOrderingField
 from nautobot.core.models.generics import BaseModel, OrganizationalModel, PrimaryModel
 from nautobot.core.models.tree_queries import TreeModel
 from nautobot.core.utils.config import get_settings_or_config
@@ -1239,7 +1239,14 @@ class SoftwareImageFile(PrimaryModel):
         verbose_name="Image File Size",
         help_text="Image file size in bytes",
     )
-    download_url = models.URLField(blank=True, verbose_name="Download URL")
+    download_url = LaxURLField(blank=True, verbose_name="Download URL")
+    external_integration = models.ForeignKey(
+        to="extras.ExternalIntegration",
+        on_delete=models.PROTECT,
+        related_name="software_image_files",
+        blank=True,
+        null=True,
+    )
     default_image = models.BooleanField(
         verbose_name="Default Image", help_text="Is the default image for this software version", default=False
     )

nautobot/dcim/tables/devices.py

@@ -1275,6 +1275,7 @@ class SoftwareImageFileTable(StatusTableMixin, BaseTable):
             "image_file_checksum",
             "hashing_algorithm",
             "download_url",
+            "external_integration",
             "device_type_count",
             "tags",
             "actions",

nautobot/dcim/templates/dcim/softwareimagefile_retrieve.html

@@ -100,6 +100,10 @@
                                         {% endwith %}
                                     </td>
                                 </tr>
+                                <tr>
+                                    <td>External Integration</td>
+                                    <td>{{ object.external_integration|hyperlinked_object }}</td>
+                                </tr>
                                 <tr>
                                     <td>Devices overridden to use this file</td>
                                     <td>

nautobot/dcim/tests/test_api.py

@@ -68,7 +68,7 @@ from nautobot.dcim.models import (
     VirtualChassis,
     VirtualDeviceContext,
 )
-from nautobot.extras.models import ConfigContextSchema, Role, SecretsGroup, Status
+from nautobot.extras.models import ConfigContextSchema, ExternalIntegration, Role, SecretsGroup, Status
 from nautobot.ipam.models import IPAddress, Namespace, Prefix, VLAN, VLANGroup
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import Cluster, ClusterType
@@ -187,7 +187,12 @@ class Mixins:
         def test_module_device_validation(self):
             """Assert that a modular component can have a module or a device but not both."""
 
-            self.add_permissions(f"{self.model._meta.app_label}.add_{self.model._meta.model_name}")
+            self.add_permissions(
+                f"{self.model._meta.app_label}.add_{self.model._meta.model_name}",
+                "dcim.view_device",
+                "dcim.view_module",
+                "extras.view_status",
+            )
             data = {
                 self.module_field: self.module.pk,
                 self.device_field: self.device.pk,
@@ -220,7 +225,12 @@ class Mixins:
         def test_module_device_name_unique_validation(self):
             """Assert uniqueness constraint is enforced for (device,name) and (module,name) fields."""
 
-            self.add_permissions(f"{self.model._meta.app_label}.add_{self.model._meta.model_name}")
+            self.add_permissions(
+                f"{self.model._meta.app_label}.add_{self.model._meta.model_name}",
+                "dcim.view_device",
+                "dcim.view_module",
+                "extras.view_status",
+            )
             modules = Module.objects.all()[:2]
             data = {
                 self.module_field: modules[0].pk,
@@ -266,7 +276,11 @@ class Mixins:
         def test_module_type_device_type_validation(self):
             """Assert that a modular component template can have a module_type or a device_type but not both."""
 
-            self.add_permissions(f"{self.model._meta.app_label}.add_{self.model._meta.model_name}")
+            self.add_permissions(
+                f"{self.model._meta.app_label}.add_{self.model._meta.model_name}",
+                "dcim.view_devicetype",
+                "dcim.view_moduletype",
+            )
             data = {
                 "module_type": self.module_type.pk,
                 "device_type": self.device_type.pk,
@@ -299,7 +313,11 @@ class Mixins:
         def test_module_type_device_type_name_unique_validation(self):
             """Assert uniqueness constraint is enforced for (device_type,name) and (module_type,name) fields."""
 
-            self.add_permissions(f"{self.model._meta.app_label}.add_{self.model._meta.model_name}")
+            self.add_permissions(
+                f"{self.model._meta.app_label}.add_{self.model._meta.model_name}",
+                "dcim.view_devicetype",
+                "dcim.view_moduletype",
+            )
             module_types = ModuleType.objects.all()[:2]
             data = {
                 "module_type": module_types[0].pk,
@@ -442,7 +460,7 @@ class LocationTest(APIViewTestCases.APIViewTestCase, APIViewTestCases.TreeModelA
         Test allow_null to time_zone field on locaton.
         """
 
-        self.add_permissions("dcim.add_location")
+        self.add_permissions("dcim.add_location", "dcim.view_locationtype", "extras.view_status")
         url = reverse("dcim-api:location-list")
         location = {
             "name": "foo",
@@ -461,7 +479,7 @@ class LocationTest(APIViewTestCases.APIViewTestCase, APIViewTestCases.TreeModelA
         Test disallowed blank time_zone field on location.
         """
 
-        self.add_permissions("dcim.add_location")
+        self.add_permissions("dcim.add_location", "dcim.view_locationtype", "extras.view_status")
         url = reverse("dcim-api:location-list")
         location = {
             "name": "foo",
@@ -480,7 +498,7 @@ class LocationTest(APIViewTestCases.APIViewTestCase, APIViewTestCases.TreeModelA
         Test valid time_zone field on location.
         """
 
-        self.add_permissions("dcim.add_location")
+        self.add_permissions("dcim.add_location", "dcim.view_locationtype", "extras.view_status")
         url = reverse("dcim-api:location-list")
         time_zone = "UTC"
         location = {
@@ -500,7 +518,7 @@ class LocationTest(APIViewTestCases.APIViewTestCase, APIViewTestCases.TreeModelA
         Test invalid time_zone field on location.
         """
 
-        self.add_permissions("dcim.add_location")
+        self.add_permissions("dcim.add_location", "dcim.view_locationtype", "extras.view_status")
         url = reverse("dcim-api:location-list")
         time_zone = "IDONOTEXIST"
         location = {
@@ -593,7 +611,7 @@ class RackGroupTest(APIViewTestCases.APIViewTestCase, APIViewTestCases.TreeModel
 
     def test_child_group_location_valid(self):
         """A child group with a location may fall within the parent group's location."""
-        self.add_permissions("dcim.add_rackgroup")
+        self.add_permissions("dcim.add_rackgroup", "dcim.view_rackgroup", "dcim.view_location")
         url = reverse("dcim-api:rackgroup-list")
 
         parent_group = RackGroup.objects.filter(location=self.locations[0]).first()
@@ -615,7 +633,7 @@ class RackGroupTest(APIViewTestCases.APIViewTestCase, APIViewTestCases.TreeModel
 
     def test_child_group_location_invalid(self):
         """A child group with a location must not fall outside its parent group's location."""
-        self.add_permissions("dcim.add_rackgroup")
+        self.add_permissions("dcim.add_rackgroup", "dcim.view_location", "dcim.view_rackgroup")
         url = reverse("dcim-api:rackgroup-list")
 
         parent_group = RackGroup.objects.filter(location=self.locations[0]).first()
@@ -1225,7 +1243,9 @@ class FrontPortTemplateTest(Mixins.BasePortTemplateTestMixin):
     def test_module_type_device_type_validation(self):
         """Assert that a modular component template can have a module_type or a device_type but not both."""
 
-        self.add_permissions("dcim.add_frontporttemplate")
+        self.add_permissions(
+            "dcim.add_frontporttemplate", "dcim.view_rearporttemplate", "dcim.view_devicetype", "dcim.view_moduletype"
+        )
         data = {
             "module_type": self.module_type.pk,
             "device_type": self.device_type.pk,
@@ -1253,7 +1273,9 @@ class FrontPortTemplateTest(Mixins.BasePortTemplateTestMixin):
     def test_module_type_device_type_name_unique_validation(self):
         """Assert uniqueness constraint is enforced for (device_type,name) and (module_type,name) fields."""
 
-        self.add_permissions("dcim.add_frontporttemplate")
+        self.add_permissions(
+            "dcim.add_frontporttemplate", "dcim.view_rearporttemplate", "dcim.view_moduletype", "dcim.view_devicetype"
+        )
         data = {
             "module_type": self.module_type.pk,
             "name": "test modular device_type component parent validation",
@@ -1617,7 +1639,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         schema = ConfigContextSchema.objects.create(
             name="Schema 1", data_schema={"type": "object", "properties": {"A": {"type": "integer"}}}
         )
-        self.add_permissions("dcim.change_device")
+        self.add_permissions("dcim.change_device", "extras.view_configcontextschema")
 
         patch_data = {"local_config_context_schema": str(schema.pk)}
 
@@ -1651,7 +1673,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         Validate we can set primary_ip4 on a device using a PATCH.
         """
         # Add object-level permission
-        self.add_permissions("dcim.change_device")
+        self.add_permissions("dcim.change_device", "ipam.view_ipaddress")
 
         dev = Device.objects.get(name="Device 3")
         intf_status = Status.objects.get_for_model(Interface).first()
@@ -1677,7 +1699,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         Validate we can set device redundancy group on a device using a PATCH.
         """
         # Add object-level permission
-        self.add_permissions("dcim.change_device")
+        self.add_permissions("dcim.change_device", "dcim.view_deviceredundancygroup")
 
         device_redundancy_group = DeviceRedundancyGroup.objects.first()
 
@@ -1751,7 +1773,15 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         # Create test data
         parent_device, device_bay_1, device_bay_2, device_type_child = self._parent_device_test_data()
 
-        self.add_permissions("dcim.add_device")
+        self.add_permissions(
+            "dcim.add_device",
+            "dcim.view_device",
+            "dcim.view_devicetype",
+            "extras.view_role",
+            "extras.view_status",
+            "dcim.view_location",
+            "dcim.view_devicebay",
+        )
         url = reverse("dcim-api:device-list")
 
         # Test creating device with parent bay by device bay data
@@ -1808,7 +1838,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         # Create test data
         parent_device, device_bay_1, device_bay_2, device_type_child = self._parent_device_test_data()
 
-        self.add_permissions("dcim.change_device")
+        self.add_permissions("dcim.change_device", "dcim.view_devicebay")
 
         child_device = Device.objects.create(
             device_type=device_type_child,
@@ -1852,7 +1882,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         device_bay_1.installed_device = child_device
         device_bay_1.save()
 
-        self.add_permissions("dcim.change_device", "dcim.view_device", "dcim.change_devicebay")
+        self.add_permissions("dcim.change_device", "dcim.view_device", "dcim.change_devicebay", "dcim.view_devicebay")
         child_device_detail_url = self._get_detail_url(child_device)
 
         response = self.client.get(child_device_detail_url, **self.header)
@@ -1950,7 +1980,9 @@ class ModuleTestCase(APIViewTestCases.APIViewTestCase):
     def test_parent_module_bay_location_validation(self):
         """Assert that a module can have a parent_module_bay or a location but not both."""
 
-        self.add_permissions("dcim.add_module")
+        self.add_permissions(
+            "dcim.add_module", "dcim.view_moduletype", "dcim.view_location", "dcim.view_modulebay", "extras.view_status"
+        )
         data = {
             "module_type": self.module_type.pk,
             "location": self.location.pk,
@@ -1981,7 +2013,7 @@ class ModuleTestCase(APIViewTestCases.APIViewTestCase):
         )
 
     def test_serial_module_type_unique_validation(self):
-        self.add_permissions("dcim.add_module")
+        self.add_permissions("dcim.add_module", "dcim.view_location", "dcim.view_moduletype", "extras.view_status")
         data = {
             "module_type": self.module_type.pk,
             "location": self.location.pk,
@@ -2006,7 +2038,7 @@ class ModuleTestCase(APIViewTestCases.APIViewTestCase):
         )
 
     def test_asset_tag_unique_validation(self):
-        self.add_permissions("dcim.add_module")
+        self.add_permissions("dcim.add_module", "dcim.view_location", "dcim.view_moduletype", "extras.view_status")
         data = {
             "module_type": self.module_type.pk,
             "location": self.location.pk,
@@ -2321,7 +2353,7 @@ class InterfaceTest(Mixins.ModularDeviceComponentMixin, Mixins.BasePortTestMixin
 
     def test_untagged_vlan_requires_mode(self):
         """Test that when an `untagged_vlan` is specified, `mode` is also required."""
-        self.add_permissions("dcim.add_interface")
+        self.add_permissions("dcim.add_interface", "dcim.view_device", "extras.view_status", "ipam.view_vlan")
 
         # This will fail.
         url = self._get_list_url()
@@ -2336,7 +2368,9 @@ class InterfaceTest(Mixins.ModularDeviceComponentMixin, Mixins.BasePortTestMixin
         )
 
     def test_tagged_vlan_must_be_in_the_location_or_parent_locations_of_the_parent_device(self):
-        self.add_permissions("dcim.add_interface")
+        self.add_permissions(
+            "dcim.add_interface", "dcim.view_interface", "dcim.view_device", "extras.view_status", "ipam.view_vlan"
+        )
 
         interface_status = Status.objects.get_for_model(Interface).first()
         location = self.devices[0].location
@@ -2365,7 +2399,7 @@ class InterfaceTest(Mixins.ModularDeviceComponentMixin, Mixins.BasePortTestMixin
 
     def test_interface_belonging_to_common_device_or_vc_allowed(self):
         """Test parent, bridge, and LAG interfaces belonging to common device or VC is valid"""
-        self.add_permissions("dcim.add_interface")
+        self.add_permissions("dcim.add_interface", "dcim.view_device", "dcim.view_interface", "extras.view_status")
 
         response = self.client.post(
             self._get_list_url(), data=self.common_device_or_vc_data[0], format="json", **self.header
@@ -2388,7 +2422,9 @@ class InterfaceTest(Mixins.ModularDeviceComponentMixin, Mixins.BasePortTestMixin
     def test_interface_not_belonging_to_common_device_or_vc_not_allowed(self):
         """Test parent, bridge, and LAG interfaces not belonging to common device or VC is invalid"""
 
-        self.add_permissions("dcim.add_interface")
+        self.add_permissions(
+            "dcim.add_interface", "dcim.view_device", "dcim.view_interface", "extras.view_status", "extras.view_role"
+        )
 
         for name, payload in self.interfaces_not_belonging_to_same_device_data:
             response = self.client.post(self._get_list_url(), data=payload, format="json", **self.header)
@@ -2405,7 +2441,9 @@ class InterfaceTest(Mixins.ModularDeviceComponentMixin, Mixins.BasePortTestMixin
             )
 
     def test_tagged_vlan_raise_error_if_mode_not_set_to_tagged(self):
-        self.add_permissions("dcim.add_interface", "dcim.change_interface")
+        self.add_permissions(
+            "dcim.add_interface", "dcim.change_interface", "dcim.view_device", "extras.view_status", "ipam.view_vlan"
+        )
         with self.subTest("On create, assert 400 status."):
             payload = {
                 "device": self.devices[0].pk,
@@ -2509,7 +2547,7 @@ class FrontPortTest(Mixins.BasePortTestMixin):
     def test_module_device_validation(self):
         """Assert that a modular component can have a module or a device but not both."""
 
-        self.add_permissions("dcim.add_frontport")
+        self.add_permissions("dcim.add_frontport", "dcim.view_device", "dcim.view_module", "dcim.view_rearport")
         data = {
             "module": self.module.pk,
             "device": self.device.pk,
@@ -2546,7 +2584,7 @@ class FrontPortTest(Mixins.BasePortTestMixin):
     def test_module_device_name_unique_validation(self):
         """Assert uniqueness constraint is enforced for (device,name) and (module,name) fields."""
 
-        self.add_permissions("dcim.add_frontport")
+        self.add_permissions("dcim.add_frontport", "dcim.view_module", "dcim.view_rearport", "dcim.view_device")
         data = {
             "module": self.module.pk,
             "name": "test modular device component parent validation",
@@ -3410,22 +3448,26 @@ class SoftwareImageFileTestCase(Mixins.SoftwareImageFileRelatedModelMixin, APIVi
     def setUpTestData(cls):
         statuses = Status.objects.get_for_model(SoftwareImageFile)
         software_versions = SoftwareVersion.objects.all()
+        external_integrations = ExternalIntegration.objects.all()
 
         cls.create_data = [
             {
                 "software_version": software_versions[0].pk,
                 "status": statuses[0].pk,
                 "image_file_name": "software_image_file_test_case_1.bin",
+                "external_integration": external_integrations[0].pk,
             },
             {
                 "software_version": software_versions[1].pk,
                 "status": statuses[1].pk,
                 "image_file_name": "software_image_file_test_case_2.bin",
+                "external_integration": external_integrations[1].pk,
             },
             {
                 "software_version": software_versions[2].pk,
                 "status": statuses[2].pk,
                 "image_file_name": "software_image_file_test_case_3.bin",
+                "external_integration": None,
             },
         ]
         cls.bulk_update_data = {
@@ -3435,6 +3477,7 @@ class SoftwareImageFileTestCase(Mixins.SoftwareImageFileRelatedModelMixin, APIVi
             "hashing_algorithm": SoftwareImageFileHashingAlgorithmChoices.SHA512,
             "image_file_size": 1234567890,
             "download_url": "https://example.com/software_image_file_test_case.bin",
+            "external_integration": external_integrations[0].pk,
         }
 
 
@@ -3642,7 +3685,7 @@ class VirtualDeviceContextTestCase(APIViewTestCases.APIViewTestCase):
         Validate we can set primary_ip on a Virtual Device Context using a PATCH.
         """
         # Add object-level permission
-        self.add_permissions("dcim.change_virtualdevicecontext")
+        self.add_permissions("dcim.change_virtualdevicecontext", "ipam.view_ipaddress")
         vdc = VirtualDeviceContext.objects.first()
         device = vdc.device
         intf_status = Status.objects.get_for_model(Interface).first()
@@ -3679,7 +3722,7 @@ class VirtualDeviceContextTestCase(APIViewTestCases.APIViewTestCase):
         """
         Validate that changing device on the virutal device context is not allowed.
         """
-        self.add_permissions("dcim.change_virtualdevicecontext")
+        self.add_permissions("dcim.change_virtualdevicecontext", "dcim.view_device")
         vdc = VirtualDeviceContext.objects.first()
         old_device = vdc.device
         new_device = Device.objects.exclude(pk=old_device.pk).first()

nautobot/dcim/tests/test_filters.py

@@ -3861,6 +3861,8 @@ class SoftwareImageFileFilterSetTestCase(FilterTestCases.FilterTestCase):
         ["software_version", "software_version__version"],
         ["status", "status__id"],
         ["status", "status__name"],
+        ["external_integration", "external_integration__id"],
+        ["external_integration", "external_integration__name"],
     )
 
     @classmethod

nautobot/dcim/tests/test_jobs.py

@@ -71,7 +71,7 @@ def create_common_data_for_software_related_test_cases():
 class TestSoftwareImageFileTestCase(TransactionTestCase):
     def test_correct_handling_for_model_protected_error(self):
         create_common_data_for_software_related_test_cases()
-        software_image_file = SoftwareImageFile.objects.first()
+        software_image_file = SoftwareImageFile.objects.get(image_file_name="software_image_file_qs_test_1.bin")
 
         self.add_permissions("dcim.delete_softwareimagefile")
         pk_list = [str(software_image_file.pk)]
@@ -86,9 +86,7 @@ class TestSoftwareImageFileTestCase(TransactionTestCase):
             pk_list=pk_list,
             username=self.user.username,
         )
-        logs = JobLogEntry.objects.filter(job_result=job_result)
-        print([(log.message, log.log_level) for log in logs])
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+        self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         error_log = JobLogEntry.objects.get(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
         self.assertIn("Caught ProtectedError while attempting to delete objects", error_log.message)
         self.assertEqual(initial_count, SoftwareImageFile.objects.all().count())
@@ -97,7 +95,7 @@ class TestSoftwareImageFileTestCase(TransactionTestCase):
 class TestSoftwareVersionTestCase(TransactionTestCase):
     def test_correct_handling_for_model_protected_error(self):
         create_common_data_for_software_related_test_cases()
-        software_version = SoftwareVersion.objects.first()
+        software_version = SoftwareVersion.objects.get(version="Test version 1.0.0")
 
         initial_count = SoftwareVersion.objects.all().count()
         self.add_permissions("dcim.delete_softwareversion")
@@ -112,7 +110,7 @@ class TestSoftwareVersionTestCase(TransactionTestCase):
             pk_list=pk_list,
             username=self.user.username,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+        self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         error_log = JobLogEntry.objects.get(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
         self.assertIn("Caught ProtectedError while attempting to delete objects", error_log.message)
         self.assertEqual(initial_count, SoftwareVersion.objects.all().count())

nautobot/dcim/tests/test_models.py

@@ -9,6 +9,7 @@ from django.test import TestCase
 from django.test.utils import override_settings
 
 from nautobot.circuits.models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
+from nautobot.core import settings
 from nautobot.core.testing.models import ModelTestCases
 from nautobot.dcim.choices import (
     CableStatusChoices,
@@ -2610,6 +2611,70 @@ class InterfaceTestCase(ModularDeviceComponentTestCaseMixin, ModelTestCases.Base
 class SoftwareImageFileTestCase(ModelTestCases.BaseModelTestCase):
     model = SoftwareImageFile
 
+    def test_download_url_validation_behaviour(self):
+        """
+        Test that the `download_url` property behaves as expected in relation to laxURLField validation and
+        the ALLOWED_URL_SCHEMES setting.
+        """
+        # Prepare prerequisite objects
+        platform = Platform.objects.first()
+        software_version_status = Status.objects.get_for_model(SoftwareVersion).first()
+        software_image_file_status = Status.objects.get_for_model(SoftwareImageFile).first()
+        software_version = SoftwareVersion.objects.create(
+            platform=platform, version="Test version 1.0.0", status=software_version_status
+        )
+
+        # Test that the download_url field is correctly validated with the default ALLOWED_URL_SCHEMES setting
+        for scheme in settings.ALLOWED_URL_SCHEMES:
+            software_image = SoftwareImageFile(
+                software_version=software_version,
+                image_file_name=f"software_image_file_qs_test_{scheme}.bin",
+                status=software_image_file_status,
+                download_url=f"{scheme}://example.com/software_image_file_qs_test_1.bin",
+            )
+            try:
+                software_image.validated_save()
+            except ValidationError as e:
+                self.fail(f"download_url Scheme {scheme} ValidationError: {e}")
+
+        INVALID_SCHEMES = ["httpx", "rdp", "cryptoboi"]
+        OVERRIDE_VALID_SCHEMES = ["sftp", "tftp", "https", "http", "newfs", "customfs"]
+        # Invalid schemes should raise a ValidationError
+        for scheme in INVALID_SCHEMES:
+            software_image = SoftwareImageFile(
+                software_version=software_version,
+                image_file_name=f"software_image_file_qs_test_{scheme}2.bin",
+                status=software_image_file_status,
+                download_url=f"{scheme}://example.com/software_image_file_qs_test_2.bin",
+            )
+            with self.assertRaises(ValidationError) as err:
+                software_image.validated_save()
+            self.assertEqual(err.exception.message_dict["download_url"][0], "Enter a valid URL.")
+
+        with override_settings(ALLOWED_URL_SCHEMES=OVERRIDE_VALID_SCHEMES):
+            for scheme in OVERRIDE_VALID_SCHEMES:
+                software_image = SoftwareImageFile(
+                    software_version=software_version,
+                    image_file_name=f"software_image_file_qs_test_{scheme}3.bin",
+                    status=software_image_file_status,
+                    download_url=f"{scheme}://example.com/software_image_file_qs_test_3.bin",
+                )
+                try:
+                    software_image.validated_save()
+                except ValidationError as e:
+                    self.fail(f"download_url Scheme {scheme} ValidationError: {e}")
+
+            for scheme in INVALID_SCHEMES:
+                software_image = SoftwareImageFile(
+                    software_version=software_version,
+                    image_file_name=f"software_image_file_qs_test_{scheme}4.bin",
+                    status=software_image_file_status,
+                    download_url=f"{scheme}://example.com/software_image_file_qs_test_4.bin",
+                )
+                with self.assertRaises(ValidationError) as err:
+                    software_image.validated_save()
+                self.assertEqual(err.exception.message_dict["download_url"][0], "Enter a valid URL.")
+
     def test_queryset_get_for_object(self):
         """
         Test that the queryset get_for_object method returns the expected results for Device, DeviceType, InventoryItem and VirtualMachine

nautobot/dcim/tests/test_views.py

@@ -4579,6 +4579,7 @@ class SoftwareImageFileTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         device_types = DeviceType.objects.all()[:2]
         statuses = Status.objects.get_for_model(SoftwareImageFile)
         software_versions = SoftwareVersion.objects.all()
+        external_integration = ExternalIntegration.objects.first()
 
         cls.form_data = {
             "software_version": software_versions[0].pk,
@@ -4588,6 +4589,7 @@ class SoftwareImageFileTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "image_file_size": 1234567890,
             "hashing_algorithm": SoftwareImageFileHashingAlgorithmChoices.SHA512,
             "download_url": "https://example.com/software_image_file_test_case.bin",
+            "external_integration": external_integration.pk,
             "device_types": [device_types[0].pk, device_types[1].pk],
         }
 
@@ -4598,6 +4600,7 @@ class SoftwareImageFileTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "hashing_algorithm": SoftwareImageFileHashingAlgorithmChoices.SHA512,
             "image_file_size": 1234567890,
             "download_url": "https://example.com/software_image_file_test_case.bin",
+            "external_integration": external_integration.pk,
         }
 
 

nautobot/extras/choices.py

@@ -251,8 +251,10 @@ class JobResultStatusChoices(ChoiceSet):
     """
 
     STATUS_FAILURE = states.FAILURE
+    STATUS_IGNORED = states.IGNORED
     STATUS_PENDING = states.PENDING
     STATUS_RECEIVED = states.RECEIVED
+    STATUS_REJECTED = states.REJECTED
     STATUS_RETRY = states.RETRY
     STATUS_REVOKED = states.REVOKED
     STATUS_STARTED = states.STARTED
@@ -302,27 +304,30 @@ class JobResultStatusChoices(ChoiceSet):
 class LogLevelChoices(ChoiceSet):
     LOG_DEBUG = "debug"
     LOG_INFO = "info"
+    LOG_SUCCESS = "success"
     LOG_WARNING = "warning"
+    LOG_FAILURE = "failure"
     LOG_ERROR = "error"
     LOG_CRITICAL = "critical"
-    LOG_SUCCESS = "success"
 
     CHOICES = (
         (LOG_DEBUG, "Debug"),
         (LOG_INFO, "Info"),
+        (LOG_SUCCESS, "Success"),
         (LOG_WARNING, "Warning"),
+        (LOG_FAILURE, "Failure"),
         (LOG_ERROR, "Error"),
         (LOG_CRITICAL, "Critical"),
-        (LOG_SUCCESS, "Success"),
     )
 
     CSS_CLASSES = {
         LOG_DEBUG: "debug",
         LOG_INFO: "info",
+        LOG_SUCCESS: "success",
         LOG_WARNING: "warning",
+        LOG_FAILURE: "failure",
         LOG_ERROR: "error",
         LOG_CRITICAL: "critical",
-        LOG_SUCCESS: "success",
     }
 
 

nautobot/extras/forms/forms.py

@@ -1891,8 +1891,11 @@ class RoleBulkEditForm(NautobotBulkEditForm):
     color = forms.CharField(max_length=6, required=False, widget=ColorSelect())
     description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
     weight = forms.IntegerField(required=False)
-    content_types = MultipleContentTypeField(
-        queryset=RoleModelsQuery().as_queryset(), required=False, label="Content Type(s)"
+    add_content_types = MultipleContentTypeField(
+        queryset=RoleModelsQuery().as_queryset(), required=False, label="Add Content Type(s)"
+    )
+    remove_content_types = MultipleContentTypeField(
+        queryset=RoleModelsQuery().as_queryset(), required=False, label="Remove Content Type(s)"
     )
 
     class Meta:
@@ -2012,7 +2015,8 @@ class StatusBulkEditForm(NautobotBulkEditForm):
 
     pk = forms.ModelMultipleChoiceField(queryset=Status.objects.all(), widget=forms.MultipleHiddenInput)
     color = forms.CharField(max_length=6, required=False, widget=ColorSelect())
-    content_types = MultipleContentTypeField(feature="statuses", required=False, label="Content Type(s)")
+    add_content_types = MultipleContentTypeField(feature="statuses", required=False, label="Add Content Type(s)")
+    remove_content_types = MultipleContentTypeField(feature="statuses", required=False, label="Remove Content Type(s)")
 
     class Meta:
         nullable_fields = []