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

nautobot/core/tests/test_authentication.py

@@ -383,14 +383,31 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         )
         obj_perm.users.add(self.user)
         obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
-
+        related_obj_perm = ObjectPermission.objects.create(
+            name="Related object permission",
+            actions=["view"],
+        )
+        related_obj_perm.users.add(self.user)
+        related_obj_perm.object_types.add(
+            ContentType.objects.get_for_model(Namespace),
+            ContentType.objects.get_for_model(Status),
+            ContentType.objects.get_for_model(Location),
+        )
         # Attempt to create a non-permitted object
         response = self.client.post(url, data, format="json", **self.header)
         self.assertEqual(response.status_code, 403)
         self.assertEqual(Prefix.objects.count(), initial_count)
 
-        # Create a permitted object
+        # Attempt to create a permitted object without related object permissions
         data["location"] = self.locations[0].pk
+        related_obj_perm.users.remove(self.user)
+        response = self.client.post(url, data, format="json", **self.header)
+        self.assertEqual(response.status_code, 400)
+        self.assertIn(b"Related object not found using the provided attribute", response.content)
+        self.assertEqual(Prefix.objects.count(), initial_count)
+
+        # Create a permitted object with related object permissions
+        related_obj_perm.users.add(self.user)
         response = self.client.post(url, data, format="json", **self.header)
         self.assertEqual(response.status_code, 201)
         self.assertEqual(Prefix.objects.count(), initial_count + 1)
@@ -411,17 +428,33 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         )
         obj_perm.users.add(self.user)
         obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
-
+        related_obj_perm = ObjectPermission.objects.create(
+            name="Related object permission",
+            actions=["view"],
+        )
+        related_obj_perm.users.add(self.user)
+        related_obj_perm.object_types.add(
+            ContentType.objects.get_for_model(Namespace),
+            ContentType.objects.get_for_model(Status),
+            ContentType.objects.get_for_model(Location),
+        )
         # Attempt to edit a non-permitted object
         data = {"location": self.locations[0].pk}
         url = reverse("ipam-api:prefix-detail", kwargs={"pk": self.prefixes[3].pk})
         response = self.client.patch(url, data, format="json", **self.header)
         self.assertEqual(response.status_code, 404)
 
-        # Edit a permitted object
+        # Attempt to edit a permitted object without related object permissions
+        related_obj_perm.users.remove(self.user)
         data["status"] = self.statuses[1].pk
         url = reverse("ipam-api:prefix-detail", kwargs={"pk": self.prefixes[0].pk})
         response = self.client.patch(url, data, format="json", **self.header)
+        self.assertEqual(response.status_code, 400)
+        self.assertIn(b"Related object not found using the provided attribute", response.content)
+
+        # Edit a permitted object with related object permissions
+        related_obj_perm.users.add(self.user)
+        response = self.client.patch(url, data, format="json", **self.header)
         self.assertEqual(response.status_code, 200)
 
         # Attempt to modify a permitted object to a non-permitted object
