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

nautobot/extras/tests/test_views.py

@@ -29,6 +29,7 @@ from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.dcim.models import (
     ConsolePort,
     Device,
+    DeviceFamily,
     DeviceType,
     Interface,
     Location,
@@ -96,7 +97,6 @@ from nautobot.extras.models import (
 from nautobot.extras.templatetags.job_buttons import NO_CONFIRM_BUTTON
 from nautobot.extras.tests.constants import BIG_GRAPHQL_DEVICE_QUERY
 from nautobot.extras.tests.test_jobs import get_job_class_and_model
-from nautobot.extras.tests.test_relationships import RequiredRelationshipTestMixin
 from nautobot.extras.utils import get_pending_approval_workflow_stages, RoleModelsQuery, TaggableClassesQuery
 from nautobot.ipam.models import IPAddress, Prefix, VLAN, VLANGroup, VRF
 from nautobot.tenancy.models import Tenant
@@ -730,6 +730,7 @@ class ConfigContextTestCase(
             "regions": [],
             "locations": [location.pk],
             "roles": [],
+            "device_families": [DeviceFamily.objects.first().pk],
             "device_types": [],
             "platforms": [],
             "tenant_groups": [],
@@ -764,6 +765,7 @@ class ConfigContextTestCase(
             "regions": [],
             "locations": [],
             "roles": [],
+            "device_families": [],
             "device_types": [],
             "platforms": [],
             "tenant_groups": [],
@@ -803,6 +805,7 @@ class ConfigContextTestCase(
             "regions": [],
             "locations": [],
             "roles": [],
+            "device_families": [],
             "device_types": [],
             "platforms": [],
             "tenant_groups": [],
@@ -2755,59 +2758,6 @@ class ScheduledJobTestCase(
             crontab="15 10 * * *",
         )
 
-    def test_only_enabled_is_listed(self):
-        self.add_permissions("extras.view_scheduledjob")
-
-        # this should not appear, since it's not enabled
-        ScheduledJob.objects.create(
-            enabled=False,
-            name="test4",
-            task="pass_job.TestPassJob",
-            interval=JobExecutionType.TYPE_IMMEDIATELY,
-            user=self.user,
-            start_time=timezone.now(),
-        )
-
-        response = self.client.get(self._get_url("list"))
-        self.assertHttpStatus(response, 200)
-        self.assertNotIn("test4", extract_page_body(response.content.decode(response.charset)))
-
-    def test_approved_required_jobs_are_listed_only_when_approved(self):
-        self.add_permissions("extras.view_scheduledjob")
-
-        # this should not appear, since it's not approved
-        ScheduledJob.objects.create(
-            enabled=True,
-            approval_required=True,
-            decision_date=None,
-            name="test4",
-            task="pass_job.TestPassJob",
-            interval=JobExecutionType.TYPE_IMMEDIATELY,
-            user=self.user,
-            start_time=timezone.now(),
-        )
-        ScheduledJob.objects.create(
-            enabled=True,
-            approval_required=False,
-            name="test5",
-            task="pass_job.TestPassJob",
-            interval=JobExecutionType.TYPE_IMMEDIATELY,
-            user=self.user,
-            start_time=timezone.now(),
-        )
-        response = self.client.get(self._get_url("list"))
-        self.assertHttpStatus(response, 200)
-        self.assertNotIn("test4", extract_page_body(response.content.decode(response.charset)))
-        self.assertIn("test5", extract_page_body(response.content.decode(response.charset)))
-
-        scheduled_job = ScheduledJob.objects.get(name="test4")
-        scheduled_job.decision_date = timezone.now()
-        scheduled_job.save()
-
-        response = self.client.get(self._get_url("list"))
-        self.assertHttpStatus(response, 200)
-        self.assertIn("test4", extract_page_body(response.content.decode(response.charset)))
-
     def test_non_valid_crontab_syntax(self):
         self.add_permissions("extras.view_scheduledjob")
 
@@ -3291,7 +3241,6 @@ class JobTestCase(
 
             result = JobResult.objects.latest()
             self.assertRedirects(response, reverse("extras:jobresult", kwargs={"pk": result.pk}))
-            mock_begin_approval_workflow.assert_not_called()
 
     def test_rerun_job(self):
         self.add_permissions("extras.run_job")
@@ -3328,7 +3277,8 @@ class JobTestCase(
         )
         self.assertInHTML('<input type="hidden" name="_profile" value="True" id="id__profile">', content)
         self.assertInHTML(
-            '<input type="checkbox" name="_ignore_singleton_lock" id="id__ignore_singleton_lock" checked>', content
+            '<input type="checkbox" name="_ignore_singleton_lock" id="id__ignore_singleton_lock" class="form-check-input" checked>',
+            content,
         )
 
     @mock.patch("nautobot.extras.views.get_worker_count", return_value=1)
@@ -3511,11 +3461,13 @@ class JobTestCase(
         self.add_permissions("extras.run_job")
         self.add_permissions("extras.view_scheduledjob")
 
-        ApprovalWorkflowDefinition.objects.create(
+        workflow = ApprovalWorkflowDefinition(
             name="Approval Definition",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
             weight=0,
+            model_constraints={"job_model__name": self.test_pass.name},
         )
+        workflow.validated_save()
         data = {
             "_schedule_type": "future",
             "_schedule_name": "test",
@@ -3523,14 +3475,15 @@ class JobTestCase(
         }
 
         for i, run_url in enumerate(self.run_urls):
-            if "_schedule_name" in data:
-                data["_schedule_name"] = f"test {i}"
-            response = self.client.post(run_url, data)
-            scheduled_job = ScheduledJob.objects.last()
-            self.assertRedirects(
-                response,
-                reverse("extras:scheduledjob_approvalworkflow", args=[scheduled_job.pk]),
-            )
+            with self.subTest(run_url=run_url):
+                if "_schedule_name" in data:
+                    data["_schedule_name"] = f"test {i}"
+                response = self.client.post(run_url, data)
+                scheduled_job = ScheduledJob.objects.last()
+                self.assertRedirects(
+                    response,
+                    reverse("extras:scheduledjob_approvalworkflow", args=[scheduled_job.pk]),
+                )
 
     @mock.patch("nautobot.extras.views.get_worker_count", return_value=1)
     def test_run_scheduled_job_with_no_approval_workflow_defined(self, _):
@@ -4068,17 +4021,7 @@ class ObjectMetadataTestCase(
         self.assertNotIn(instance2.assigned_object.get_absolute_url(), content, msg=content)
 
 
-class RelationshipTestCase(
-    ViewTestCases.CreateObjectViewTestCase,
-    ViewTestCases.DeleteObjectViewTestCase,
-    ViewTestCases.EditObjectViewTestCase,
-    ViewTestCases.BulkDeleteObjectsViewTestCase,
-    ViewTestCases.GetObjectViewTestCase,
-    ViewTestCases.GetObjectChangelogViewTestCase,
-    ViewTestCases.ListObjectsViewTestCase,
-    RequiredRelationshipTestMixin,
-    ViewTestCases.BulkEditObjectsViewTestCase,
-):
+class RelationshipTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Relationship
     slug_source = "label"
     slugify_function = staticmethod(slugify_dashes_to_underscores)
@@ -4592,7 +4535,6 @@ class RoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases
             "remove_content_types": [device_ct.pk],
         }
 
-    @tag("fix_in_v3")
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_view_with_content_types(self):
         """
@@ -4611,13 +4553,10 @@ 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.assertInHTML(
-                            f'<strong>{result}</strong><div class="float-end d-print-none">',
-                            response_body,
-                        )
-                        # ContactAssociationTable related to this role instances should not be there.
+                        self.assertInHTML(f"<strong>{result}</strong>", response_body)
+                        # ContactAssociationTable related to this role instances in the main tab should not be there.
                         self.assertNotIn(
-                            f'<strong>{result}</strong>\n            </div>\n            \n\n<table class="table table-hover nb-table-headings">\n',
+                            f'<strong>{result}</strong>\n            </div>\n            \n\n\n\n    <table class="table table-hover nb-table-headings">',
                             response_body,
                         )
                     else:

nautobot/extras/urls.py

@@ -5,7 +5,6 @@ from nautobot.core.views.routers import NautobotUIViewSetRouter
 from nautobot.extras import views
 from nautobot.extras.models import (
     Job,
-    Relationship,
     ScheduledJob,
 )
 
@@ -135,19 +134,6 @@ urlpatterns = [
         name="scheduledjob_approvalworkflow",
         kwargs={"model": ScheduledJob},
     ),
-    # Custom relationships
-    path(
-        "relationships/<uuid:pk>/changelog/",
-        views.ObjectChangeLogView.as_view(),
-        name="relationship_changelog",
-        kwargs={"model": Relationship},
-    ),
-    path(
-        "relationships/<uuid:pk>/notes/",
-        views.ObjectNotesView.as_view(),
-        name="relationship_notes",
-        kwargs={"model": Relationship},
-    ),
     # Secrets
     path(
         "secrets/provider/<str:provider_slug>/form/",

nautobot/extras/views.py

@@ -1,3 +1,4 @@
+from functools import partial
 import logging
 from typing import Optional
 from urllib.parse import parse_qs
@@ -60,6 +61,7 @@ from nautobot.core.views.mixins import (
     ObjectBulkDestroyViewMixin,
     ObjectBulkUpdateViewMixin,
     ObjectChangeLogViewMixin,
+    ObjectDataComplianceViewMixin,
     ObjectDestroyViewMixin,
     ObjectDetailViewMixin,
     ObjectEditViewMixin,
@@ -326,6 +328,7 @@ class ApprovalWorkflowUIViewSet(
                 section=SectionChoices.RIGHT_HALF,
                 exclude_columns=["approval_workflow"],
                 add_button_route=None,
+                enable_related_link=False,
             ),
         ],
     )
@@ -412,6 +415,7 @@ class ApprovalWorkflowStageUIViewSet(
                 section=SectionChoices.RIGHT_HALF,
                 exclude_columns=["approval_workflow_stage"],
                 table_title="Responses",
+                enable_related_link=False,
             ),
         ],
     )
@@ -757,6 +761,7 @@ class ConfigContextUIViewSet(NautobotUIViewSet):
                     "locations",
                     "roles",
                     "device_types",
+                    "device_families",
                     "platforms",
                     "cluster_groups",
                     "clusters",
@@ -967,6 +972,7 @@ class ContactUIViewSet(NautobotUIViewSet):
                 table_filter="contact",
                 table_title="Contact For",
                 add_button_route=None,
+                enable_related_link=False,
             ),
         ),
     )
@@ -1756,6 +1762,7 @@ class GraphQLQueryUIViewSet(
     ObjectDestroyViewMixin,
     ObjectBulkDestroyViewMixin,
     ObjectChangeLogViewMixin,
+    ObjectDataComplianceViewMixin,
     ObjectNotesViewMixin,
 ):
     filterset_form_class = forms.GraphQLQueryFilterForm
@@ -2042,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)
@@ -2139,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,
@@ -2501,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
@@ -2923,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
@@ -3250,6 +3277,7 @@ class SecretUIViewSet(
     ObjectBulkDestroyViewMixin,
     # no ObjectBulkUpdateViewMixin here yet
     ObjectChangeLogViewMixin,
+    ObjectDataComplianceViewMixin,
     ObjectNotesViewMixin,
 ):
     queryset = Secret.objects.all()
@@ -3331,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,
@@ -3437,6 +3466,7 @@ class TagUIViewSet(NautobotUIViewSet):
                 select_related_fields=["content_type"],
                 prefetch_related_fields=["content_object"],
                 include_paginator=True,
+                enable_related_link=False,
             ),
         ),
     )
@@ -3493,6 +3523,7 @@ class TeamUIViewSet(NautobotUIViewSet):
                 table_filter="team",
                 table_title="Contact For",
                 add_button_route=None,
+                enable_related_link=False,
             ),
         )
     )
@@ -3525,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",

nautobot/ipam/filters.py

@@ -233,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",
@@ -295,6 +302,10 @@ class PrefixFilterSet(
         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
@@ -345,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)
@@ -358,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(
@@ -468,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

nautobot/ipam/tables.py

@@ -379,6 +379,11 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
     cloud_networks_count = LinkedCountColumn(
         viewname="cloud:cloudnetwork_list", url_params={"prefixes": "pk"}, verbose_name="Cloud Networks"
     )
+    tunnel_endpoints_count = LinkedCountColumn(
+        viewname="vpn:vpntunnelendpoint_list",
+        url_params={"protected_prefixes": "pk"},
+        verbose_name="VPN Tunnel Endpoints",
+    )
     actions = ButtonsColumn(Prefix)
 
     class Meta(BaseTable.Meta):
@@ -394,6 +399,7 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "tenant",
             "location_count",
             "cloud_networks_count",
+            "tunnel_endpoints_count",
             "vlan",
             "role",
             "rir",

nautobot/ipam/templates/ipam/namespace_ip_addresses.html

@@ -1,4 +1,4 @@
-{% extends 'ipam/namespace_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block title %}{{ block.super }} - IP Addresses{% endblock %}
 

nautobot/ipam/templates/ipam/namespace_prefixes.html

@@ -1,4 +1,4 @@
-{% extends 'ipam/namespace_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block title %}{{ block.super }} - Prefixes{% endblock %}
 

nautobot/ipam/templates/ipam/namespace_vrfs.html

@@ -1,4 +1,4 @@
-{% extends 'ipam/namespace_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block title %}{{ block.super }} - VRFs{% endblock %}
 

nautobot/ipam/tests/test_filters.py

@@ -187,6 +187,7 @@ class PrefixTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilt
         ["status", "status__id"],
         ["status", "status__name"],
         ["type"],
+        ["vpn_tunnel_endpoints", "vpn_tunnel_endpoints__id"],
     )
 
     def test_filters_generic(self):
@@ -230,6 +231,17 @@ class PrefixTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilt
         all_prefixes = self.queryset.all()
         self.assertQuerysetEqualAndNotEmpty(self.filterset(params, self.queryset).qs, all_prefixes)
 
+    def test_ancestors(self):
+        prefixes = (
+            Prefix.objects.create(prefix="10.0.0.0/8", status=Status.objects.get_for_model(Prefix).first()),
+            Prefix.objects.create(prefix="10.0.0.0/16", status=Status.objects.get_for_model(Prefix).first()),
+            Prefix.objects.create(prefix="10.0.0.0/24", status=Status.objects.get_for_model(Prefix).first()),
+        )
+        params = {"ancestors": [str(prefixes[2].pk)]}
+        filterset = self.filterset(params, self.queryset)
+        ancestors = [ancestor.id for ancestor in prefixes[2].ancestors()]
+        self.assertQuerysetEqualAndNotEmpty(filterset.qs, self.queryset.filter(id__in=ancestors))
+
 
 class PrefixLocationAssignmentTestCase(FilterTestCases.FilterTestCase):
     queryset = PrefixLocationAssignment.objects.all()
@@ -518,7 +530,11 @@ class IPAddressTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyF
     queryset = IPAddress.objects.all()
     filterset = IPAddressFilterSet
     tenancy_related_name = "ip_addresses"
-    generic_filter_tests = (["nat_inside", "nat_inside__id"],)
+    generic_filter_tests = (
+        ["nat_inside", "nat_inside__id"],
+        ["services", "services__id"],
+        ["services", "services__name"],
+    )
 
     @classmethod
     def setUpTestData(cls):
@@ -710,6 +726,15 @@ class IPAddressTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyF
             nat_inside=ip1,
         )
 
+        services = (
+            Service.objects.create(name="Service 1", protocol="TCP", ports=[80]),
+            Service.objects.create(name="Service 2", protocol="UDP", ports=[53]),
+            Service.objects.create(name="Service 3", protocol="TCP", ports=[443]),
+        )
+        services[0].ip_addresses.add(ip0)
+        services[1].ip_addresses.add(ip1)
+        services[2].ip_addresses.add(ip2)
+
     def test_search(self):
         ipv4_octets = self.ipv4_address.host.split(".")
         ipv6_hextets = self.ipv6_address.host.split(":")

nautobot/ipam/tests/test_models.py

@@ -34,7 +34,7 @@ class IPAddressToInterfaceTest(TestCase):
 
     @classmethod
     def setUpTestData(cls):
-        cls.namespace = Namespace.objects.first()
+        cls.namespace = Namespace.objects.create(name="IPAM Models Test Namespace")
         cls.status = Status.objects.get(name="Active")
         cls.prefix = Prefix.objects.create(prefix="192.0.2.0/24", status=cls.status, namespace=cls.namespace)
         cls.test_device = Device.objects.create(