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

nautobot/extras/tests/test_views.py

@@ -132,14 +132,14 @@ class ApprovalWorkflowDefinitionViewTestCase(
             ApprovalWorkflowDefinition.objects.create(
                 name=f"Test Approval Workflow {i}",
                 model_content_type=cls.scheduledjob_ct,
-                priority=i,
+                weight=i,
             )
 
         cls.form_data = {
             "name": "Test Approval Workflow Definition 5",
             "model_content_type": cls.scheduledjob_ct.pk,
             "model_constraints": '{"name": "Bulk Delete Objects"}',
-            "priority": 5,
+            "weight": 5,
             # These are the "management_form" fields required by the dynamic CustomFieldChoice formsets.
             "approval_workflow_stage_definitions-TOTAL_FORMS": "0",  # Set to 0 so validation succeeds until we need it
             "approval_workflow_stage_definitions-INITIAL_FORMS": "1",
@@ -161,14 +161,14 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         cls.approval_workflow_definition = ApprovalWorkflowDefinition.objects.create(
             name="Test Approval Workflow Definition 1",
             model_content_type=cls.scheduledjob_ct,
-            priority=10,
+            weight=10,
         )
         cls.approver_group = Group.objects.create(name="Test Group 1")
         cls.updated_approver_group = Group.objects.create(name="Test Group 2")
         # Deletable objects
         ApprovalWorkflowStageDefinition.objects.create(
             approval_workflow_definition=cls.approval_workflow_definition,
-            weight=100,
+            sequence=100,
             name="Test Approval Workflow 1 Stage 1 Definition",
             min_approvers=2,
             denial_message="Stage 1 Denial Message",
@@ -176,7 +176,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         )
         ApprovalWorkflowStageDefinition.objects.create(
             approval_workflow_definition=cls.approval_workflow_definition,
-            weight=200,
+            sequence=200,
             name="Test Approval Workflow 1 Stage 2 Definition",
             min_approvers=3,
             denial_message="Stage 2 Denial Message",
@@ -184,7 +184,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         )
         ApprovalWorkflowStageDefinition.objects.create(
             approval_workflow_definition=cls.approval_workflow_definition,
-            weight=300,
+            sequence=300,
             name="Test Approval Workflow 1 Stage 3 Definition",
             min_approvers=4,
             denial_message="Stage 3 Denial Message",
@@ -192,7 +192,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         )
         ApprovalWorkflowStageDefinition.objects.create(
             approval_workflow_definition=cls.approval_workflow_definition,
-            weight=400,
+            sequence=400,
             name="Test Approval Workflow 1 Stage 4 Definition",
             min_approvers=4,
             denial_message="Stage 4 Denial Message",
@@ -200,7 +200,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         )
         ApprovalWorkflowStageDefinition.objects.create(
             approval_workflow_definition=cls.approval_workflow_definition,
-            weight=500,
+            sequence=500,
             name="Test Approval Workflow 1 Stage 5 Definition",
             min_approvers=4,
             denial_message="Stage 5 Denial Message",
@@ -209,7 +209,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
 
         cls.form_data = {
             "approval_workflow_definition": cls.approval_workflow_definition.pk,
-            "weight": 600,
+            "sequence": 600,
             "name": "Approval Workflow Stage 1 Definition",
             "min_approvers": 2,
             "denial_message": "Stage 1 is denied",
@@ -218,7 +218,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
 
         cls.update_data = {
             "approval_workflow_definition": cls.approval_workflow_definition.pk,
-            "weight": 700,
+            "sequence": 700,
             "name": "Updated approval workflow stage 1",
             "min_approvers": 3,
             "denial_message": "updated message",
@@ -226,7 +226,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         }
 
         cls.bulk_edit_data = {
-            "weight": 800,
+            "sequence": 800,
             "min_approvers": 5,
             "denial_message": "updated denial message",
         }
@@ -264,7 +264,7 @@ class ApprovalWorkflowViewTestCase(
         ]
         approval_workflow_definitions = [
             ApprovalWorkflowDefinition.objects.create(
-                name=f"Test Approval Workflow {i}", model_content_type=cls.scheduledjob_ct, priority=i
+                name=f"Test Approval Workflow {i}", model_content_type=cls.scheduledjob_ct, weight=i
             )
             for i in range(5)
         ]
@@ -332,7 +332,7 @@ class ApprovalWorkflowStageViewTestCase(
             ApprovalWorkflowDefinition.objects.create(
                 name=f"Test Approval Workflow {i}",
                 model_content_type=cls.scheduledjob_ct,
-                priority=i,
+                weight=i,
             )
             for i in range(5)
         ]
@@ -342,7 +342,7 @@ class ApprovalWorkflowStageViewTestCase(
                 cls.approval_workflow_stage_definitions.append(
                     ApprovalWorkflowStageDefinition.objects.create(
                         approval_workflow_definition=approval_workflow_definition,
-                        weight=i * 100,
+                        sequence=i * 100,
                         name=f"Test Approval Workflow Stage {i} Definition",
                         min_approvers=i + 1,
                         denial_message=f"Stage {i} Denial Message",
@@ -516,7 +516,7 @@ class ApprovalWorkflowStageResponseViewTestCase(
             ApprovalWorkflowDefinition.objects.create(
                 name=f"Test Approval Workflow {i} Definition",
                 model_content_type=cls.scheduledjob_ct,
-                priority=i,
+                weight=i,
             )
             for i in range(5)
         ]
@@ -526,7 +526,7 @@ class ApprovalWorkflowStageResponseViewTestCase(
                 cls.approval_workflow_stage_definitions.append(
                     ApprovalWorkflowStageDefinition.objects.create(
                         approval_workflow_definition=approval_workflow_definition,
-                        weight=i * 100,
+                        sequence=i * 100,
                         name=f"Test Approval Workflow Stage {i} Definition",
                         min_approvers=i + 1,
                         denial_message=f"Stage {i} Denial Message",
@@ -2346,6 +2346,7 @@ class SavedViewTest(ModelViewTestCase):
         self.assertIn(str(sv_shared.pk), response_body, msg=response_body)
         self.assertNotIn(str(sv_not_shared.pk), response_body, msg=response_body)
 
+    @tag("example_app")
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_create_saved_views_contain_boolean_filter_params(self):
         """
@@ -3461,7 +3462,7 @@ class JobTestCase(
         ApprovalWorkflowDefinition.objects.create(
             name="Test Approval Workflow Definition 1",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
 
         self.add_permissions("extras.run_job")
@@ -3491,7 +3492,7 @@ class JobTestCase(
         ApprovalWorkflowDefinition.objects.create(
             name="Approval Definition",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
         data = {
             "_schedule_type": "immediately",
@@ -3513,7 +3514,7 @@ class JobTestCase(
         ApprovalWorkflowDefinition.objects.create(
             name="Approval Definition",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
         data = {
             "_schedule_type": "future",
@@ -3574,7 +3575,7 @@ class JobTestCase(
         ApprovalWorkflowDefinition.objects.create(
             name="Approval Definition",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
 
         data = {
@@ -3599,7 +3600,7 @@ class JobTestCase(
         ApprovalWorkflowDefinition.objects.create(
             name="Approval Definition",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
 
         data = {
@@ -3625,7 +3626,7 @@ class JobTestCase(
         ApprovalWorkflowDefinition.objects.create(
             name="Approval Definition",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
         data = {
             "_schedule_type": "future",
@@ -3765,14 +3766,12 @@ class JobButtonRenderingTestCase(TestCase):
 
         self.location_type = LocationType.objects.get(name="Campus")
 
-    @tag("fix_in_v3")
     def test_view_object_with_job_button(self):
         """Ensure that the job button is rendered."""
         response = self.client.get(self.location_type.get_absolute_url(), follow=True)
         self.assertBodyContains(response, f"JobButton {self.location_type.name}")
         self.assertBodyContains(response, "Click me!")
 
-    @tag("fix_in_v3")
     def test_task_queue_hidden_input_is_present(self):
         """
         Ensure that the job button respects the job class' task_queues and the job class default job queue is passed as a hidden form input.
@@ -3800,7 +3799,6 @@ class JobButtonRenderingTestCase(TestCase):
             f'<input type="hidden" name="_job_queue" value="{self.job.default_job_queue.pk}">', content, content
         )
 
-    @tag("fix_in_v3")
     def test_view_object_with_unsafe_text(self):
         """Ensure that JobButton text can't be used as a vector for XSS."""
         self.job_button_1.text = '<script>alert("Hello world!")</script>'
@@ -3820,7 +3818,6 @@ class JobButtonRenderingTestCase(TestCase):
         self.assertNotIn("<script>alert", content, content)
         self.assertIn("&lt;script&gt;alert", content, content)
 
-    @tag("fix_in_v3")
     def test_view_object_with_unsafe_name(self):
         """Ensure that JobButton names can't be used as a vector for XSS."""
         self.job_button_1.text = "JobButton {{ obj"
@@ -3832,7 +3829,6 @@ class JobButtonRenderingTestCase(TestCase):
         self.assertNotIn("<script>alert", content, content)
         self.assertIn("&lt;script&gt;alert", content, content)
 
-    @tag("fix_in_v3")
     def test_render_constrained_run_permissions(self):
         obj_perm = ObjectPermission(
             name="Test permission",
@@ -3851,8 +3847,9 @@ class JobButtonRenderingTestCase(TestCase):
                 NO_CONFIRM_BUTTON.format(
                     button_id=self.job_button_1.pk,
                     button_text=f"JobButton {self.location_type.name}",
-                    button_class=self.job_button_1.button_class,
+                    button_class=self.job_button_1.button_class_css_class,
                     disabled="",
+                    menu_item="",
                 ),
                 content,
             )
@@ -3860,8 +3857,9 @@ class JobButtonRenderingTestCase(TestCase):
                 NO_CONFIRM_BUTTON.format(
                     button_id=self.job_button_2.pk,
                     button_text="Click me!",
-                    button_class=self.job_button_2.button_class,
+                    button_class=self.job_button_2.button_class_css_class,
                     disabled="disabled",
+                    menu_item="",
                 ),
                 content,
             )
@@ -3882,6 +3880,7 @@ class JobButtonRenderingTestCase(TestCase):
                     button_text=f"JobButton {self.location_type.name}",
                     button_class="link",
                     disabled="",
+                    menu_item="dropdown-item",
                 )
                 + "</li>",
                 content,
@@ -3893,12 +3892,14 @@ class JobButtonRenderingTestCase(TestCase):
                     button_text="Click me!",
                     button_class="link",
                     disabled="disabled",
+                    menu_item="dropdown-item",
                 )
                 + "</li>",
                 content,
             )
 
 
+@tag("example_app")
 class JobCustomTemplateTestCase(TestCase):
     @classmethod
     def setUpTestData(cls):
@@ -4611,7 +4612,7 @@ class RoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases
                     if result == "Contact Associations":
                         # AssociationContact Table in the contact tab should be there.
                         self.assertInHTML(
-                            f'<strong>{result}</strong><div class="pull-right d-print-none">',
+                            f'<strong>{result}</strong><div class="float-end d-print-none">',
                             response_body,
                         )
                         # ContactAssociationTable related to this role instances should not be there.

nautobot/extras/views.py

@@ -24,6 +24,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
@@ -90,6 +91,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
@@ -1262,12 +1265,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 +1320,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 +1339,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 +1365,7 @@ class DynamicGroupUIViewSet(NautobotUIViewSet):
                         added_errors.add(msg)
             raise ValidationError("invalid DynamicGroupMembershipFormSet")
 
-        if children:
+        if commit and children:
             children.save()
 
         return obj
@@ -1658,6 +1664,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 +1708,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,
@@ -1755,6 +1766,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
@@ -2086,7 +2118,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(
@@ -2701,6 +2733,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 +2827,7 @@ class ObjectChangeLogView(generic.GenericView):
 
         return render(
             request,
-            "extras/object_changelog.html",
+            "generic/object_changelog.html",
             {
                 "object": obj,
                 "verbose_name": obj._meta.verbose_name,
@@ -2996,7 +3034,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 +3209,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
 
 
@@ -3490,8 +3552,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",
@@ -320,13 +290,25 @@ 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",
+    )
 
     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)
@@ -505,7 +487,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