nautobot 3.0.0a2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/extras/views.py

@@ -1,3 +1,4 @@
+from functools import partial
 import logging
 from typing import Optional
 from urllib.parse import parse_qs
@@ -24,6 +25,7 @@ from django_tables2 import RequestConfig
 from jsonschema.validators import Draft7Validator
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
 
 from nautobot.core.choices import ButtonActionColorChoices
 from nautobot.core.constants import PAGINATE_COUNT_DEFAULT
@@ -59,6 +61,7 @@ from nautobot.core.views.mixins import (
     ObjectBulkDestroyViewMixin,
     ObjectBulkUpdateViewMixin,
     ObjectChangeLogViewMixin,
+    ObjectDataComplianceViewMixin,
     ObjectDestroyViewMixin,
     ObjectDetailViewMixin,
     ObjectEditViewMixin,
@@ -90,6 +93,8 @@ from nautobot.ipam.models import IPAddress, Prefix, VLAN
 from nautobot.ipam.tables import IPAddressTable, PrefixTable, VLANTable
 from nautobot.virtualization.models import VirtualMachine, VMInterface
 from nautobot.virtualization.tables import VirtualMachineTable, VMInterfaceTable
+from nautobot.vpn.models import VPN, VPNProfile, VPNTunnel, VPNTunnelEndpoint
+from nautobot.vpn.tables import VPNProfileTable, VPNTable, VPNTunnelEndpointTable, VPNTunnelTable
 
 from . import filters, forms, jobs_ui, tables
 from .api import serializers
@@ -323,6 +328,7 @@ class ApprovalWorkflowUIViewSet(
                 section=SectionChoices.RIGHT_HALF,
                 exclude_columns=["approval_workflow"],
                 add_button_route=None,
+                enable_related_link=False,
             ),
         ],
     )
@@ -409,6 +415,7 @@ class ApprovalWorkflowStageUIViewSet(
                 section=SectionChoices.RIGHT_HALF,
                 exclude_columns=["approval_workflow_stage"],
                 table_title="Responses",
+                enable_related_link=False,
             ),
         ],
     )
@@ -754,6 +761,7 @@ class ConfigContextUIViewSet(NautobotUIViewSet):
                     "locations",
                     "roles",
                     "device_types",
+                    "device_families",
                     "platforms",
                     "cluster_groups",
                     "clusters",
@@ -964,6 +972,7 @@ class ContactUIViewSet(NautobotUIViewSet):
                 table_filter="contact",
                 table_title="Contact For",
                 add_button_route=None,
+                enable_related_link=False,
             ),
         ),
     )
@@ -1262,12 +1271,7 @@ class DynamicGroupUIViewSet(NautobotUIViewSet):
         elif self.action == "retrieve":
             model = instance.model
             table_class = get_table_for_model(model)
-            if instance.group_type != DynamicGroupTypeChoices.TYPE_STATIC:
-                # Ensure that members cache is up-to-date for this specific group
-                members = instance.update_cached_members()
-                messages.success(request, f"Refreshed cached members list for {instance}")
-            else:
-                members = instance.members
+            members = instance.members
             if table_class is not None:
                 if hasattr(members, "without_tree_fields"):
                     members = members.without_tree_fields()
@@ -1322,7 +1326,7 @@ class DynamicGroupUIViewSet(NautobotUIViewSet):
 
         return context
 
-    def form_save(self, form, **kwargs):
+    def form_save(self, form, commit=True, **kwargs):
         obj = form.save(commit=False)
         context = self.get_extra_context(self.request, obj)
 
@@ -1341,10 +1345,18 @@ class DynamicGroupUIViewSet(NautobotUIViewSet):
                         form.add_error(None, msg)
                 raise
 