@@ -456,6 +489,32 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         response = self.client.delete(url, format="json", **self.header)
         self.assertEqual(response.status_code, 204)
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_related_object_permission_constraints_on_get_requests(self):
+        """
+        Users who have permission to view Location objects, but not LocationType and Status objects
+        should still be able to view Location objects from the API.
+        """
+        self.add_permissions("dcim.view_location")
+        response = self.client.get(reverse("dcim-api:location-list"), **self.header)
+        self.assertEqual(response.status_code, 200)
+        # we should be able to get all the locations
+        self.assertEqual(len(response.data["results"]), Location.objects.count())
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_related_object_permission_constraints_on_patch_requests(self):
+        """
+        Users who have permission to view and change Location objects, but not LocationType and Status objects
+        should still be able to change a Location object's name from the API.
+        """
+        self.add_permissions("dcim.view_location", "dcim.change_location")
+        location = Location.objects.first()
+        data = {"name": "New Location Name"}
+        url = reverse("dcim-api:location-detail", kwargs={"pk": location.pk})
+        response = self.client.patch(url, data, format="json", **self.header)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data["name"], "New Location Name")
+
     @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
     def test_user_token_constraints(self):
         """
@@ -487,6 +546,16 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         )
         obj_perm.users.add(self.user, obj_user2)
         obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
+        related_obj_perm = ObjectPermission.objects.create(
+            name="Related object permission",
+            actions=["view"],
+        )
+        related_obj_perm.users.add(self.user, obj_user2)
+        related_obj_perm.object_types.add(
+            ContentType.objects.get_for_model(Namespace),
+            ContentType.objects.get_for_model(Status),
+            ContentType.objects.get_for_model(Location),
+        )
         # Create one Prefix object per user
         self.client.post(url, data[0], format="json", **self.header)
         self.client.post(url, data[1], format="json", **header_user2)
@@ -550,6 +619,16 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         )
         obj_perm.users.add(self.user, obj_user2)
         obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
+        related_obj_perm = ObjectPermission.objects.create(
+            name="Related object permission",
+            actions=["view"],
+        )
+        related_obj_perm.users.add(self.user, obj_user2)
+        related_obj_perm.object_types.add(
+            ContentType.objects.get_for_model(Namespace),
+            ContentType.objects.get_for_model(Status),
+            ContentType.objects.get_for_model(Location),
+        )
         # Create one Prefix object per user
         self.client.post(url, data[0], format="json", **self.header)
         self.client.post(url, data[1], format="json", **header_user2)

nautobot/core/tests/test_forms.py

@@ -486,20 +486,23 @@ class NumericArrayFieldTest(TestCase):
         self.field = dcim_forms.DeviceFilterForm().fields["device_redundancy_group_priority"]
 
     def test_valid_input(self):
-        # Mapping of input => expected
-        tests = {
-            None: [],
-            "": [],
-            "80,443-444": [80, 443, 444],
-            "1024-1028,31337": [1024, 1025, 1026, 1027, 1028, 31337],
-        }
-        for test, expected in tests.items():
+        #  List of (input, expected output) tuples
+        tests = [
+            (None, []),
+            ("", []),
+            ("80,443-444", [80, 443, 444]),
+            ("1024-1028,31337", [1024, 1025, 1026, 1027, 1028, 31337]),
+            (["47-49", "103"], [47, 48, 49, 103]),
+            ([231, 432, 313], [231, 313, 432]),
+        ]
+        for test, expected in tests:
             self.assertEqual(self.field.clean(test), expected)
 
     def test_invalid_input(self):
         tests = [
             "pizza",
             "-41",
+            "[84,52,33]",
         ]
         for test in tests:
             with self.assertRaises(django_forms.ValidationError):

nautobot/core/tests/test_graphql.py

@@ -1,3 +1,4 @@
+import contextlib
 import datetime
 import random
 import types
@@ -8,6 +9,7 @@ from django.apps import apps
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
+from django.core.cache import cache
 from django.db.models import Count, Q
 from django.test import override_settings, TestCase
 from django.test.client import RequestFactory
@@ -17,6 +19,7 @@ from graphene_django.registry import get_global_registry
 from graphene_django.settings import graphene_settings
 from graphql import get_default_backend, GraphQLError
 from graphql.error.located_error import GraphQLLocatedError
+import redis.exceptions
 from rest_framework import status
 
 from nautobot.circuits.models import CircuitTermination, Provider
@@ -396,6 +399,12 @@ class GraphQLExtendSchemaRelationship(GraphQLTestCaseBase):
         self.location_schema = generate_schema_type(app_name="dcim", model=Location)
         self.vlan_schema = generate_schema_type(app_name="ipam", model=VLAN)
 
+    def tearDown(self):
+        """Ensure that relationship caches are cleared to avoid leakage into other tests."""
+        with contextlib.suppress(redis.exceptions.ConnectionError):
+            cache.delete_pattern(f"{Relationship.objects.get_for_model_source.cache_key_prefix}.*")
+            cache.delete_pattern(f"{Relationship.objects.get_for_model_destination.cache_key_prefix}.*")
+
     def test_extend_relationship_default_prefix(self):
         """Verify that relationships are correctly added to the schema."""
         schema = extend_schema_type_relationships(self.vlan_schema, VLAN)

nautobot/core/tests/test_jobs.py

@@ -353,6 +353,13 @@ class ImportObjectsTestCase(TransactionTestCase):
             self.assertEqual(log_successes[4].message, "Created 4 status object(s) from 5 row(s) of data")
 
     def test_csv_import_contact_assignment(self):
+        self.add_permissions(
+            "dcim.view_locationtype",
+            "extras.view_status",
+            "dcim.view_location",
+            "extras.add_role",
+            "extras.add_contact",
+        )
         location_types_csv = "\n".join(["name", "ContactAssignmentImportTestLocationType"])
         locations_csv = "\n".join(
             [

nautobot/core/ui/object_detail.py

@@ -375,6 +375,11 @@ class Tab(Component):
 class DistinctViewTab(Tab):
     """
     A Tab that doesn't render inline on the same page, but instead links to a distinct view of its own when clicked.
