nautobot 2.4.18__py3-none-any.whl → 2.4.19__py3-none-any.whl

nautobot/extras/templates/extras/webhook.html

@@ -2,95 +2,95 @@
 {% load helpers %}
 
 {% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Webhook</strong>
-            </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Webhook</strong>
+        </div>
 
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Object Type(s)</td>
-                    <td>
-                        <ul>
-                            {% for content_type in content_types %}
-                                <li>{{ content_type }}</li>
-                            {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Call On:</td>
-                    <td>
-                        {{ object.type_create | render_boolean }}
-                        <span>Create</span>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>Object Type(s)</td>
+                <td>
+                    <ul>
+                        {% for content_type in content_types %}
+                            <li>{{ content_type }}</li>
+                        {% endfor %}
+                    </ul>
+                </td>
+            </tr>
+            <tr>
+                <td>Call On:</td>
+                <td>
+                    {{ object.type_create | render_boolean }}
+                    <span>Create</span>
 
-                        <span style="margin-left: 2rem;">{{ object.type_update | render_boolean }}</span>
-                        <span>Update</span>
+                    <span style="margin-left: 2rem;">{{ object.type_update | render_boolean }}</span>
+                    <span>Update</span>
 
-                        <span style="margin-left: 2rem;">{{ object.type_delete | render_boolean }}</span>
-                        <span>Delete </span>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Enabled</td>
-                    <td>{{ object.enabled | render_boolean }}</td>
-                </tr>
-            </table>
+                    <span style="margin-left: 2rem;">{{ object.type_delete | render_boolean }}</span>
+                    <span>Delete </span>
+                </td>
+            </tr>
+            <tr>
+                <td>Enabled</td>
+                <td>{{ object.enabled | render_boolean }}</td>
+            </tr>
+        </table>
 
-        </div>
+    </div>
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>HTTP</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>HTTP Method</td>
-                    <td><span>{{ object.http_method }}</span></td>
-                </tr>
-                <tr>
-                    <td>HTTP Content Type</td>
-                    <td><span>{{ object.http_content_type }}</span></td>
-                </tr>
-                <tr>
-                    <td>Payload URL</td>
-                    <td><span>{{ object.payload_url }}</span></td>
-                </tr>
-                <tr>
-                    <td>Additional Headers</td>
-                    <td><span>{% if object.additional_headers %} <pre>{{ object.additional_headers }}</pre> {% else %} {{ None }} {% endif %}</span></td>
-                </tr>
-            </table>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>HTTP</strong>
         </div>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>HTTP Method</td>
+                <td><span>{{ object.http_method }}</span></td>
+            </tr>
+            <tr>
+                <td>HTTP Content Type</td>
+                <td><span>{{ object.http_content_type }}</span></td>
+            </tr>
+            <tr>
+                <td>Payload URL</td>
+                <td><span>{{ object.payload_url }}</span></td>
+            </tr>
+            <tr>
+                <td>Additional Headers</td>
+                <td><span>{% if object.additional_headers %} <pre>{{ object.additional_headers }}</pre> {% else %} {{ None }} {% endif %}</span></td>
+            </tr>
+        </table>
+    </div>
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Security</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Secret</td>
-                    <td>{{ object.secret | placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>SSL Verification</td>
-                    <td>{{ object.ssl_verification | render_boolean }}</td>
-                </tr>
-                <tr>
-                    <td>CA File Path</td>
-                    <td><span>{{ object.ca_file_path | placeholder }}</span></td>
-                </tr>
-            </table>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Security</strong>
         </div>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>Secret</td>
+                <td>{{ object.secret | placeholder }}</td>
+            </tr>
+            <tr>
+                <td>SSL Verification</td>
+                <td>{{ object.ssl_verification | render_boolean }}</td>
+            </tr>
+            <tr>
+                <td>CA File Path</td>
+                <td><span>{{ object.ca_file_path | placeholder }}</span></td>
+            </tr>
+        </table>
+    </div>
 {% endblock content_left_page %}
 
 {% block content_right_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Body Template</strong>
-            </div>
-            <div class="panel-body">
-                {% if object.body_template %} <pre>{{ object.body_template }}</pre> {% else %} {{ None }} {% endif %}
-            </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Body Template</strong>
+        </div>
+        <div class="panel-body">
+            {% if object.body_template %} <pre>{{ object.body_template }}</pre> {% else %} {{ None }} {% endif %}
         </div>
+    </div>
 {% endblock content_right_page %}

nautobot/extras/tests/integration/test_relationships.py

@@ -34,7 +34,7 @@ class RelationshipsTestCase(SeleniumTestCase):
         device = create_test_device()
         power_panel = PowerPanel.objects.create(
             location=device.location,
-            name="Test Power Panel",
+            name="Test-Power-Panel",
         )
         power_panel_ct = ContentType.objects.get_for_model(PowerPanel)
         device_content_type = ContentType.objects.get_for_model(Device)
@@ -53,11 +53,11 @@ class RelationshipsTestCase(SeleniumTestCase):
         # Visit the device detail page
         self.browser.visit(f"{self.live_server_url}{reverse('dcim:device', kwargs={'pk': device.pk})}")
         # Check the relationship appears in the primary information tab
-        self.assertTrue(self.browser.is_text_present("power panel"))
-        self.assertTrue(self.browser.is_text_present("Power Panel"))
+        self.assertTrue(self.browser.is_text_present("Test-Power-Panel"))  # related object
+        self.assertTrue(self.browser.is_text_present("Power Panel"))  # relationship label
         # Check the relationship does NOT appear in the advanced tab
         self.browser.links.find_by_partial_text("Advanced")[0].click()
-        self.assertFalse(self.browser.is_text_present("power panel"))
+        self.assertFalse(self.browser.is_text_present("Test-Power-Panel"))
         self.assertFalse(self.browser.is_text_present("Power Panel"))
         # Set the custom_field to only show in the advanced tab
         relationship.advanced_ui = True
@@ -65,9 +65,9 @@ class RelationshipsTestCase(SeleniumTestCase):
         # Visit the device detail page
         self.browser.visit(f"{self.live_server_url}{reverse('dcim:device', kwargs={'pk': device.pk})}")
         # Check the relationship does NOT appear in the primary information tab
-        self.assertFalse(self.browser.is_text_present("power panel"))
+        self.assertFalse(self.browser.is_text_present("Test-Power-Panel"))
         self.assertFalse(self.browser.is_text_present("Power Panel"))
         # Check the relationship appears in the advanced tab
         self.browser.links.find_by_partial_text("Advanced")[0].click()
-        self.assertTrue(self.browser.is_text_present("power panel"))
+        self.assertTrue(self.browser.is_text_present("Test-Power-Panel"))
         self.assertTrue(self.browser.is_text_present("Power Panel"))

nautobot/extras/tests/test_filters.py

@@ -911,7 +911,7 @@ class JobFilterSetTestCase(FilterTestCases.FilterTestCase):
 
     def test_hidden(self):
         params = {"hidden": True}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_read_only(self):
         params = {"read_only": True}

nautobot/extras/tests/test_jobs.py

@@ -352,6 +352,7 @@ class JobTransactionTest(TransactionTestCase):
             "BulkEditObjects",
             content_type=job_ct.id,
             edit_all=False,
+            pk_list=pk_list,
             filter_query_params={},
             form_data={
                 "pk": pk_list,
@@ -395,6 +396,7 @@ class JobTransactionTest(TransactionTestCase):
             "BulkEditObjects",
             content_type=job_ct.id,
             edit_all=False,
+            pk_list=pk_list,
             filter_query_params={},
             form_data={
                 "pk": pk_list,

nautobot/extras/tests/test_views.py

@@ -4324,8 +4324,8 @@ class RoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases
                 if content_type not in role_content_types:
                     if result == "Contact Associations":
                         # AssociationContact Table in the contact tab should be there.
-                        self.assertIn(
-                            f'<strong>{result}</strong>\n                                    <div class="pull-right noprint">\n',
+                        self.assertInHTML(
+                            f'<strong>{result}</strong><div class="pull-right noprint">',
                             response_body,
                         )
                         # ContactAssociationTable related to this role instances should not be there.
@@ -4336,4 +4336,4 @@ class RoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases
                     else:
                         self.assertNotIn(f"<strong>{result}</strong>", response_body)
                 else:
-                    self.assertIn(f"<strong>{result}</strong>", response_body)
+                    self.assertInHTML(f"<strong>{result}</strong>", response_body)

nautobot/extras/urls.py

@@ -27,6 +27,7 @@ router.register("job-hooks", views.JobHookUIViewSet)
 router.register("job-queues", views.JobQueueUIViewSet)
 router.register("job-results", views.JobResultUIViewSet)
 router.register("metadata-types", views.MetadataTypeUIViewSet)
+router.register("object-changes", views.ObjectChangeUIViewSet)
 router.register("notes", views.NoteUIViewSet)
 router.register("object-metadata", views.ObjectMetadataUIViewSet)
 router.register("relationship-associations", views.RelationshipAssociationUIViewSet)
@@ -42,9 +43,6 @@ router.register("teams", views.TeamUIViewSet)
 router.register("webhooks", views.WebhookUIViewSet)
 
 urlpatterns = [
-    # Change logging
-    path("object-changes/", views.ObjectChangeListView.as_view(), name="objectchange_list"),
-    path("object-changes/<uuid:pk>/", views.ObjectChangeView.as_view(), name="objectchange"),
     # Config context schema
     path(
         "config-context-schemas/<uuid:pk>/validation/",

nautobot/extras/views.py

@@ -11,6 +11,7 @@ from django.db.models import Q
 from django.forms.utils import pretty_name
 from django.http import Http404, HttpResponse, HttpResponseForbidden
 from django.shortcuts import get_object_or_404, redirect, render
+from django.template.defaultfilters import urlencode
 from django.template.loader import get_template, TemplateDoesNotExist
 from django.urls import reverse
 from django.urls.exceptions import NoReverseMatch
@@ -35,7 +36,14 @@ from nautobot.core.models.utils import pretty_print_query, serialize_object_v2
 from nautobot.core.tables import ButtonsColumn
 from nautobot.core.templatetags import helpers
 from nautobot.core.ui import object_detail
-from nautobot.core.ui.breadcrumbs import Breadcrumbs, ModelBreadcrumbItem
+from nautobot.core.ui.breadcrumbs import (
+    BaseBreadcrumbItem,
+    Breadcrumbs,
+    context_object_attr,
+    InstanceParentBreadcrumbItem,
+    ModelBreadcrumbItem,
+    ViewNameBreadcrumbItem,
+)
 from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.ui.titles import Titles
 from nautobot.core.utils.config import get_settings_or_config
@@ -2138,6 +2146,37 @@ class JobResultUIViewSet(
     table_class = tables.JobResultTable
     queryset = JobResult.objects.all()
     action_buttons = ()
+    breadcrumbs = Breadcrumbs(
+        items={
+            "detail": [
+                ModelBreadcrumbItem(),
+                # if result.job_model is not None
+                BaseBreadcrumbItem(
+                    label=context_object_attr("job_model.grouping", context_key="result"),
+                    should_render=lambda c: c["result"].job_model is not None,
+                ),
+                InstanceParentBreadcrumbItem(
+                    instance_key="result",
+                    parent_key="job_model",
+                    parent_lookup_key="name",
+                    should_render=lambda c: c["result"].job_model is not None,
+                ),
+                # elif job in context
+                ViewNameBreadcrumbItem(
+                    view_name="extras:jobresult_list",
+                    label=context_object_attr("class_path", context_key="job"),
+                    reverse_query_params=lambda c: {"name": urlencode(c["job"].class_path)},
+                    should_render=lambda c: c["result"].job_model is None and c["job"] is not None,
+                ),
+                # else
+                BaseBreadcrumbItem(
+                    label=context_object_attr("name", context_key="result"),
+                    should_render=lambda c: c["result"].job_model is None and c["job"] is None,
+                ),
+            ]
+        },
+        detail_item_label=context_object_attr("date_created"),
+    )
 
     def get_extra_context(self, request, instance):
         context = super().get_extra_context(request, instance)
@@ -2227,18 +2266,16 @@ class JobButtonUIViewSet(NautobotUIViewSet):
 #
 # Change logging
 #
-
-
-class ObjectChangeListView(generic.ObjectListView):
+class ObjectChangeUIViewSet(ObjectDetailViewMixin, ObjectListViewMixin):
+    filterset_class = filters.ObjectChangeFilterSet
+    filterset_form_class = forms.ObjectChangeFilterForm
     queryset = ObjectChange.objects.all()
-    filterset = filters.ObjectChangeFilterSet
-    filterset_form = forms.ObjectChangeFilterForm
-    table = tables.ObjectChangeTable
-    template_name = "extras/objectchange_list.html"
+    serializer_class = serializers.ObjectChangeSerializer
+    table_class = tables.ObjectChangeTable
     action_buttons = ("export",)
 
     # 2.0 TODO: Remove this remapping and solve it at the `BaseFilterSet` as it is addressing a breaking change.
-    def get(self, request, **kwargs):
+    def get(self, request, *args, **kwargs):
         # Remappings below allow previous queries of time_before and time_after to use
         # newer methods specifying the lookup method.
 
@@ -2254,26 +2291,34 @@ class ObjectChangeListView(generic.ObjectListView):
             request.GET.update({"time__lte": request.GET.get("time_before")})
             request.GET._mutable = False
 
-        return super().get(request=request, **kwargs)
+        return super().get(request=request, *args, **kwargs)
 
+    def get_extra_context(self, request, instance):
+        """
+        Adds snapshot diff and related changes table for the object change detail view.
+        """
+        context = super().get_extra_context(request, instance)
 
-class ObjectChangeView(generic.ObjectView):
-    queryset = ObjectChange.objects.all()
+        if self.action == "retrieve":
+            related_changes = instance.get_related_changes(user=request.user).filter(request_id=instance.request_id)
+            related_changes_table = tables.ObjectChangeTable(
+                data=related_changes[:50],  # Limit for performance
+                orderable=False,
+            )
+            snapshots = instance.get_snapshots()
 
-    def get_extra_context(self, request, instance):
-        related_changes = instance.get_related_changes(user=request.user).filter(request_id=instance.request_id)
-        related_changes_table = tables.ObjectChangeTable(data=related_changes[:50], orderable=False)
+            context.update(
+                {
+                    "diff_added": snapshots["differences"]["added"],
+                    "diff_removed": snapshots["differences"]["removed"],
+                    "next_change": instance.get_next_change(request.user),
+                    "prev_change": instance.get_prev_change(request.user),
+                    "related_changes_table": related_changes_table,
+                    "related_changes_count": related_changes.count(),
+                }
+            )
 
-        snapshots = instance.get_snapshots()
-        return {
-            "diff_added": snapshots["differences"]["added"],
-            "diff_removed": snapshots["differences"]["removed"],
-            "next_change": instance.get_next_change(request.user),
-            "prev_change": instance.get_prev_change(request.user),
-            "related_changes_table": related_changes_table,
-            "related_changes_count": related_changes.count(),
-            **super().get_extra_context(request, instance),
-        }
+        return context
 
 
 class ObjectChangeLogView(generic.GenericView):
@@ -2454,8 +2499,36 @@ class NoteUIViewSet(
         ),
     )
 
-    def alter_obj(self, obj, request, url_args, url_kwargs):
-        obj.user = request.user
+    def form_save(self, form, commit=True, *args, **kwargs):
+        """
+        Save the form instance while ensuring the Note's `user` and `user_name` fields
+        are correctly populated.
+
+        Args:
+            form (Form): The validated form instance to be saved.
+            commit (bool): If True, save the instance to the database immediately.
+            *args, **kwargs: Additional arguments to maintain compatibility with
+                            the parent method signature.
+
+        Returns:
+            Note: The saved or unsaved Note instance with `user` and `user_name` set.
+
+        Behavior:
+            - Sets `user` to the currently authenticated user.
+            - Sets `user_name` to the username of the authenticated user.
+            - Saves the instance if `commit=True`.
+        """
+        # Get instance without committing to DB
+        obj = super().form_save(form, commit=False, *args, **kwargs)
+
+        # Assign user info (only authenticated users can create notes)
+        obj.user = self.request.user
+        obj.user_name = self.request.user.get_username()
+
+        # Save to DB if commit is True
+        if commit:
+            obj.save()
+
         return obj
 
 
@@ -2710,6 +2783,7 @@ class SecretUIViewSet(
                 table_title="Groups containing this secret",
                 table_class=tables.SecretsGroupTable,
                 table_attribute="secrets_groups",
+                distinct=True,
                 related_field_name="secrets",
                 footer_content_template_path=None,
             ),

nautobot/ipam/filters.py

@@ -144,7 +144,7 @@ class VRFFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyModelFil
 
     class Meta:
         model = VRF
-        fields = ["id", "name", "rd", "tags"]
+        fields = ["id", "name", "rd", "tags", "description"]
 
 
 class VRFDeviceAssignmentFilterSet(NautobotFilterSet):
@@ -503,7 +503,7 @@ class IPAddressFilterSet(
 
     class Meta:
         model = IPAddress
-        fields = ["id", "dns_name", "type", "tags", "mask_length", "nat_inside"]
+        fields = ["id", "dns_name", "type", "tags", "mask_length", "nat_inside", "description"]
 
     def generate_query__has_interface_assignments(self, value):
         """Helper method used by DynamicGroups and by _assigned_to_interface method."""

nautobot/ipam/migrations/0053_alter_vrfdeviceassignment_options_and_more.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.23 on 2025-09-17 16:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ipam", "0052_alter_ipaddress_index_together_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="vrfdeviceassignment",
+            options={"verbose_name": "VRF-device assignment"},
+        ),
+        migrations.AlterModelOptions(
+            name="vrfprefixassignment",
+            options={"verbose_name": "VRF-prefix assignment"},
+        ),
+    ]

nautobot/ipam/models.py

@@ -350,6 +350,7 @@ class VRFDeviceAssignment(BaseModel):
     is_metadata_associable_model = False
 
     class Meta:
+        verbose_name = "VRF-device assignment"
         unique_together = [
             ["vrf", "device"],
             ["vrf", "virtual_machine"],
@@ -404,6 +405,7 @@ class VRFPrefixAssignment(BaseModel):
     is_metadata_associable_model = False
 
     class Meta:
+        verbose_name = "VRF-prefix assignment"
         unique_together = ["vrf", "prefix"]
 
     def __str__(self):
@@ -882,6 +884,38 @@ class Prefix(PrimaryModel):
             )
         self.locations.set([value])
 
+    @property
+    def default_ancestors(self):
+        """
+        Return this prefix's ancestors in default order.
+
+        This is equivalent to calling `ancestors()` with default
+        arguments: ordered from larger to smaller prefix lengths,
+        excluding the prefix itself.
+        """
+        return self.ancestors()
+
+    @property
+    def default_descendants(self):
+        """
+        Return this prefix's descendants in default order.
+
+        This is equivalent to calling `descendants()` with
+        default arguments: all subnets, excluding the prefix itself.
+        """
+        return self.descendants()
+
+    @property
+    def all_ips(self):
+        """
+        All IP addresses contained within this prefix, including
+        those in descendant prefixes.
+
+        This is a property alias for `get_all_ips()` and may be
+        preferred in new code for readability.
+        """
+        return self.get_all_ips()
+
     def reparent_subnets(self):
         """
         Handle changes to the parentage of other Prefixes as a consequence of this Prefix's creation or update.

nautobot/ipam/tables.py

@@ -854,6 +854,7 @@ class ServiceTable(BaseTable):
     parent = tables.LinkColumn(order_by=("device", "virtual_machine"))
     ports = tables.TemplateColumn(template_code="{{ record.port_list }}", verbose_name="Ports")
     tags = TagColumn(url_name="ipam:service_list")
+    actions = ButtonsColumn(Service, buttons=["changelog", "edit", "delete"])
 
     class Meta(BaseTable.Meta):
         model = Service
@@ -866,5 +867,6 @@ class ServiceTable(BaseTable):
             "ip_addresses",
             "description",
             "tags",
+            "actions",
         )
-        default_columns = ("pk", "name", "parent", "protocol", "ports", "description")
+        default_columns = ("pk", "name", "parent", "protocol", "ports", "description", "actions")

nautobot/ipam/templates/ipam/inc/prefix_header_extra_content_table.html

@@ -0,0 +1,4 @@
+{% extends "components/panel/header_extra_content_table.html" %}
+{% block panel_buttons %}
+    {% include "ipam/inc/toggle_available.html" %}
+{% endblock panel_buttons %}

nautobot/ipam/templates/ipam/inc/toggle_available.html

@@ -1,11 +1,11 @@
 {% load helpers %}
 {% if show_available is not None %}
-        <div class="btn-group" role="group">
-            <a href="{{ request.path }}{% legacy_querystring request show_available='true' %}" class="btn btn-default{% if show_available %} active disabled{% endif %}">
-              <i class="mdi mdi-eye-outline"></i> Show available
-            </a>
-            <a href="{{ request.path }}{% legacy_querystring request show_available='false' %}" class="btn btn-default{% if not show_available %} active disabled{% endif %}">
-              <i class="mdi mdi-eye-off-outline"></i> Hide available
-            </a>
-        </div>
+    <div class="btn-group" role="group">
+        <a href="{{ request.path }}{% legacy_querystring request show_available='true' %}" class="btn btn-default btn-xs{% if show_available %} active disabled{% endif %}">
+            <i class="mdi mdi-eye-outline"></i> Show available
+        </a>
+        <a href="{{ request.path }}{% legacy_querystring request show_available='false' %}" class="btn btn-default btn-xs{% if not show_available %} active disabled{% endif %}">
+            <i class="mdi mdi-eye-off-outline"></i> Hide available
+        </a>
+    </div>
 {% endif %}

nautobot/ipam/templates/ipam/inc/vlangroup_header.html

@@ -5,10 +5,10 @@
         </a>
     {% endif %}
     {% if perms.ipam.change_vlangroup %}
-               <a href="{% url 'ipam:vlangroup_edit' pk=object.pk %}" class="btn btn-warning">
-                       <span class="mdi mdi-pencil" aria-hidden="true"></span>
-                       Edit this VLAN Group
-               </a>
+        <a href="{% url 'ipam:vlangroup_edit' pk=object.pk %}" class="btn btn-warning">
+            <span class="mdi mdi-pencil" aria-hidden="true"></span>
+            Edit this VLAN Group
+        </a>
     {% endif %}
 </div>
 <h1>{{ object }}</h1>