-        # After filters have been set, now we save the object to the database.
-        obj.save()
-        # Save m2m fields, such as Tags https://docs.djangoproject.com/en/3.2/topics/forms/modelforms/#the-save-method
-        form.save_m2m()
+        if commit:
+            # After filters have been set, now we save the object to the database.
+            obj.save(update_cached_members=False)
+            # Save m2m fields, such as Tags https://docs.djangoproject.com/en/3.2/topics/forms/modelforms/#the-save-method
+            form.save_m2m()
+
+            if obj.group_type != DynamicGroupTypeChoices.TYPE_STATIC:
+                messages.warning(
+                    self.request,
+                    "Dynamic Group membership is not automatically recalculated after creating/editing the group, "
+                    'as it may take some time to complete. You can use the "Refresh Members" button when ready.',
+                )
 
         # Process the formsets for children
         children = context.get("children")
@@ -1359,7 +1371,7 @@ class DynamicGroupUIViewSet(NautobotUIViewSet):
                         added_errors.add(msg)
             raise ValidationError("invalid DynamicGroupMembershipFormSet")
 
-        if children:
+        if commit and children:
             children.save()
 
         return obj
@@ -1658,6 +1670,7 @@ class GitRepositoryUIViewSet(NautobotUIViewSet):
     filterset_class = filters.GitRepositoryFilterSet
     serializer_class = serializers.GitRepositorySerializer
     table_class = tables.GitRepositoryTable
+    view_titles = Titles(titles={"result": "{{ object.display|default:object }} - Synchronization Status"})
 
     def get_extra_context(self, request, instance=None):
         context = super().get_extra_context(request, instance)
@@ -1701,14 +1714,18 @@ class GitRepositoryUIViewSet(NautobotUIViewSet):
         job_result = instance.get_latest_sync()
 
         context = {
+            **super().get_extra_context(request, instance),
             "result": job_result or {},
-            "base_template": "extras/gitrepository.html",
+            "base_template": "extras/gitrepository_retrieve.html",
             "object": instance,
             "active_tab": "result",
             "verbose_name": instance._meta.verbose_name,
         }
 