+
+    Args:
+        url_name (str): The name of the URL pattern to link to, which will be reversed to generate the URL.
+        label_wrapper_template_path (str, optional): Template path to render the tab label to HTML.
+        related_object_attribute (str, optional): The name of the related object attribute to count for the tab label.
     """
 
     def __init__(
@@ -382,9 +387,11 @@ class DistinctViewTab(Tab):
         *,
         url_name,
         label_wrapper_template_path="components/tab/label_wrapper_distinct_view.html",
+        related_object_attribute="",
         **kwargs,
     ):
         self.url_name = url_name
+        self.related_object_attribute = related_object_attribute
         super().__init__(label_wrapper_template_path=label_wrapper_template_path, **kwargs)
 
     def get_extra_context(self, context: Context):
@@ -393,6 +400,30 @@ class DistinctViewTab(Tab):
     def render(self, context: Context):
         return ""
 
+    def render_label(self, context: Context):
+        if not self.related_object_attribute:
+            return super().render_label(context)
+
+        obj = get_obj_from_context(context)
+        if not hasattr(obj, self.related_object_attribute):
+            logger.warning(
+                f"{obj} does not have a related attribute {self.related_object_attribute} to count for tab label."
+            )
+            return super().render_label(context)
+
+        try:
+            related_obj_count = getattr(obj, self.related_object_attribute).count()
+            return format_html(
+                "{} {}",
+                self.label,
+                render_to_string("utilities/templatetags/badge.html", badge(related_obj_count)),
+            )
+        except AttributeError:
+            logger.warning(
+                f"{obj}'s attribute {self.related_object_attribute} is not a related manager to count for tab label."
+            )
+            return super().render_label(context)
+
 
 class Panel(Component):
     """Base class for defining an individual display panel within a Layout within a Tab."""

nautobot/dcim/factory.py

@@ -680,6 +680,7 @@ class SoftwareImageFileFactory(PrimaryModelFactory):
         has_hashing_algorithm = NautobotBoolIterator()
         has_image_file_size = NautobotBoolIterator()
         has_download_url = NautobotBoolIterator()
+        has_external_integration = NautobotBoolIterator()
 
     status = random_instance(
         lambda: Status.objects.get_for_model(SoftwareImageFile),
@@ -698,6 +699,7 @@ class SoftwareImageFileFactory(PrimaryModelFactory):
     default_image = factory.LazyAttribute(
         lambda o: not o.software_version.software_image_files.filter(default_image=True).exists()
     )
+    external_integration = factory.Maybe("has_external_integration", random_instance(ExternalIntegration))
 
 
 class SoftwareVersionFactory(PrimaryModelFactory):

nautobot/dcim/filters/__init__.py

@@ -1791,6 +1791,11 @@ class SoftwareImageFileFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
     default_image = django_filters.BooleanFilter(
         label="Is default image for associated software version",
     )
+    external_integration = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=ExternalIntegration.objects.all(),
+        to_field_name="name",
+        label="External integration (name or ID)",
+    )
 
     class Meta:
         model = SoftwareImageFile

nautobot/dcim/forms.py

@@ -36,6 +36,7 @@ from nautobot.core.forms import (
     TagFilterField,
 )
 from nautobot.core.forms.constants import BOOLEAN_WITH_BLANK_CHOICES
+from nautobot.core.forms.fields import LaxURLField
 from nautobot.dcim.form_mixins import (
     LocatableModelBulkEditFormMixin,
     LocatableModelFilterFormMixin,
@@ -4773,7 +4774,11 @@ class SoftwareImageFileBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFo
     )
     image_file_size = forms.IntegerField(required=False)
     default_image = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect, label="Is default image")
-    download_url = forms.URLField(required=False)
+    download_url = LaxURLField(required=False)
+    external_integration = DynamicModelChoiceField(
+        queryset=ExternalIntegration.objects.all(),
+        required=False,
+    )
 
     class Meta:
         model = SoftwareImageFile
@@ -4782,6 +4787,7 @@ class SoftwareImageFileBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFo
             "hashing_algorithm",
             "image_file_size",
             "download_url",
+            "external_integration",
         ]
 
 
@@ -4816,6 +4822,10 @@ class SoftwareImageFileFilterForm(NautobotFilterForm, StatusModelFilterFormMixin
         label="Has device types",
         widget=StaticSelect2(choices=BOOLEAN_WITH_BLANK_CHOICES),
     )
+    external_integration = DynamicModelChoiceField(
+        queryset=ExternalIntegration.objects.all(),
+        required=False,
+    )
 
     tags = TagFilterField(model)
 
@@ -4829,6 +4839,7 @@ class SoftwareImageFileFilterForm(NautobotFilterForm, StatusModelFilterFormMixin
         "download_url",
         "device_types",
         "has_device_types",
+        "external_integration",
         "status",
         "tags",
     ]
@@ -4843,6 +4854,11 @@ class SoftwareImageFileForm(NautobotModelForm):
         label="Device Types",
     )
 
+    external_integration = DynamicModelChoiceField(
+        queryset=ExternalIntegration.objects.all(),
+        required=False,
+    )
+
     field_order = [
         "software_version",
         "image_file_name",

nautobot/dcim/migrations/0068_alter_softwareimagefile_download_url.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.19 on 2025-03-06 19:34
+
+from django.db import migrations
+
+import nautobot.core.models.fields
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("dcim", "0067_controllermanageddevicegroup_tenant"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="softwareimagefile",
+            name="download_url",
+            field=nautobot.core.models.fields.LaxURLField(blank=True),
+        ),
+    ]

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>