nautobot 2.4.2__py3-none-any.whl → 2.4.4__py3-none-any.whl

nautobot/extras/tests/test_views.py

@@ -820,17 +820,33 @@ class DynamicGroupTestCase(
         return super()._get_queryset().filter(group_type=DynamicGroupTypeChoices.TYPE_DYNAMIC_FILTER)  # TODO
 
     def test_get_object_with_permission(self):
-        instance = self._get_queryset().first()
+        location_ct = ContentType.objects.get_for_model(Location)
+        instance = self._get_queryset().exclude(content_type=location_ct).first()
         # Add view permissions for the group's members:
-        self.add_permissions(get_permission_for_model(instance.content_type.model_class(), "view"))
+        self.add_permissions(
+            get_permission_for_model(instance.content_type.model_class(), "view"), "extras.view_dynamicgroup"
+        )
 
-        response = super().test_get_object_with_permission()
+        response = self.client.get(instance.get_absolute_url())
+        self.assertHttpStatus(response, 200)
 
         response_body = extract_page_body(response.content.decode(response.charset))
         # Check that the "members" table in the detail view includes all appropriate member objects
         for member in instance.members:
             self.assertIn(str(member.pk), response_body)
 
+        # Test accessing DynamicGroup detail view with a different content type, more specifically, TreeModel
+        # https://github.com/nautobot/nautobot/issues/6806
+        tree_model_dg = DynamicGroup.objects.create(name="DG 4", content_type=location_ct)
+        # Add view permissions for the group's members:
+        self.add_permissions(get_permission_for_model(tree_model_dg.content_type.model_class(), "view"))
+        response = self.client.get(tree_model_dg.get_absolute_url())
+        self.assertHttpStatus(response, 200)
+        response_body = extract_page_body(response.content.decode(response.charset))
+        # Check that the "members" table in the detail view includes all appropriate member objects
+        for member in tree_model_dg.members:
+            self.assertIn(str(member.pk), response_body)
+
     def test_get_object_with_constrained_permission(self):
         instance = self._get_queryset().first()
         # Add view permission for one of the group's members but not the others:
@@ -1164,6 +1180,13 @@ class GitRepositoryTestCase(
         self.form_data = form_data
         super().test_edit_object_with_constrained_permission()
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_view_when_no_sync_job_result_exists(self):
+        instance = self._get_queryset().first()
+        response = self.client.get(reverse("extras:gitrepository_result", kwargs={"pk": instance.pk}))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context["result"], {})
+
     def test_post_sync_repo_anonymous(self):
         self.client.logout()
         url = reverse("extras:gitrepository_sync", kwargs={"pk": self._get_queryset().first().pk})
@@ -1306,19 +1329,18 @@ class SavedViewTest(ModelViewTestCase):
 
     model = SavedView
 
-    def get_view_url_for_saved_view(self, saved_view, action="detail"):
+    def get_view_url_for_saved_view(self, saved_view=None, action="detail"):
         """
         Since saved view detail url redirects, we need to manually construct its detail url
         to test the content of its response.
         """
-        view = saved_view.view
-        pk = saved_view.pk
+        url = ""
 
-        if action == "detail":
-            url = reverse(view) + f"?saved_view={pk}"
-        elif action == "edit":
+        if action == "detail" and saved_view:
+            url = reverse(saved_view.view) + f"?saved_view={saved_view.pk}"
+        elif action == "edit" and saved_view:
             url = saved_view.get_absolute_url() + "update-config/"
-        else:
+        elif action == "create":
             url = reverse("extras:savedview_add")
 
         return url
@@ -1411,7 +1433,14 @@ class SavedViewTest(ModelViewTestCase):
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_update_saved_view_as_owner(self):
-        instance = self._get_queryset().first()
+        view_name = "dcim:location_list"
+        instance = SavedView.objects.create(
+            name="Location Saved View",
+            owner=self.user,
+            view=view_name,
+            is_global_default=True,
+        )
+
         update_query_strings = ["per_page=12", "&status=active", "&name=new_name_filter", "&sort=name"]
         update_url = self.get_view_url_for_saved_view(instance, "edit") + "?" + "".join(update_query_strings)
         # Try update the saved view with the same user as the owner of the saved view
@@ -1543,6 +1572,62 @@ class SavedViewTest(ModelViewTestCase):
         # Assert that Location List View got redirected to Saved View set as user default
         self.assertBodyContains(response, "<strong>User Location Default View</strong>", html=True)
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_filtered_view_precedes_global_default(self):
+        view_name = "dcim:location_list"
+        # Global saved view that will show Floor type locations only.
+        SavedView.objects.create(
+            name="Global Location Default View",
+            owner=self.user,
+            view=view_name,
+            is_global_default=True,
+            config={
+                "filter_params": {
+                    "location_type": ["Floor"],
+                }
+            },
+        )
+        response = self.client.get(reverse(view_name) + "?location_type=Campus", follow=True)
+        # Assert that the user is not redirected to the global default view
+        # But instead redirected to the filtered view
+        self.assertNotIn(
+            "<strong>Global Location Default View</strong>",
+            extract_page_body(response.content.decode(response.charset)),
+        )
+
+        # Floor type locations (Floor-<number>) should not be visible in the response
+        self.assertNotIn(
+            "Floor-",
+            extract_page_body(response.content.decode(response.charset)),
+        )
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_filtered_view_precedes_user_default(self):
+        view_name = "dcim:location_list"
+        # User saved view that will show Floor type locations only.
+        sv = SavedView.objects.create(
+            name="User Location Default View",
+            owner=self.user,
+            view=view_name,
+            config={
+                "filter_params": {
+                    "location_type": ["Floor"],
+                }
+            },
+        )
+        UserSavedViewAssociation.objects.create(user=self.user, saved_view=sv, view_name=sv.view)
+        response = self.client.get(reverse(view_name) + "?location_type=Campus", follow=True)
+        # Assert that the user is not redirected to the user default view
+        # But instead redirected to the filtered view
+        self.assertNotIn(
+            "<strong>User Location Default View</strong>", extract_page_body(response.content.decode(response.charset))
+        )
+        # Floor type locations (Floor-<number>) should not be visible in the response
+        self.assertNotIn(
+            "Floor-",
+            extract_page_body(response.content.decode(response.charset)),
+        )
+
     @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
     def test_is_shared(self):
         view_name = "dcim:location_list"
@@ -1568,6 +1653,119 @@ 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)
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_create_saved_views_contain_boolean_filter_params(self):
+        """
+        Test the entire Save View workflow from creating a Saved View to rendering the View with boolean filter parameters.
+        """
+        with self.subTest("Create job Saved View with boolean filter parameters"):
+            view_name = "extras:job_list"
+            app_label = view_name.split(":")[0]
+            model_name = view_name.split(":")[1].split("_")[0]
+            self.add_permissions(f"{app_label}.view_{model_name}")
+            create_query_strings = [
+                "&hidden=True",
+            ]
+            create_url = self.get_view_url_for_saved_view(action="create")
+            sv_name = "Hidden Jobs"
+            request = {
+                "path": create_url,
+                "data": post_data({"name": sv_name, "view": f"{view_name}", "params": "".join(create_query_strings)}),
+            }
+            self.assertHttpStatus(self.client.post(**request), 302)
+            instance = SavedView.objects.get(name=sv_name)
+            hidden_job = Job.objects.get(name="Example hidden job")
+            hidden_job.description = "I should not show in the UI!"
+            hidden_job.save()
+            self.assertEqual(instance.config["filter_params"]["hidden"], "True")
+            response = self.client.get(reverse(view_name) + "?saved_view=" + str(instance.pk), follow=True)
+            # Assert that Job List View rendered with the boolean filter parameter without error
+            self.assertHttpStatus(response, 200)
+            response_body = extract_page_body(response.content.decode(response.charset))
+            self.assertIn(str(instance.pk), response_body, msg=response_body)
+            self.assertBodyContains(response, f"<strong>{sv_name}</strong>", html=True)
+            # This is the description
+            self.assertBodyContains(response, "I should not show in the UI!", html=True)
+
+        with self.subTest("Create device Saved View with boolean filter parameters"):
+            view_name = "dcim:device_list"
+            app_label = view_name.split(":")[0]
+            model_name = view_name.split(":")[1].split("_")[0]
+            self.add_permissions(f"{app_label}.view_{model_name}")
+            create_query_strings = [
+                "&per_page=12",
+                "&has_primary_ip=True",
+                "&sort=name",
+            ]
+            create_url = self.get_view_url_for_saved_view(action="create")
+            sv_name = "Devices with primary ips"
+            request = {
+                "path": create_url,
+                "data": post_data({"name": sv_name, "view": f"{view_name}", "params": "".join(create_query_strings)}),
+            }
+            self.assertHttpStatus(self.client.post(**request), 302)
+            instance = SavedView.objects.get(name=sv_name)
+            self.assertEqual(instance.config["pagination_count"], 12)
+            self.assertEqual(instance.config["filter_params"]["has_primary_ip"], "True")
+            self.assertEqual(instance.config["sort_order"], ["name"])
+            response = self.client.get(reverse(view_name) + "?saved_view=" + str(instance.pk), follow=True)
+            # Assert that Job List View rendered with the boolean filter parameter without error
+            self.assertHttpStatus(response, 200)
+            response_body = extract_page_body(response.content.decode(response.charset))
+            self.assertIn(str(instance.pk), response_body, msg=response_body)
+            self.assertBodyContains(response, f"<strong>{sv_name}</strong>", html=True)
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_update_saved_view_contain_boolean_filter_params(self):
+        with self.subTest("Update job Saved View with boolean filter parameters"):
+            view_name = "extras:job_list"
+            sv_name = "Non-hidden jobs"
+            instance = SavedView.objects.create(
+                name=sv_name,
+                owner=self.user,
+                view=view_name,
+            )
+            update_query_strings = ["hidden=False"]
+            update_url = self.get_view_url_for_saved_view(instance, "edit") + "?" + "".join(update_query_strings)
+            # Try update the saved view with the same user as the owner of the saved view
+            instance.owner.is_active = True
+            instance.owner.save()
+            self.client.force_login(instance.owner)
+            response = self.client.get(update_url)
+            self.assertHttpStatus(response, 302)
+            instance.refresh_from_db()
+            self.assertEqual(instance.config["filter_params"]["hidden"], "False")
+            response = self.client.get(reverse(view_name) + "?saved_view=" + str(instance.pk), follow=True)
+            # Assert that Job List View rendered with the boolean filter parameter without error
+            self.assertHttpStatus(response, 200)
+            response_body = extract_page_body(response.content.decode(response.charset))
+            self.assertNotIn("Example hidden job", response_body, msg=response_body)
+            self.assertBodyContains(response, f"<strong>{sv_name}</strong>", html=True)
+
+        with self.subTest("Update device Saved View with boolean filter parameters"):
+            view_name = "dcim:device_list"
+            sv_name = "Devices with no primary ips"
+            instance = SavedView.objects.create(
+                name=sv_name,
+                owner=self.user,
+                view=view_name,
+            )
+            update_query_strings = ["has_primary_ip=False"]
+            update_url = self.get_view_url_for_saved_view(instance, "edit") + "?" + "".join(update_query_strings)
+            # Try update the saved view with the same user as the owner of the saved view
+            instance.owner.is_active = True
+            instance.owner.save()
+            self.client.force_login(instance.owner)
+            response = self.client.get(update_url)
+            self.assertHttpStatus(response, 302)
+            instance.refresh_from_db()
+            self.assertEqual(instance.config["filter_params"]["has_primary_ip"], "False")
+            response = self.client.get(reverse(view_name) + "?saved_view=" + str(instance.pk), follow=True)
+            # Assert that Job List View rendered with the boolean filter parameter without error
+            self.assertHttpStatus(response, 200)
+            response_body = extract_page_body(response.content.decode(response.charset))
+            self.assertBodyContains(response, f"<strong>{sv_name}</strong>", html=True)
+
 
 # Not a full-fledged PrimaryObjectViewTestCase as there's no BulkEditView for Secrets
 class SecretTestCase(

nautobot/extras/utils.py

@@ -22,9 +22,12 @@ import redis.exceptions
 
 from nautobot.core.choices import ColorChoices
 from nautobot.core.constants import CHARFIELD_MAX_LENGTH
+from nautobot.core.exceptions import FilterSetFieldNotFound
 from nautobot.core.models.managers import TagsManager
 from nautobot.core.models.utils import find_models_with_matching_fields
 from nautobot.core.utils.data import is_uuid
+from nautobot.core.utils.lookup import get_filterset_for_model, get_model_for_view_name
+from nautobot.core.utils.requests import is_single_choice_field
 from nautobot.extras.choices import DynamicGroupTypeChoices, JobQueueTypeChoices, ObjectChangeActionChoices
 from nautobot.extras.constants import (
     CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL,
@@ -880,3 +883,30 @@ def bulk_delete_with_bulk_change_logging(qs, batch_size=1000):
         finally:
             change_context.defer_object_changes = False
             change_context.reset_deferred_object_changes()
+
+
+def fixup_filterset_query_params(param_dict, view_name, non_filter_params):
+    """
+    Called before saving query filter parameters to a SavedView's config. This function will format
+    single value query parameters to be saved as a single values instead of lists of singles values.
+
+    Args:
+        param_dict (dict): key-value pairs of query parameters.
+        view_name (str): The name of the view that the saved view is associated with. "dcim:location_list" for example.
+        non_filter_params (list): List of non-query parameters that should not be formatted.
+    """
+    model = get_model_for_view_name(view_name)
+    try:
+        filterset_class = get_filterset_for_model(model)
+    except TypeError:
+        return param_dict
+
+    filterset = filterset_class()
+
+    for filter_field, value in param_dict.items():
+        try:
+            if filter_field not in non_filter_params and is_single_choice_field(filterset, filter_field):
+                param_dict[filter_field] = value[0]
+        except FilterSetFieldNotFound:
+            pass
+    return param_dict

nautobot/extras/views.py

@@ -26,6 +26,7 @@ from rest_framework.permissions import IsAuthenticated
 
 from nautobot.core.constants import PAGINATE_COUNT_DEFAULT
 from nautobot.core.events import publish_event
+from nautobot.core.exceptions import FilterSetFieldNotFound
 from nautobot.core.forms import restrict_form_fields
 from nautobot.core.models.querysets import count_related
 from nautobot.core.models.utils import pretty_print_query, serialize_object_v2
@@ -36,12 +37,13 @@ from nautobot.core.ui.object_detail import ObjectDetailContent, ObjectFieldsPane
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.core.utils.lookup import (
     get_filterset_for_model,
+    get_model_for_view_name,
     get_route_for_model,
     get_table_class_string_from_view_name,
     get_table_for_model,
 )
 from nautobot.core.utils.permissions import get_permission_for_model
-from nautobot.core.utils.requests import normalize_querydict
+from nautobot.core.utils.requests import is_single_choice_field, normalize_querydict
 from nautobot.core.views import generic, viewsets
 from nautobot.core.views.mixins import (
     GetReturnURLMixin,
@@ -69,7 +71,7 @@ from nautobot.dcim.tables import (
     VirtualDeviceContextTable,
 )
 from nautobot.extras.context_managers import deferred_change_logging_for_bulk_operation
-from nautobot.extras.utils import get_base_template, get_job_queue, get_worker_count
+from nautobot.extras.utils import fixup_filterset_query_params, get_base_template, get_job_queue, get_worker_count
 from nautobot.ipam.models import IPAddress, Prefix, VLAN
 from nautobot.ipam.tables import IPAddressTable, PrefixTable, VLANTable
 from nautobot.virtualization.models import VirtualMachine, VMInterface
@@ -720,8 +722,13 @@ class DynamicGroupView(generic.ObjectView):
 
         if table_class is not None:
             # Members table (for display on Members nav tab)
+            if hasattr(members, "without_tree_fields"):
+                members = members.without_tree_fields()
             members_table = table_class(
-                members.restrict(request.user, "view"), orderable=False, exclude=["dynamic_group_count"]
+                members.restrict(request.user, "view"),
+                orderable=False,
+                exclude=["dynamic_group_count"],
+                hide_hierarchy_ui=True,
             )
             paginate = {
                 "paginator_class": EnhancedPaginator,
@@ -1158,6 +1165,9 @@ class GitRepositoryResultView(generic.ObjectView):
     def get_extra_context(self, request, instance):
         job_result = instance.get_latest_sync()
 
+        if job_result is None:
+            job_result = {}
+
         return {
             "result": job_result,
             "base_template": "extras/gitrepository.html",
@@ -1265,9 +1275,10 @@ class JobListView(generic.ObjectListView):
     def alter_queryset(self, request):
         queryset = super().alter_queryset(request)
         # Default to hiding "hidden" and non-installed jobs
-        if "hidden" not in request.GET:
+        filter_params = self.get_filter_params(request)
+        if "hidden" not in filter_params:
             queryset = queryset.filter(hidden=False)
-        if "installed" not in request.GET:
+        if "installed" not in filter_params:
             queryset = queryset.filter(installed=True)
         return queryset
 
@@ -1806,15 +1817,23 @@ class SavedViewUIViewSet(
         if sort_order:
             sv.config["sort_order"] = sort_order
 
+        model = get_model_for_view_name(sv.view)
+        filterset_class = get_filterset_for_model(model)
+        filterset = filterset_class()
         filter_params = {}
         for key in request.GET:
             if key in self.non_filter_params:
                 continue
-            # TODO: this is fragile, other single-value filters will also be unhappy if given a list
-            if key == "q":
-                filter_params[key] = request.GET.get(key)
-            else:
-                filter_params[key] = request.GET.getlist(key)
+            try:
+                if is_single_choice_field(filterset, key):
+                    filter_params[key] = request.GET.getlist(key)[0]
+            except FilterSetFieldNotFound:
+                continue
+            try:
+                if not is_single_choice_field(filterset, key):
+                    filter_params[key] = request.GET.getlist(key)
+            except FilterSetFieldNotFound:
+                continue
 
         if filter_params:
             sv.config["filter_params"] = filter_params
@@ -1839,14 +1858,14 @@ class SavedViewUIViewSet(
         and the name of the new SavedView from request.POST to create a new SavedView.
         """
         name = request.POST.get("name")
+        view_name = request.POST.get("view")
         is_shared = request.POST.get("is_shared", False)
         if is_shared:
             is_shared = True
         params = request.POST.get("params", "")
+        param_dict = fixup_filterset_query_params(parse_qs(params), view_name, self.non_filter_params)
 
-        param_dict = parse_qs(params)
-
-        single_value_params = ["saved_view", "table_changes_pending", "all_filters_removed", "q", "per_page"]
+        single_value_params = ["saved_view", "table_changes_pending", "all_filters_removed", "per_page"]
         for key in param_dict.keys():
             if key in single_value_params:
                 param_dict[key] = param_dict[key][0]
@@ -1855,7 +1874,6 @@ class SavedViewUIViewSet(
         derived_instance = None
         if derived_view_pk:
             derived_instance = self.get_queryset().get(pk=derived_view_pk)
-        view_name = request.POST.get("view")
         try:
             reverse(view_name)
         except NoReverseMatch:

nautobot/ipam/api/serializers.py

@@ -63,14 +63,13 @@ class VRFDeviceAssignmentSerializer(ValidatedModelSerializer):
         validators = []
 
     def validate(self, attrs):
-        if attrs.get("device"):
-            validator = UniqueTogetherValidator(queryset=VRFDeviceAssignment.objects.all(), fields=("device", "vrf"))
-            validator(attrs, self)
-        if attrs.get("virtual_machine"):
-            validator = UniqueTogetherValidator(
-                queryset=VRFDeviceAssignment.objects.all(), fields=("virtual_machine", "vrf")
-            )
-            validator(attrs, self)
+        foreign_key_fields = ["device", "virtual_machine", "virtual_device_context"]
+        for foreign_key in foreign_key_fields:
+            if attrs.get(foreign_key):
+                validator = UniqueTogetherValidator(
+                    queryset=VRFDeviceAssignment.objects.all(), fields=(foreign_key, "vrf")
+                )
+                validator(attrs, self)
         return super().validate(attrs)
 
 

nautobot/ipam/api/views.py

@@ -13,7 +13,7 @@ from nautobot.core.constants import MAX_PAGE_SIZE_DEFAULT, PAGINATE_COUNT_DEFAUL
 from nautobot.core.models.querysets import count_related
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.dcim.models import Location
-from nautobot.extras.api.views import NautobotModelViewSet
+from nautobot.extras.api.views import ModelViewSet, NautobotModelViewSet
 from nautobot.ipam import filters
 from nautobot.ipam.api import serializers
 from nautobot.ipam.models import (
@@ -55,13 +55,13 @@ class VRFViewSet(NautobotModelViewSet):
     filterset_class = filters.VRFFilterSet
 
 
-class VRFDeviceAssignmentViewSet(NautobotModelViewSet):
+class VRFDeviceAssignmentViewSet(ModelViewSet):
     queryset = VRFDeviceAssignment.objects.all()
     serializer_class = serializers.VRFDeviceAssignmentSerializer
     filterset_class = filters.VRFDeviceAssignmentFilterSet
 
 
-class VRFPrefixAssignmentViewSet(NautobotModelViewSet):
+class VRFPrefixAssignmentViewSet(ModelViewSet):
     queryset = VRFPrefixAssignment.objects.all()
     serializer_class = serializers.VRFPrefixAssignmentSerializer
     filterset_class = filters.VRFPrefixAssignmentFilterSet
@@ -323,7 +323,7 @@ class PrefixViewSet(NautobotModelViewSet):
             return Response(serializer.data)
 
 
-class PrefixLocationAssignmentViewSet(NautobotModelViewSet):
+class PrefixLocationAssignmentViewSet(ModelViewSet):
     queryset = PrefixLocationAssignment.objects.all()
     serializer_class = serializers.PrefixLocationAssignmentSerializer
     filterset_class = filters.PrefixLocationAssignmentFilterSet
@@ -581,7 +581,7 @@ class VLANViewSet(NautobotModelViewSet):
             raise self.LocationIncompatibleLegacyBehavior from e
 
 
-class VLANLocationAssignmentViewSet(NautobotModelViewSet):
+class VLANLocationAssignmentViewSet(ModelViewSet):
     queryset = VLANLocationAssignment.objects.all()
     serializer_class = serializers.VLANLocationAssignmentSerializer
     filterset_class = filters.VLANLocationAssignmentFilterSet

nautobot/ipam/factory.py

@@ -15,7 +15,7 @@ from nautobot.core.factory import (
     random_instance,
     UniqueFaker,
 )
-from nautobot.dcim.models import Location
+from nautobot.dcim.models import Location, VirtualDeviceContext
 from nautobot.extras.models import Role, Status
 from nautobot.ipam.choices import PrefixTypeChoices
 from nautobot.ipam.models import IPAddress, Namespace, Prefix, RIR, RouteTarget, VLAN, VLANGroup, VRF
@@ -127,6 +127,24 @@ class VRFFactory(PrimaryModelFactory):
             else:
                 self.export_targets.set(get_random_instances(RouteTarget))
 
+    @factory.post_generation
+    def prefixes(self, create, extracted, **kwargs):
+        if create:
+            if extracted:
+                self.prefixes.set(extracted)
+            else:
+                self.prefixes.set(
+                    get_random_instances(lambda: Prefix.objects.filter(namespace=self.namespace), minimum=0)
+                )
+
+    @factory.post_generation
+    def virtual_device_contexts(self, create, extracted, **kwargs):
+        if create:
+            if extracted:
+                self.virtual_device_contexts.set(extracted)
+            else:
+                self.virtual_device_contexts.set(get_random_instances(VirtualDeviceContext))
+
 
 class VLANGroupFactory(OrganizationalModelFactory):
     class Meta:
@@ -295,7 +313,6 @@ class PrefixFactory(PrimaryModelFactory):
         has_role = NautobotBoolIterator()
         has_tenant = NautobotBoolIterator()
         has_vlan = NautobotBoolIterator()
-        # has_vrf = NautobotBoolIterator()
         is_ipv6 = NautobotBoolIterator()
 
     prefix = factory.Maybe(
@@ -321,12 +338,6 @@ class PrefixFactory(PrimaryModelFactory):
         None,
     )
     namespace = random_instance(Namespace, allow_null=False)
-    # TODO: Update for M2M tests
-    # vrf = factory.Maybe(
-    #     "has_vrf",
-    #     factory.SubFactory(VRFGetOrCreateFactory, tenant=factory.SelfAttribute("..tenant")),
-    #     None,
-    # )
     rir = factory.Maybe("has_rir", random_instance(RIR, allow_null=False), None)
     date_allocated = factory.Maybe("has_date_allocated", factory.Faker("date_time", tzinfo=datetime.timezone.utc), None)
 
@@ -343,6 +354,14 @@ class PrefixFactory(PrimaryModelFactory):
                     )
                 )
 
+    @factory.post_generation
+    def vrfs(self, create, extracted, **kwargs):
+        if create:
+            if extracted:
+                self.vrfs.set(extracted)
+            else:
+                self.vrfs.set(get_random_instances(lambda: VRF.objects.filter(namespace=self.namespace), minimum=0))
+
     @factory.post_generation
     def children(self, create, extracted, **kwargs):
         """Creates child prefixes and ip addresses within the prefix IP space.