-        return render(request, "extras/gitrepository_result.html", context)
+        return Response(
+            context,
+            template_name="extras/gitrepository_result.html",
+        )
 
     @action(
         detail=True,
@@ -1745,6 +1762,7 @@ class GraphQLQueryUIViewSet(
     ObjectDestroyViewMixin,
     ObjectBulkDestroyViewMixin,
     ObjectChangeLogViewMixin,
+    ObjectDataComplianceViewMixin,
     ObjectNotesViewMixin,
 ):
     filterset_form_class = forms.GraphQLQueryFilterForm
@@ -1755,6 +1773,27 @@ class GraphQLQueryUIViewSet(
     table_class = tables.GraphQLQueryTable
     action_buttons = ("add",)
 
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=(
+            object_detail.ObjectFieldsPanel(
+                label="Query",
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields=["name", "query", "variables"],
+                value_transforms={
+                    "query": [lambda val: format_html('<pre><code class="language-graphql">{}</code></pre>', val)],
+                    "variables": [lambda val: helpers.render_json(val, syntax_highlight=True, pretty_print=True)],
+                },
+            ),
+            object_detail.Panel(
+                weight=100,
+                section=object_detail.SectionChoices.RIGHT_HALF,
+                body_content_template_path="extras/inc/graphqlquery_execute.html",
+                body_wrapper_template_path="components/panel/body_wrapper_table.html",
+            ),
+        )
+    )
+
 
 #
 # Image attachments
@@ -2010,55 +2049,66 @@ class JobRunView(ObjectPermissionRequiredMixin, View):
             ignore_singleton_lock = job_form.cleaned_data.pop("_ignore_singleton_lock", False)
             schedule_type = schedule_form.cleaned_data["_schedule_type"]
 
-            scheduled_job = ScheduledJob.create_schedule(
-                job_model,
-                request.user,
-                name=schedule_form.cleaned_data.get("_schedule_name"),
-                start_time=schedule_form.cleaned_data.get("_schedule_start_time"),
-                interval=schedule_type,
-                crontab=schedule_form.cleaned_data.get("_recurrence_custom_time"),
-                job_queue=job_queue,
-                profile=profile,
-                ignore_singleton_lock=ignore_singleton_lock,
-                validated_save=False,
-                **job_class.serialize_data(job_form.cleaned_data),
-            )
-            scheduled_job_has_approval_workflow = scheduled_job.has_approval_workflow_definition()
-            is_scheduled = schedule_type in JobExecutionType.SCHEDULE_CHOICES
-            if job_model.has_sensitive_variables and scheduled_job_has_approval_workflow:
-                messages.error(
-                    request,
-                    "Unable to run or schedule job: "
-                    "This job is flagged as possibly having sensitive variables but also has an applicable approval workflow definition."
-                    "Modify or remove the approval workflow definition or modify the job to set `has_sensitive_variables` to False.",
+            with transaction.atomic():
+                scheduled_job = ScheduledJob.create_schedule(
+                    job_model,
+                    request.user,
+                    name=schedule_form.cleaned_data.get("_schedule_name"),
+                    start_time=schedule_form.cleaned_data.get("_schedule_start_time"),
+                    interval=schedule_type,
+                    crontab=schedule_form.cleaned_data.get("_recurrence_custom_time"),
+                    job_queue=job_queue,
+                    profile=profile,
+                    ignore_singleton_lock=ignore_singleton_lock,
+                    **job_class.serialize_data(job_form.cleaned_data),
                 )
-            else:
-                if dryrun and not is_scheduled:
-                    # Enqueue job for immediate execution when dryrun and (no schedule, no has_sensitive_variables)
+                scheduled_job_has_approval_workflow = scheduled_job.has_approval_workflow_definition()
+                is_scheduled = schedule_type in JobExecutionType.SCHEDULE_CHOICES
+                if job_model.has_sensitive_variables and scheduled_job_has_approval_workflow:
+                    messages.error(
+                        request,
+                        "Unable to run or schedule job: "
+                        "This job is flagged as possibly having sensitive variables but also has an applicable approval workflow definition."
+                        "Modify or remove the approval workflow definition or modify the job to set `has_sensitive_variables` to False.",
+                    )
+                    scheduled_job.delete()
+                    scheduled_job = None
+                else:
+                    if dryrun and not is_scheduled:
+                        # Enqueue job for immediate execution when dryrun and (no schedule, no has_sensitive_variables)
+                        scheduled_job.delete()
+                        scheduled_job = None
+                        return self._handle_immediate_execution(
+                            request,
+                            job_model,
+                            job_class,
+                            job_form,
+                            profile,
+                            ignore_singleton_lock,
+                            job_queue,
+                            return_url,
+                        )
+                    # Step 1: Check if approval is required
+                    if scheduled_job_has_approval_workflow:
+                        return self._handle_approval_workflow_response(request, scheduled_job, return_url)
+
+                    # Step 3: If approval is not required
+                    if is_scheduled:
+                        return self._handle_scheduled_job_response(request, scheduled_job, return_url)
+
+                    # Step 4: Immediate execution (no schedule, no approval)
+                    scheduled_job.delete()
+                    scheduled_job = None
                     return self._handle_immediate_execution(
-                        request, job_model, job_class, job_form, profile, ignore_singleton_lock, job_queue, return_url
+                        request,
+                        job_model,
+                        job_class,
+                        job_form,
+                        profile,
+                        ignore_singleton_lock,
+                        job_queue,
+                        return_url,
                     )
-                # Step 1: Check if approval is required
-                if scheduled_job_has_approval_workflow:
-                    scheduled_job.validated_save()
-                    return self._handle_approval_workflow_response(request, scheduled_job, return_url)
-
-                # Step 3: If approval is not required
-                if is_scheduled:
-                    scheduled_job.validated_save()
-                    return self._handle_scheduled_job_response(request, scheduled_job, return_url)
-
-                # Step 4: Immediate execution (no schedule, no approval)
-                return self._handle_immediate_execution(
-                    request,
-                    job_model,
-                    job_class,
-                    job_form,
-                    profile,
-                    ignore_singleton_lock,
-                    job_queue,
-                    return_url,
-                )
 
         if return_url:
             return redirect(return_url)
@@ -2086,7 +2136,7 @@ class JobRunView(ObjectPermissionRequiredMixin, View):
 
 class JobView(generic.ObjectView):
     queryset = JobModel.objects.all()
-    template_name = "extras/job_detail.html"
+    template_name = "generic/object_retrieve.html"
     object_detail_content = object_detail.ObjectDetailContent(
         panels=[
             object_detail.ObjectFieldsPanel(
@@ -2107,13 +2157,17 @@ class JobView(generic.ObjectView):
                 section=SectionChoices.LEFT_HALF,
                 label="Job",
                 fields=["grouping", "name", "description", "enabled"],
+                value_transforms={
+                    "description": [helpers.render_markdown],
+                },
             ),
             object_detail.ObjectsTablePanel(
                 weight=100,
                 section=SectionChoices.FULL_WIDTH,
                 table_class=tables.JobResultTable,
-                table_title="JobResults",
-                table_filter=["job_model"],
+                table_title="Job Results",
+                table_filter="job_model",
+                exclude_columns=["name", "job_model"],
             ),
             jobs_ui.JobObjectFieldsPanel(
                 weight=100,
@@ -2469,7 +2523,7 @@ class SavedViewUIViewSet(
 
 
 class ScheduledJobListView(generic.ObjectListView):
-    queryset = ScheduledJob.objects.enabled()
+    queryset = ScheduledJob.objects.all()
     table = tables.ScheduledJobTable
     filterset = filters.ScheduledJobFilterSet
     filterset_form = forms.ScheduledJobFilterForm
@@ -2701,6 +2755,12 @@ class ObjectChangeUIViewSet(ObjectDetailViewMixin, ObjectListViewMixin):
     table_class = tables.ObjectChangeTable
     action_buttons = ("export",)
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.object_detail_content = object_detail.ObjectDetailContent()
+        # Remove "Advanced" tab while keeping the main.
+        self.object_detail_content.tabs = self.object_detail_content.tabs[:1]
+
     # 2.0 TODO: Remove this remapping and solve it at the `BaseFilterSet` as it is addressing a breaking change.
     def get(self, request, *args, **kwargs):
         # Remappings below allow previous queries of time_before and time_after to use
@@ -2789,7 +2849,7 @@ class ObjectChangeLogView(generic.GenericView):
 
         return render(
             request,
-            "extras/object_changelog.html",
+            "generic/object_changelog.html",
             {
                 "object": obj,
                 "verbose_name": obj._meta.verbose_name,
@@ -2885,7 +2945,12 @@ class ObjectMetadataUIViewSet(
 
 
 class NoteUIViewSet(
-    ObjectChangeLogViewMixin, ObjectDestroyViewMixin, ObjectDetailViewMixin, ObjectEditViewMixin, ObjectListViewMixin
+    ObjectDestroyViewMixin,
+    ObjectDetailViewMixin,
+    ObjectEditViewMixin,
+    ObjectListViewMixin,
+    ObjectChangeLogViewMixin,
+    ObjectDataComplianceViewMixin,
 ):
     filterset_class = filters.NoteFilterSet
     filterset_form_class = forms.NoteFilterForm
@@ -2996,7 +3061,7 @@ class ObjectNotesView(generic.GenericView):
 
         return render(
             request,
-            "extras/object_notes.html",
+            "generic/object_notes.html",
             {
                 "object": obj,
                 "verbose_name": obj._meta.verbose_name,
@@ -3171,6 +3236,30 @@ class RoleUIViewSet(viewsets.NautobotUIViewSet):
                 vdc_table.columns.hide("role")
                 RequestConfig(request, paginate).configure(vdc_table)
                 context["vdc_table"] = vdc_table
+            if ContentType.objects.get_for_model(VPN) in context["content_types"]:
+                vpns = instance.vpns.restrict(request.user, "view")
+                vpn_table = VPNTable(vpns)
+                vpn_table.columns.hide("role")
+                RequestConfig(request, paginate).configure(vpn_table)
+                context["vpn_table"] = vpn_table
+            if ContentType.objects.get_for_model(VPNProfile) in context["content_types"]:
+                vpn_profiles = instance.vpn_profiles.restrict(request.user, "view")
+                vpn_profile_table = VPNProfileTable(vpn_profiles)
+                vpn_profile_table.columns.hide("role")
+                RequestConfig(request, paginate).configure(vpn_profile_table)
+                context["vpn_profile_table"] = vpn_profile_table
+            if ContentType.objects.get_for_model(VPNTunnel) in context["content_types"]:
+                vpn_tunnels = instance.vpn_tunnels.restrict(request.user, "view")
+                vpn_tunnel_table = VPNTunnelTable(vpn_tunnels)
+                vpn_tunnel_table.columns.hide("role")
+                RequestConfig(request, paginate).configure(vpn_tunnel_table)
+                context["vpn_tunnel_table"] = vpn_tunnel_table
+            if ContentType.objects.get_for_model(VPNTunnelEndpoint) in context["content_types"]:
+                vpn_tunnel_endpoints = instance.vpn_tunnel_endpoints.restrict(request.user, "view")
+                vpn_tunnel_endpoint_table = VPNTunnelEndpointTable(vpn_tunnel_endpoints)
+                vpn_tunnel_endpoint_table.columns.hide("role")
+                RequestConfig(request, paginate).configure(vpn_tunnel_endpoint_table)
+                context["vpn_tunnel_endpoint_table"] = vpn_tunnel_endpoint_table
         return context
 
 
@@ -3188,6 +3277,7 @@ class SecretUIViewSet(
     ObjectBulkDestroyViewMixin,
     # no ObjectBulkUpdateViewMixin here yet
     ObjectChangeLogViewMixin,
+    ObjectDataComplianceViewMixin,
     ObjectNotesViewMixin,
 ):
     queryset = Secret.objects.all()
@@ -3269,7 +3359,8 @@ class SecretsGroupUIViewSet(NautobotUIViewSet):
             object_detail.ObjectsTablePanel(
                 table_class=tables.SecretsGroupAssociationTable,
                 table_filter="secrets_group",
-                related_field_name="secrets_group",
+                related_field_name="secrets_groups",
+                related_list_url_name="extras:secret_list",
                 table_title="Secrets",
                 section=SectionChoices.LEFT_HALF,
                 weight=200,
@@ -3375,6 +3466,7 @@ class TagUIViewSet(NautobotUIViewSet):
                 select_related_fields=["content_type"],
                 prefetch_related_fields=["content_object"],
                 include_paginator=True,
+                enable_related_link=False,
             ),
         ),
     )
@@ -3431,6 +3523,7 @@ class TeamUIViewSet(NautobotUIViewSet):
                 table_filter="team",
                 table_title="Contact For",
                 add_button_route=None,
+                enable_related_link=False,
             ),
         )
     )
@@ -3463,7 +3556,7 @@ class WebhookUIViewSet(NautobotUIViewSet):
                 section=SectionChoices.LEFT_HALF,
                 weight=100,
                 fields=("http_method", "http_content_type", "payload_url", "additional_headers"),
-                value_transforms={"additional_headers": [helpers.pre_tag]},
+                value_transforms={"additional_headers": [partial(helpers.pre_tag, format_empty_value=False)]},
             ),
             object_detail.ObjectFieldsPanel(
                 label="Security",
@@ -3490,8 +3583,8 @@ class WebhookUIViewSet(NautobotUIViewSet):
 
 
 class JobObjectChangeLogView(ObjectChangeLogView):
-    base_template = "extras/job_detail.html"
+    base_template = "generic/object_retrieve.html"
 
 
 class JobObjectNotesView(ObjectNotesView):
-    base_template = "extras/job_detail.html"
+    base_template = "generic/object_retrieve.html"

nautobot/ipam/factory.py

@@ -278,9 +278,16 @@ class NamespaceFactory(PrimaryModelFactory):
 
     class Meta:
         model = Namespace
+        exclude = ("has_tenant", "has_description")
 
     name = UniqueFaker("text", max_nb_chars=20)  # could be up to CHARFIELD_MAX_LENGTH but that gets unwieldy fast
 
+    has_tenant = NautobotBoolIterator()
+    tenant = factory.Maybe("has_tenant", random_instance(Tenant))
+
+    has_description = NautobotBoolIterator()
+    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=CHARFIELD_MAX_LENGTH), "")
+
 
 class PrefixFactory(PrimaryModelFactory):
     """Create random Prefix objects with randomized data.

nautobot/ipam/filter_mixins.py

@@ -0,0 +1,38 @@
+import uuid
+
+from nautobot.core.filters import NaturalKeyOrPKMultipleChoiceFilter
+from nautobot.ipam import formfields
+from nautobot.ipam.models import Prefix
+
+
+class PrefixFilter(NaturalKeyOrPKMultipleChoiceFilter):
+    """
+    Filter that supports filtering a foreign key to Prefix by either its PK or by a literal `prefix` string.
+    """
+
+    field_class = formfields.PrefixFilterFormField
+
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault("to_field_name", "pk")
+        kwargs.setdefault("label", "Prefix (ID or prefix string)")
+        kwargs.setdefault("queryset", Prefix.objects.all())
+        super().__init__(*args, **kwargs)
+
+    def get_filter_predicate(self, v):
+        # Null value filtering
+        if v is None:
+            return {f"{self.field_name}__isnull": True}
+
+        # If value is a model instance, stringify it to a pk.
+        if isinstance(v, Prefix):
+            v = v.pk
+
+        # Try to cast the value to a UUID to distinguish between PKs and prefix strings
+        v = str(v)
+        try:
+            uuid.UUID(v)
+            return {self.field_name: v}
+        except (AttributeError, TypeError, ValueError):
+            # It's a prefix string
+            prefixes_queryset = Prefix.objects.net_equals(v)
+            return {f"{self.field_name}__in": prefixes_queryset.values_list("pk", flat=True)}

nautobot/ipam/filters.py

@@ -19,12 +19,15 @@ from nautobot.core.filters import (
     SearchFilter,
     TreeNodeMultipleChoiceFilter,
 )
+from nautobot.core.utils.data import is_uuid
 from nautobot.dcim.filters import LocatableModelFilterSetMixin
 from nautobot.dcim.models import Device, Interface, Location, VirtualDeviceContext
 from nautobot.extras.filters import NautobotFilterSet, RoleModelFilterSetMixin, StatusModelFilterSetMixin
-from nautobot.ipam import choices, formfields
-from nautobot.tenancy.filters.mixins import TenancyModelFilterSetMixin
+from nautobot.ipam import choices
+from nautobot.ipam.filter_mixins import PrefixFilter
+from nautobot.tenancy.filter_mixins import TenancyModelFilterSetMixin
 from nautobot.virtualization.models import VirtualMachine, VMInterface
+from nautobot.vpn.models import VPNTunnelEndpoint
 
 from .models import (
     IPAddress,
@@ -57,40 +60,7 @@ __all__ = (
 )
 
 
-class PrefixFilter(NaturalKeyOrPKMultipleChoiceFilter):
-    """
-    Filter that supports filtering a foreign key to Prefix by either its PK or by a literal `prefix` string.
-    """
-
-    field_class = formfields.PrefixFilterFormField
-
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault("to_field_name", "pk")
-        kwargs.setdefault("label", "Prefix (ID or prefix string)")
-        kwargs.setdefault("queryset", Prefix.objects.all())
-        super().__init__(*args, **kwargs)
-
-    def get_filter_predicate(self, v):
-        # Null value filtering
-        if v is None:
-            return {f"{self.field_name}__isnull": True}
-
-        # If value is a model instance, stringify it to a pk.
-        if isinstance(v, Prefix):
-            v = v.pk
-
-        # Try to cast the value to a UUID to distinguish between PKs and prefix strings
-        v = str(v)
-        try:
-            uuid.UUID(v)
-            return {self.field_name: v}
-        except (AttributeError, TypeError, ValueError):
-            # It's a prefix string
-            prefixes_queryset = Prefix.objects.net_equals(v)
-            return {f"{self.field_name}__in": prefixes_queryset.values_list("pk", flat=True)}
-
-
-class NamespaceFilterSet(NautobotFilterSet):
+class NamespaceFilterSet(NautobotFilterSet, TenancyModelFilterSetMixin):
     q = SearchFilter(
         filter_predicates={
             "name": "icontains",
@@ -263,6 +233,13 @@ class PrefixFilterSet(
         method="search_contains",
         label="Prefixes which contain this prefix or IP",
     )
+    ancestors = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Prefix.objects.all(),
+        prefers_id=True,
+        to_field_name="network",
+        method="filter_ancestors",
+        label="Prefixes which are ancestors of this prefix (ID or host string)",
+    )
     vrfs = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=VRF.objects.all(),
         to_field_name="rd",
@@ -320,13 +297,29 @@ class PrefixFilterSet(
         queryset=CloudNetwork.objects.all(),
         to_field_name="name",
     )
+    vpn_tunnel_endpoints = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=VPNTunnelEndpoint.objects.all(),
+        to_field_name="pk",
+        label="VPN Tunnel Endpoint ID",
+    )
+    vpn_tunnel_endpoints_name_contains = django_filters.CharFilter(
+        method="filter_vpntunnelendpoint_name_contains",
+        label="VPN Tunnel Endpoint Name Contains",
+    )
 
     class Meta:
         model = Prefix
         fields = ["date_allocated", "id", "prefix_length", "tags"]
 
     def _strip_values(self, values):
-        return [value.strip() for value in values if value.strip()]
+        result = []
+        for value in values:
+            value = value.strip()
+            if is_uuid(value):
+                result.append(Prefix.objects.get(pk=value).prefix)
+            elif value:
+                result.append(value)
+        return result
 
     def filter_prefix(self, queryset, name, value):
         prefixes = self._strip_values(value)
@@ -363,6 +356,13 @@ class PrefixFilterSet(
             prefixes_queryset |= queryset.filter(query)
         return prefixes_queryset
 
+    def filter_ancestors(self, queryset, name, value):
+        if not value:
+            return queryset
+        prefixes = Prefix.objects.filter(pk__in=[v.id for v in value])
+        ancestor_ids = [ancestor.id for prefix in prefixes for ancestor in prefix.ancestors()]
+        return queryset.filter(pk__in=ancestor_ids)
+
     def generate_query_filter_present_in_vrf(self, value):
         if isinstance(value, (str, uuid.UUID)):
             value = VRF.objects.get(pk=value)
@@ -376,6 +376,9 @@ class PrefixFilterSet(
         params = self.generate_query_filter_present_in_vrf(value)
         return queryset.filter(params).distinct()
 
+    def filter_vpntunnelendpoint_name_contains(self, queryset, name, value):
+        return queryset.filter(vpn_tunnel_endpoints__name__contains=value)
+
 
 class PrefixLocationAssignmentFilterSet(NautobotFilterSet):
     q = SearchFilter(
@@ -486,6 +489,11 @@ class IPAddressFilterSet(
         label="Has NAT Inside",
     )
     ip_version = django_filters.NumberFilter()
+    services = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Service.objects.all(),
+        to_field_name="name",
+        label="Services (name or ID)",
+    )
 
     class Meta:
         model = IPAddress
@@ -505,7 +513,14 @@ class IPAddressFilterSet(
         return queryset.filter(params)
 
     def search_by_prefix(self, queryset, name, value):
-        prefixes = [prefix.strip() for prefix in value if prefix.strip()]
+        prefixes = []
+        for prefix in value:
+            prefix = prefix.strip()
+            if is_uuid(prefix):
+                prefixes.append(Prefix.objects.get(pk=prefix).prefix)
+            elif prefix:
+                prefixes.append(prefix)
+
         return queryset.net_host_contained(*prefixes)
 
     def filter_address(self, queryset, name, value):

nautobot/ipam/formfields.py

@@ -67,7 +67,7 @@ class IPNetworkFormField(forms.Field):
 class PrefixFilterFormField(MultiMatchModelMultipleChoiceField):
     @property
     def filter(self):
-        from nautobot.ipam.filters import PrefixFilter  # avoid circular definition
+        from nautobot.ipam.filter_mixins import PrefixFilter  # avoid circular definition
 
         return PrefixFilter