nautobot 2.2.4__py3-none-any.whl → 2.2.6__py3-none-any.whl

nautobot/extras/tests/test_filters.py

@@ -30,6 +30,7 @@ from nautobot.extras.constants import HTTP_CONTENT_TYPE_JSON
 from nautobot.extras.filters import (
     ComputedFieldFilterSet,
     ConfigContextFilterSet,
+    ContactAssociationFilterSet,
     ContactFilterSet,
     ContentTypeFilterSet,
     CustomFieldChoiceFilterSet,
@@ -555,6 +556,74 @@ class ContactFilterSetTestCase(ContactAndTeamFilterSetTestCaseMixin, FilterTestC
     )
 
 
+class ContactAssociationFilterSetTestCase(FilterTestCases.FilterTestCase):
+    queryset = ContactAssociation.objects.all()
+    filterset = ContactAssociationFilterSet
+
+    generic_filter_tests = (
+        ["status", "status__id"],
+        ["status", "status__name"],
+        ["contact", "contact__id"],
+        ["contact", "contact__name"],
+        ["team", "team__id"],
+        ["team", "team__name"],
+        ["role", "role__id"],
+        ["role", "role__name"],
+    )
+
+    @classmethod
+    def setUpTestData(cls):
+        roles = Role.objects.get_for_model(ContactAssociation)
+        statuses = Status.objects.get_for_model(ContactAssociation)
+        ip_addresses = IPAddress.objects.all()
+        locations = Location.objects.all()
+
+        cls.location_ct = ContentType.objects.get_for_model(Location)
+        ipaddress_ct = ContentType.objects.get_for_model(IPAddress)
+
+        ContactAssociation.objects.create(
+            contact=Contact.objects.first(),
+            associated_object_type=ipaddress_ct,
+            associated_object_id=ip_addresses[0].pk,
+            role=roles[2],
+            status=statuses[1],
+        )
+        ContactAssociation.objects.create(
+            contact=Contact.objects.last(),
+            associated_object_type=ipaddress_ct,
+            associated_object_id=ip_addresses[1].pk,
+            role=roles[1],
+            status=statuses[2],
+        )
+        ContactAssociation.objects.create(
+            team=Team.objects.first(),
+            associated_object_type=cls.location_ct,
+            associated_object_id=locations[0].pk,
+            role=roles[3],
+            status=statuses[0],
+        )
+        ContactAssociation.objects.create(
+            team=Team.objects.last(),
+            associated_object_type=cls.location_ct,
+            associated_object_id=locations[1].pk,
+            role=roles[0],
+            status=statuses[1],
+        )
+
+    def test_associated_object_type(self):
+        params = {"associated_object_type": "dcim.location"}
+        self.assertEqual(
+            self.filterset(params, self.queryset).qs.count(),
+            ContactAssociation.objects.filter(associated_object_type=self.location_ct).count(),
+        )
+
+        params = {"associated_object_type": self.location_ct.pk}
+        self.assertEqual(
+            self.filterset(params, self.queryset).qs.count(),
+            ContactAssociation.objects.filter(associated_object_type=self.location_ct).count(),
+        )
+
+
 class CustomFieldChoiceFilterSetTestCase(FilterTestCases.FilterTestCase):
     queryset = CustomFieldChoice.objects.all()
     filterset = CustomFieldChoiceFilterSet

nautobot/extras/tests/test_forms.py

@@ -14,7 +14,6 @@ from nautobot.extras.forms import (
     ConfigContextFilterForm,
     ConfigContextForm,
     CustomFieldModelBulkEditFormMixin,
-    CustomFieldModelFilterFormMixin,
     CustomFieldModelFormMixin,
     JobButtonForm,
     JobEditForm,
@@ -1089,7 +1088,6 @@ class DeprecatedAliasesTestCase(TestCase):
             AddRemoveTagsForm,
             CustomFieldBulkCreateForm,
             CustomFieldBulkEditForm,
-            CustomFieldFilterForm,
             CustomFieldModelForm,
             RelationshipModelForm,
             StatusBulkEditFormMixin,
@@ -1100,7 +1098,6 @@ class DeprecatedAliasesTestCase(TestCase):
             (AddRemoveTagsForm, TagsBulkEditFormMixin),
             (CustomFieldBulkEditForm, CustomFieldModelBulkEditFormMixin),
             (CustomFieldBulkCreateForm, CustomFieldModelBulkEditFormMixin),
-            (CustomFieldFilterForm, CustomFieldModelFilterFormMixin),
             (CustomFieldModelForm, CustomFieldModelFormMixin),
             (RelationshipModelForm, RelationshipModelFormMixin),
             (StatusBulkEditFormMixin, StatusModelBulkEditFormMixin),

nautobot/extras/tests/test_models.py

@@ -254,7 +254,7 @@ class ConfigContextTest(ModelTestCases.BaseModelTestCase):
             slug="test_git_repo",
             remote_url="http://localhost/git.git",
         )
-        repo.save()
+        repo.validated_save()
 
         with self.assertRaises(ValidationError):
             nonduplicate_context = ConfigContext(name="context 1", weight=300, data={"a": "22"}, owner=repo)
@@ -864,7 +864,7 @@ class ExportTemplateTest(ModelTestCases.BaseModelTestCase):
             slug="test_git_repo",
             remote_url="http://localhost/git.git",
         )
-        repo.save()
+        repo.validated_save()
 
         with self.assertRaises(ValidationError):
             nonduplicate_template = ExportTemplate(
@@ -888,7 +888,7 @@ class ExternalIntegrationTest(ModelTestCases.BaseModelTestCase):
             )
             ei.validated_save()
 
-        ei.remote_url = "http://localhost"
+        ei.remote_url = "http://some-local-host"
         ei.validated_save()
 
     def test_timeout_validation(self):
@@ -1045,6 +1045,11 @@ class GitRepositoryTest(ModelTestCases.BaseModelTestCase):
             repo.validated_save()
         self.assertIn("Please choose a different slug", str(handler.exception))
 
+    def test_remote_url_hostname(self):
+        """Confirm that a bare hostname (no domain name) can be used for a remote URL."""
+        self.repo.remote_url = "http://some-private-host/example.git"
+        self.repo.validated_save()
+
 
 class JobModelTest(ModelTestCases.BaseModelTestCase):
     """

nautobot/extras/tests/test_views.py

@@ -17,6 +17,7 @@ from nautobot.core.choices import ColorChoices
 from nautobot.core.models.fields import slugify_dashes_to_underscores
 from nautobot.core.testing import extract_form_failures, extract_page_body, TestCase, ViewTestCases
 from nautobot.core.testing.utils import disable_warnings, post_data
+from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.dcim.models import (
     ConsolePort,
     Controller,
@@ -777,9 +778,11 @@ class DynamicGroupTestCase(
         content_type = ContentType.objects.get_for_model(Device)
 
         # DynamicGroup objects to test.
-        DynamicGroup.objects.create(name="DG 1", content_type=content_type)
-        DynamicGroup.objects.create(name="DG 2", content_type=content_type)
-        DynamicGroup.objects.create(name="DG 3", content_type=content_type)
+        cls.dynamic_groups = [
+            DynamicGroup.objects.create(name="DG 1", content_type=content_type),
+            DynamicGroup.objects.create(name="DG 2", content_type=content_type),
+            DynamicGroup.objects.create(name="DG 3", content_type=content_type),
+        ]
 
         cls.form_data = {
             "name": "new_dynamic_group",
@@ -792,6 +795,38 @@ class DynamicGroupTestCase(
             "dynamic_group_memberships-MAX_NUM_FORMS": "1000",
         }
 
+    def test_get_object_with_permission(self):
+        instance = self._get_queryset().first()
+        # Add view permissions for the group's members:
+        self.add_permissions(get_permission_for_model(instance.content_type.model_class(), "view"))
+
+        response = super().test_get_object_with_permission()
+
+        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)
+
+    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:
+        member1, member2 = instance.members[:2]
+        obj_perm = ObjectPermission(
+            name="Members permission",
+            constraints={"pk": member1.pk},
+            actions=["view"],
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.object_types.add(instance.content_type)
+
+        response = super().test_get_object_with_constrained_permission()
+
+        response_body = extract_page_body(response.content.decode(response.charset))
+        # Check that the "members" table in the detail view includes all permitted member objects
+        self.assertIn(str(member1.pk), response_body)
+        self.assertNotIn(str(member2.pk), response_body)
+
     def test_get_object_dynamic_groups_anonymous(self):
         url = reverse("dcim:device_dynamicgroups", kwargs={"pk": Device.objects.first().pk})
         self.client.logout()
@@ -815,7 +850,6 @@ class DynamicGroupTestCase(
         self.assertIn("DG 3", response_body, msg=response_body)
 
     def test_get_object_dynamic_groups_with_constrained_permission(self):
-        self.add_permissions("extras.view_dynamicgroup")
         obj_perm = ObjectPermission(
             name="View a device",
             constraints={"pk": Device.objects.first().pk},
@@ -824,12 +858,22 @@ class DynamicGroupTestCase(
         obj_perm.save()
         obj_perm.users.add(self.user)
         obj_perm.object_types.add(ContentType.objects.get_for_model(Device))
+        obj_perm_2 = ObjectPermission(
+            name="View a Dynamic Group",
+            constraints={"pk": self.dynamic_groups[0].pk},
+            actions=["view"],
+        )
+        obj_perm_2.save()
+        obj_perm_2.users.add(self.user)
+        obj_perm_2.object_types.add(ContentType.objects.get_for_model(DynamicGroup))
 
         url = reverse("dcim:device_dynamicgroups", kwargs={"pk": Device.objects.first().pk})
         response = self.client.get(url)
         self.assertHttpStatus(response, 200)
         response_body = response.content.decode(response.charset)
         self.assertIn("DG 1", response_body, msg=response_body)
+        self.assertNotIn("DG 2", response_body, msg=response_body)
+        self.assertNotIn("DG 3", response_body, msg=response_body)
 
         url = reverse("dcim:device_dynamicgroups", kwargs={"pk": Device.objects.last().pk})
         response = self.client.get(url)
@@ -952,7 +996,7 @@ class GitRepositoryTestCase(
         # Create four GitRepository records
         repos = (
             GitRepository(name="Repo 1", slug="repo_1", remote_url="https://example.com/repo1.git"),
-            GitRepository(name="Repo 2", slug="repo_2", remote_url="https://example.com/repo2.git"),
+            GitRepository(name="Repo 2", slug="repo_2", remote_url="https://some-local-host/repo2.git"),
             GitRepository(name="Repo 3", slug="repo_3", remote_url="https://example.com/repo3.git"),
             GitRepository(name="Repo 4", remote_url="https://example.com/repo4.git", secrets_group=secrets_groups[0]),
         )
@@ -962,7 +1006,7 @@ class GitRepositoryTestCase(
         cls.form_data = {
             "name": "A new Git repository",
             "slug": "a_new_git_repository",
-            "remote_url": "http://example.com/a_new_git_repository.git",
+            "remote_url": "http://another-local-host/a_new_git_repository.git",
             "branch": "develop",
             "_token": "1234567890abcdef1234567890abcdef",
             "secrets_group": secrets_groups[1].pk,
@@ -2285,23 +2329,30 @@ class JobButtonTestCase(
 
     @classmethod
     def setUpTestData(cls):
+        jbr_simple = Job.objects.get(job_class_name="TestJobButtonReceiverSimple")
+        jbr_simple.enabled = True
+        jbr_simple.save()
+        jbr_complex = Job.objects.get(job_class_name="TestJobButtonReceiverComplex")
+        jbr_complex.enabled = True
+        jbr_complex.save()
+
         job_buttons = (
             JobButton.objects.create(
                 name="JobButton1",
                 text="JobButton1",
-                job=Job.objects.get(job_class_name="TestJobButtonReceiverSimple"),
+                job=jbr_simple,
                 confirmation=True,
             ),
             JobButton.objects.create(
                 name="JobButton2",
                 text="JobButton2",
-                job=Job.objects.get(job_class_name="TestJobButtonReceiverSimple"),
+                job=jbr_simple,
                 confirmation=False,
             ),
             JobButton.objects.create(
                 name="JobButton3",
                 text="JobButton3",
-                job=Job.objects.get(job_class_name="TestJobButtonReceiverComplex"),
+                job=jbr_complex,
                 confirmation=True,
                 weight=50,
             ),
@@ -2315,7 +2366,7 @@ class JobButtonTestCase(
             "content_types": [location_ct.pk],
             "name": "jobbutton-4",
             "text": "jobbutton text 4",
-            "job": Job.objects.get(job_class_name="TestJobButtonReceiverComplex").pk,
+            "job": jbr_complex.pk,
             "weight": 100,
             "button_class": "default",
             "confirmation": False,
@@ -2330,6 +2381,9 @@ class JobButtonRenderingTestCase(TestCase):
     def setUp(self):
         super().setUp()
         self.job = Job.objects.get(job_class_name="TestJobButtonReceiverSimple")
+        self.job.enabled = True
+        self.job.save()
+
         self.job_button_1 = JobButton(
             name="JobButton 1",
             text="JobButton {{ obj.name }}",
@@ -2339,10 +2393,14 @@ class JobButtonRenderingTestCase(TestCase):
         self.job_button_1.validated_save()
         self.job_button_1.content_types.add(ContentType.objects.get_for_model(LocationType))
 
+        job_2 = Job.objects.get(job_class_name="TestJobButtonReceiverComplex")
+        job_2.enabled = True
+        job_2.save()
+
         self.job_button_2 = JobButton(
             name="JobButton 2",
             text="Click me!",
-            job=Job.objects.get(job_class_name="TestJobButtonReceiverComplex"),
+            job=job_2,
             confirmation=False,
         )
         self.job_button_2.validated_save()

nautobot/extras/views.py

@@ -56,8 +56,6 @@ from .datasources import (
     enqueue_pull_git_repository_and_refresh_data,
     get_datasource_contents,
 )
-from .filters import RoleFilterSet
-from .forms import RoleBulkEditForm, RoleForm
 from .jobs import get_job
 from .models import (
     ComputedField,
@@ -94,7 +92,6 @@ from .models import (
     Webhook,
 )
 from .registry import registry
-from .tables import AssociatedContactsTable, RoleTable
 
 logger = logging.getLogger(__name__)
 
@@ -398,7 +395,7 @@ class ContactAssociationUIViewSet(
     filterset_class = filters.ContactAssociationFilterSet
     queryset = ContactAssociation.objects.all()
     serializer_class = serializers.ContactAssociationSerializer
-    table_class = AssociatedContactsTable
+    table_class = tables.AssociatedContactsTable
     non_filter_params = ("export", "page", "per_page", "sort")
 
 
@@ -506,6 +503,7 @@ class CustomFieldListView(generic.ObjectListView):
     queryset = CustomField.objects.all()
     table = tables.CustomFieldTable
     filterset = filters.CustomFieldFilterSet
+    filterset_form = forms.CustomFieldFilterForm
     action_buttons = ("add",)
 
 
@@ -706,7 +704,7 @@ class DynamicGroupView(generic.ObjectView):
 
         if table_class is not None:
             # Members table (for display on Members nav tab)
-            members_table = table_class(instance.members, orderable=False)
+            members_table = table_class(instance.members.restrict(request.user, "view"), orderable=False)
             paginate = {
                 "paginator_class": EnhancedPaginator,
                 "per_page": get_paginate_count(request),
@@ -886,7 +884,9 @@ class ObjectDynamicGroupsView(generic.GenericView):
             obj = get_object_or_404(model, **kwargs)
 
         # Gather all dynamic groups for this object (and its related objects)
-        dynamicsgroups_table = tables.DynamicGroupTable(data=obj.dynamic_groups_cached, orderable=False)
+        dynamicsgroups_table = tables.DynamicGroupTable(
+            data=obj.dynamic_groups_cached.restrict(request.user, "view"), orderable=False
+        )
 
         # Apply the request context
         paginate = {
@@ -950,6 +950,7 @@ class ExportTemplateBulkDeleteView(generic.BulkDeleteView):
 class ExternalIntegrationUIViewSet(NautobotUIViewSet):
     bulk_update_form_class = forms.ExternalIntegrationBulkEditForm
     filterset_class = filters.ExternalIntegrationFilterSet
+    filterset_form_class = forms.ExternalIntegrationFilterForm
     form_class = forms.ExternalIntegrationForm
     queryset = ExternalIntegration.objects.select_related("secrets_group")
     serializer_class = serializers.ExternalIntegrationSerializer
@@ -2048,11 +2049,12 @@ class RoleUIViewSet(viewsets.NautobotUIViewSet):
     """`Roles` UIViewSet."""
 
     queryset = Role.objects.all()
-    bulk_update_form_class = RoleBulkEditForm
-    filterset_class = RoleFilterSet
-    form_class = RoleForm
+    bulk_update_form_class = forms.RoleBulkEditForm
+    filterset_class = filters.RoleFilterSet
+    filterset_form_class = forms.RoleFilterForm
+    form_class = forms.RoleForm
     serializer_class = serializers.RoleSerializer
-    table_class = RoleTable
+    table_class = tables.RoleTable
 
     def get_extra_context(self, request, instance):
         context = super().get_extra_context(request, instance)

nautobot/ipam/filters.py

@@ -433,11 +433,19 @@ class IPAddressFilterSet(
         method="_has_interface_assignments",
         label="Has Interface Assignments",
     )
+    nat_inside = django_filters.ModelMultipleChoiceFilter(
+        queryset=IPAddress.objects.all(),
+        label="NAT (Inside)",
+    )
+    has_nat_inside = RelatedMembershipBooleanFilter(
+        field_name="nat_inside",
+        label="Has NAT Inside",
+    )
     ip_version = django_filters.NumberFilter()
 
     class Meta:
         model = IPAddress
-        fields = ["id", "dns_name", "type", "tags", "mask_length"]
+        fields = ["id", "dns_name", "type", "tags", "mask_length", "nat_inside"]
 
     def generate_query__has_interface_assignments(self, value):
         """Helper method used by DynamicGroups and by _assigned_to_interface method."""

nautobot/ipam/forms.py

@@ -94,6 +94,12 @@ class NamespaceBulkEditForm(
         ]
 
 
+class NamespaceFilterForm(LocatableModelFilterFormMixin, NautobotFilterForm):
+    model = Namespace
+    q = forms.CharField(required=False, label="Search")
+    name = forms.CharField(required=False)
+
+
 #
 # VRFs
 #
@@ -142,6 +148,12 @@ class VRFBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     namespace = DynamicModelChoiceField(queryset=Namespace.objects.all(), required=False)
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
     description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    add_prefixes = DynamicModelMultipleChoiceField(
+        queryset=Prefix.objects.all(), required=False, query_params={"namespace": "$namespace"}
+    )
+    remove_prefixes = DynamicModelMultipleChoiceField(
+        queryset=Prefix.objects.all(), required=False, query_params={"namespace": "$namespace"}
+    )
 
     class Meta:
         nullable_fields = [
@@ -358,6 +370,12 @@ class PrefixBulkEditForm(
     remove_locations = DynamicModelMultipleChoiceField(
         queryset=Location.objects.all(), required=False, query_params={"content_type": Prefix._meta.label_lower}
     )
+    add_vrfs = DynamicModelMultipleChoiceField(
+        queryset=VRF.objects.all(), required=False, query_params={"namespace": "$namespace"}
+    )
+    remove_vrfs = DynamicModelMultipleChoiceField(
+        queryset=VRF.objects.all(), required=False, query_params={"namespace": "$namespace"}
+    )
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
     rir = DynamicModelChoiceField(queryset=RIR.objects.all(), required=False, label="RIR")
     date_allocated = forms.DateTimeField(required=False, widget=DateTimePicker)
@@ -646,6 +664,8 @@ class IPAddressFilterForm(NautobotFilterForm, TenancyFilterForm, StatusModelFilt
         "role",
         "tenant_group",
         "tenant",
+        "nat_inside",
+        "has_nat_inside",
     ]
     q = forms.CharField(required=False, label="Search")
     parent = forms.CharField(
@@ -682,6 +702,12 @@ class IPAddressFilterForm(NautobotFilterForm, TenancyFilterForm, StatusModelFilt
         widget=StaticSelect2(),
     )
     tags = TagFilterField(model)
+    nat_inside = DynamicModelChoiceField(queryset=IPAddress.objects.all(), required=False, label="NAT Inside Address")
+    has_nat_inside = forms.NullBooleanField(
+        required=False,
+        label="Has NAT Inside",
+        widget=StaticSelect2(choices=BOOLEAN_WITH_BLANK_CHOICES),
+    )
 
 
 #

nautobot/ipam/tables.py

@@ -473,7 +473,7 @@ class IPAddressTable(StatusTableMixin, RoleTableMixin, BaseTable):
 
 
 class IPAddressDetailTable(IPAddressTable):
-    nat_inside = tables.Column(linkify=True, orderable=False, verbose_name="NAT (Inside)")
+    nat_inside = tables.Column(linkify=True, verbose_name="NAT (Inside)")
     tenant = TenantColumn()
     tags = TagColumn(url_name="ipam:ipaddress_list")
     assigned = BooleanColumn(accessor="assigned_count")

nautobot/ipam/tests/test_filters.py

@@ -462,6 +462,7 @@ 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"],)
 
     @classmethod
     def setUpTestData(cls):
@@ -638,6 +639,20 @@ class IPAddressTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyF
             status=statuses[0],
             namespace=cls.namespace,
         )
+        IPAddress.objects.create(
+            address="10.1.1.1/32",
+            tenant=None,
+            status=statuses[0],
+            namespace=cls.namespace,
+            nat_inside=ip0,
+        )
+        IPAddress.objects.create(
+            address="10.2.2.2/32",
+            tenant=None,
+            status=statuses[0],
+            namespace=cls.namespace,
+            nat_inside=ip1,
+        )
 
     def test_search(self):
         ipv4_octets = self.ipv4_address.host.split(".")

nautobot/ipam/tests/test_views.py

@@ -71,7 +71,8 @@ class VRFTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     @classmethod
     def setUpTestData(cls):
         tenants = Tenant.objects.all()[:2]
-        namespace = Namespace.objects.create(name="ipam_test_views_vrf_test")
+        namespace = Prefix.objects.first().namespace
+        prefixes = Prefix.objects.filter(namespace=namespace)
 
         cls.form_data = {
             "name": "VRF X",
@@ -79,12 +80,16 @@ class VRFTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "rd": "65000:999",
             "tenant": tenants[0].pk,
             "description": "A new VRF",
+            "prefixes": [prefixes[1].id],
             "tags": [t.pk for t in Tag.objects.get_for_model(VRF)],
         }
 
         cls.bulk_edit_data = {
             "tenant": tenants[1].pk,
             "description": "New description",
+            "namespace": prefixes[0].namespace.id,
+            "add_prefixes": [prefixes[0].id],
+            "remove_prefixes": [prefixes[1].id],
         }
 
 
@@ -158,7 +163,6 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
 
         cls.bulk_edit_data = {
             "tenant": None,
-            # TODO "vrf": vrfs[1].pk,
             "status": cls.statuses[1].pk,
             "role": cls.roles[1].pk,
             "rir": RIR.objects.last().pk,
@@ -166,6 +170,9 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
             "description": "New description",
             "add_locations": [cls.locations[0].pk],
             "remove_locations": [cls.locations[1].pk],
+            "namespace": vrfs[0].namespace.pk,
+            "add_vrfs": [vrfs[0].pk],
+            "remove_vrfs": [vrfs[1].pk],
         }
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])

nautobot/ipam/views.py

@@ -80,6 +80,7 @@ class NamespaceUIViewSet(
     form_class = forms.NamespaceForm
     bulk_update_form_class = forms.NamespaceBulkEditForm
     filterset_class = filters.NamespaceFilterSet
+    filterset_form_class = forms.NamespaceFilterForm
     queryset = Namespace.objects.all()
     serializer_class = serializers.NamespaceSerializer
     table_class = tables.NamespaceTable
@@ -303,6 +304,12 @@ class VRFBulkEditView(generic.BulkEditView):
     table = tables.VRFTable
     form = forms.VRFBulkEditForm
 
+    def extra_post_save_action(self, obj, form):
+        if form.cleaned_data.get("add_prefixes", None):
+            obj.prefixes.add(*form.cleaned_data["add_prefixes"])
+        if form.cleaned_data.get("remove_prefixes", None):
+            obj.prefixes.remove(*form.cleaned_data["remove_prefixes"])
+
 
 class VRFBulkDeleteView(generic.BulkDeleteView):
     queryset = VRF.objects.select_related("tenant")
@@ -713,6 +720,10 @@ class PrefixBulkEditView(generic.BulkEditView):
             obj.locations.add(*form.cleaned_data["add_locations"])
         if form.cleaned_data.get("remove_locations", None):
             obj.locations.remove(*form.cleaned_data["remove_locations"])
+        if form.cleaned_data.get("add_vrfs", None):
+            obj.vrfs.add(*form.cleaned_data["add_vrfs"])
+        if form.cleaned_data.get("remove_vrfs", None):
+            obj.vrfs.remove(*form.cleaned_data["remove_vrfs"])
 
 
 class PrefixBulkDeleteView(generic.BulkDeleteView):