nautobot 2.0.0a3__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/extras/tests/test_views.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import timedelta
 import urllib.parse
 import uuid
 
@@ -8,7 +8,7 @@ from django.core.exceptions import ValidationError
 from django.test import override_settings
 from django.urls import reverse
 from django.utils import timezone
-from unittest import mock, skip
+from unittest import mock
 
 from nautobot.core.choices import ColorChoices
 from nautobot.core.models.fields import slugify_dashes_to_underscores
@@ -19,7 +19,6 @@ from nautobot.dcim.tests import test_views
 from nautobot.extras.choices import (
     CustomFieldTypeChoices,
     JobExecutionType,
-    JobSourceChoices,
     ObjectChangeActionChoices,
     SecretsGroupAccessTypeChoices,
     SecretsGroupSecretTypeChoices,
@@ -52,7 +51,7 @@ from nautobot.extras.models import (
     ComputedField,
 )
 from nautobot.extras.tests.test_relationships import RequiredRelationshipTestMixin
-from nautobot.extras.utils import get_job_content_type, TaggableClassesQuery
+from nautobot.extras.utils import TaggableClassesQuery
 from nautobot.ipam.factory import VLANFactory
 from nautobot.ipam.models import VLAN, VLANGroup
 from nautobot.users.models import ObjectPermission
@@ -62,7 +61,6 @@ from nautobot.users.models import ObjectPermission
 User = get_user_model()
 
 
-@skip(reason="Content Types are BROKEN")
 class ComputedFieldTestCase(
     ViewTestCases.BulkDeleteObjectsViewTestCase,
     ViewTestCases.CreateObjectViewTestCase,
@@ -84,14 +82,14 @@ class ComputedFieldTestCase(
             ComputedField(
                 content_type=obj_type,
                 label="Computed Field One",
-                slug="computed_field_one",
+                key="computed_field_one",
                 template="Location name is {{ obj.name }}",
                 fallback_value="Template error",
                 weight=100,
             ),
             ComputedField(
                 content_type=obj_type,
-                slug="computed_field_two",
+                key="computed_field_two",
                 label="Computed Field Two",
                 template="Location name is {{ obj.name }}",
                 fallback_value="Template error",
@@ -99,7 +97,7 @@ class ComputedFieldTestCase(
             ),
             ComputedField(
                 content_type=obj_type,
-                slug="computed_field_three",
+                key="computed_field_three",
                 label="Computed Field Three",
                 template="Location name is {{ obj.name }}",
                 weight=100,
@@ -113,7 +111,8 @@ class ComputedFieldTestCase(
             ),
         )
         cls.location_type = LocationType.objects.get(name="Campus")
-        cls.location1 = Location(name="NYC", location_type=cls.location_type)
+        status = Status.objects.get_for_model(Location).first()
+        cls.location1 = Location(name="NYC", location_type=cls.location_type, status=status)
         cls.location1.save()
 
         for cf in computed_fields:
@@ -121,7 +120,7 @@ class ComputedFieldTestCase(
 
         cls.form_data = {
             "content_type": obj_type.pk,
-            "slug": "computed_field_four",
+            "key": "computed_field_four",
             "label": "Computed Field Four",
             "template": "{{ obj.name }} is the best Location!",
             "fallback_value": ":skull_emoji:",
@@ -287,7 +286,7 @@ class ConfigContextSchemaTestCase(
         cls.form_data = {
             "name": "Schema X",
             "slug": "schema-x",
-            "data_schema": '{"type": "object", "properties": {"baz": {"type": "string"}}}',
+            "data_schema": '{"type": "object","properties": {"baz": {"type": "string"}}}',  # Intentionally misformatted (missing space) to ensure proper formatting on output
         }
 
         cls.bulk_edit_data = {
@@ -450,7 +449,8 @@ class CustomLinkTest(TestCase):
         )
         customlink.save()
         location_type = LocationType.objects.get(name="Campus")
-        location = Location(name="Test Location", slug="test-location", location_type=location_type)
+        status = Status.objects.get_for_model(Location).first()
+        location = Location(name="Test Location", slug="test-location", location_type=location_type, status=status)
         location.save()
 
         response = self.client.get(location.get_absolute_url(), follow=True)
@@ -518,6 +518,17 @@ class DynamicGroupTestCase(
         instance.refresh_from_db()
         self.assertEqual(instance.filter, {"serial": data["filter-serial"]})
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_filter_by_content_type(self):
+        """
+        Test that filtering by `content_type` in the UI succeeds.
+
+        This is a regression test for https://github.com/nautobot/nautobot/issues/3612
+        """
+        path = self._get_url("list")
+        response = self.client.get(path + "?content_type=dcim.device")
+        self.assertHttpStatus(response, 200)
+
 
 class ExportTemplateTestCase(
     ViewTestCases.CreateObjectViewTestCase,
@@ -572,6 +583,7 @@ class GitRepositoryTestCase(
     ViewTestCases.ListObjectsViewTestCase,
 ):
     model = GitRepository
+    slugify_function = staticmethod(slugify_dashes_to_underscores)
 
     @classmethod
     def setUpTestData(cls):
@@ -582,17 +594,17 @@ 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 3", slug="repo-3", remote_url="https://example.com/repo3.git"),
+            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 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]),
         )
         for repo in repos:
-            repo.save(trigger_resync=False)
+            repo.validated_save()
 
         cls.form_data = {
             "name": "A new Git repository",
-            "slug": "a-new-git-repository",
+            "slug": "a_new_git_repository",
             "remote_url": "http://example.com/a_new_git_repository.git",
             "branch": "develop",
             "_token": "1234567890abcdef1234567890abcdef",
@@ -606,14 +618,28 @@ class GitRepositoryTestCase(
 
         cls.csv_data = (
             "name,slug,remote_url,branch,secrets_group,provided_contents",
-            "Git Repository 5,git-repo-5,https://example.com,main,,extras.configcontext",
-            "Git Repository 6,git-repo-6,https://example.com,develop,Secrets Group 2,",
-            'Git Repository 7,git-repo-7,https://example.com,next,Secrets Group 2,"extras.job,extras.configcontext"',
+            "Git Repository 5,git_repo_5,https://example.com,main,,extras.configcontext",
+            "Git Repository 6,git_repo_6,https://example.com,develop,Secrets Group 2,",
+            'Git Repository 7,git_repo_7,https://example.com,next,Secrets Group 2,"extras.job,extras.configcontext"',
         )
 
         cls.slug_source = "name"
         cls.slug_test_object = "Repo 4"
 
+    def test_edit_object_with_permission(self):
+        instance = self._get_queryset().first()
+        form_data = self.form_data.copy()
+        form_data["slug"] = instance.slug  # Slug is not editable
+        self.form_data = form_data
+        super().test_edit_object_with_permission()
+
+    def test_edit_object_with_constrained_permission(self):
+        instance = self._get_queryset().first()
+        form_data = self.form_data.copy()
+        form_data["slug"] = instance.slug  # Slug is not editable
+        self.form_data = form_data
+        super().test_edit_object_with_constrained_permission()
+
 
 class NoteTestCase(
     ViewTestCases.CreateObjectViewTestCase,
@@ -934,27 +960,27 @@ class ScheduledJobTestCase(
         user = User.objects.create(username="user1", is_active=True)
         ScheduledJob.objects.create(
             name="test1",
-            task="nautobot.extras.jobs.scheduled_job_handler",
-            job_class="local/test_pass/TestPass",
+            task="pass.TestPass",
+            job_class="pass.TestPass",
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=user,
-            start_time=datetime.now(),
+            start_time=timezone.now(),
         )
         ScheduledJob.objects.create(
             name="test2",
-            task="nautobot.extras.jobs.scheduled_job_handler",
-            job_class="local/test_pass/TestPass",
+            task="pass.TestPass",
+            job_class="pass.TestPass",
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=user,
-            start_time=datetime.now(),
+            start_time=timezone.now(),
         )
         ScheduledJob.objects.create(
             name="test3",
-            task="nautobot.extras.jobs.scheduled_job_handler",
-            job_class="local/test_pass/TestPass",
+            task="pass.TestPass",
+            job_class="pass.TestPass",
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=user,
-            start_time=datetime.now(),
+            start_time=timezone.now(),
         )
 
     def test_only_enabled_is_listed(self):
@@ -964,11 +990,11 @@ class ScheduledJobTestCase(
         ScheduledJob.objects.create(
             enabled=False,
             name="test4",
-            task="nautobot.extras.jobs.scheduled_job_handler",
-            job_class="local/test_pass/TestPass",
+            task="pass.TestPass",
+            job_class="pass.TestPass",
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=self.user,
-            start_time=datetime.now(),
+            start_time=timezone.now(),
         )
 
         response = self.client.get(self._get_url("list"))
@@ -982,8 +1008,8 @@ class ScheduledJobTestCase(
             ScheduledJob.objects.create(
                 enabled=True,
                 name=name,
-                task="nautobot.extras.jobs.scheduled_job_handler",
-                job_class="local/test_pass/TestPass",
+                task="pass.TestPass",
+                job_class="pass.TestPass",
                 interval=JobExecutionType.TYPE_CUSTOM,
                 user=self.user,
                 start_time=timezone.now(),
@@ -1014,11 +1040,11 @@ class ScheduledJobTestCase(
         ScheduledJob.objects.create(
             enabled=True,
             name="test11",
-            task="nautobot.extras.jobs.scheduled_job_handler",
-            job_class="local/test_pass/TestPass",
+            task="pass.TestPass",
+            job_class="pass.TestPass",
             interval=JobExecutionType.TYPE_CUSTOM,
             user=self.user,
-            start_time=datetime.now(),
+            start_time=timezone.now(),
             crontab="*/15 9,17 3 * 1-5",
         )
 
@@ -1045,39 +1071,28 @@ class ApprovalQueueTestCase(
 
     def setUp(self):
         super().setUp()
-        self.job_model = Job.objects.get_for_class_path("local/test_pass/TestPass")
-        self.job_model_2 = Job.objects.get_for_class_path("local/test_fail/TestFail")
-        self.job_model_3 = Job.objects.get_for_class_path("local/test_read_only_pass/TestReadOnlyPass")
+        self.job_model = Job.objects.get_for_class_path("dry_run.TestDryRun")
+        self.job_model_2 = Job.objects.get_for_class_path("fail.TestFail")
 
         ScheduledJob.objects.create(
             name="test1",
-            task="nautobot.extras.jobs.scheduled_job_handler",
+            task="dry_run.TestDryRun",
             job_model=self.job_model,
             job_class=self.job_model.class_path,
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=self.user,
             approval_required=True,
-            start_time=datetime.now(),
+            start_time=timezone.now(),
         )
         ScheduledJob.objects.create(
             name="test2",
-            task="nautobot.extras.jobs.scheduled_job_handler",
+            task="fail.TestFail",
             job_model=self.job_model_2,
             job_class=self.job_model_2.class_path,
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=self.user,
             approval_required=True,
-            start_time=datetime.now(),
-        )
-        ScheduledJob.objects.create(
-            name="test3",
-            task="nautobot.extras.jobs.scheduled_job_handler",
-            job_model=self.job_model_3,
-            job_class=self.job_model_3.class_path,
-            interval=JobExecutionType.TYPE_IMMEDIATELY,
-            user=self.user,
-            approval_required=True,
-            start_time=datetime.now(),
+            start_time=timezone.now(),
         )
 
     def test_only_approvable_is_listed(self):
@@ -1085,13 +1100,13 @@ class ApprovalQueueTestCase(
 
         ScheduledJob.objects.create(
             name="test4",
-            task="nautobot.extras.jobs.scheduled_job_handler",
+            task="pass.TestPass",
             job_model=self.job_model,
             job_class=self.job_model.class_path,
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=self.user,
             approval_required=False,
-            start_time=datetime.now(),
+            start_time=timezone.now(),
         )
 
         response = self.client.get(self._get_url("list"))
@@ -1229,10 +1244,30 @@ class ApprovalQueueTestCase(
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     @mock.patch("nautobot.extras.views.get_worker_count", return_value=1)
-    def test_post_dry_run_success(self, _):
+    def test_post_dry_run_not_supported(self, _):
+        """Request a dry run on a job that doesn't support dryrun."""
+        self.add_permissions("extras.view_scheduledjob")
+        instance = ScheduledJob.objects.filter(name="test2").first()
+        instance.job_model.enabled = True
+        instance.job_model.save()
+        obj_perm = ObjectPermission(name="Test permission", constraints={"pk": instance.job_model.pk}, actions=["run"])
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Job))
+        data = {"_dry_run": True}
+
+        response = self.client.post(self._get_url("view", instance), data)
+        # Job was not submitted
+        self.assertFalse(JobResult.objects.filter(name=instance.job_model.class_path).exists())
+        self.assertContains(response, "This job does not support dryrun")
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    @mock.patch("nautobot.extras.views.get_worker_count", return_value=1)
+    @mock.patch("nautobot.extras.models.jobs.JobResult.enqueue_job")
+    def test_post_dry_run_success(self, mock_enqueue_job, _):
         """Successfully request a dry run based on object-based run_job permissions."""
         self.add_permissions("extras.view_scheduledjob")
-        instance = self._get_queryset().first()
+        instance = ScheduledJob.objects.filter(name="test1").first()
         instance.job_model.enabled = True
         instance.job_model.save()
         obj_perm = ObjectPermission(name="Test permission", constraints={"pk": instance.job_model.pk}, actions=["run"])
@@ -1241,15 +1276,12 @@ class ApprovalQueueTestCase(
         obj_perm.object_types.add(ContentType.objects.get_for_model(Job))
         data = {"_dry_run": True}
 
+        mock_enqueue_job.side_effect = lambda job_model, *args, **kwargs: JobResult.objects.create(name=job_model.name)
+
         response = self.client.post(self._get_url("view", instance), data)
         # Job was submitted
-        self.assertTrue(
-            JobResult.objects.filter(name=instance.job_model.class_path).exists(),
-            msg=extract_page_body(response.content.decode(response.charset)),
-        )
-        job_result = JobResult.objects.get(name=instance.job_model.class_path)
-        self.assertEqual(job_result.job_model, instance.job_model)
-        self.assertEqual(job_result.user, self.user)
+        mock_enqueue_job.assert_called_once()
+        job_result = JobResult.objects.get(name=instance.job_model.name)
         self.assertRedirects(response, reverse("extras:jobresult", kwargs={"pk": job_result.pk}))
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
@@ -1423,22 +1455,8 @@ class JobResultTestCase(
 
     @classmethod
     def setUpTestData(cls):
-        obj_type = get_job_content_type()
-        JobResult.objects.create(
-            name="local/test_pass/TestPass",
-            task_id=uuid.uuid4(),
-            obj_type=obj_type,
-        )
-        JobResult.objects.create(
-            name="local/test_fail/TestFail",
-            task_id=uuid.uuid4(),
-            obj_type=obj_type,
-        )
-        JobResult.objects.create(
-            name="local/test_read_only_fail/TestReadOnlyFail",
-            task_id=uuid.uuid4(),
-            obj_type=obj_type,
-        )
+        JobResult.objects.create(name="pass.TestPass")
+        JobResult.objects.create(name="fail.TestFail")
 
 
 class JobTestCase(
@@ -1473,8 +1491,8 @@ class JobTestCase(
         cls.run_urls = (
             # Legacy URL (job class path based)
             reverse("extras:job", kwargs={"class_path": cls.test_pass.class_path}),
-            # Current URL (job model slug based)
-            reverse("extras:job_run", kwargs={"slug": cls.test_pass.slug}),
+            # Current URL (job model pk based)
+            reverse("extras:job_run", kwargs={"pk": cls.test_pass.pk}),
         )
 
         cls.test_required_args = Job.objects.get(job_class_name="TestRequired")
@@ -1484,13 +1502,12 @@ class JobTestCase(
         cls.extra_run_urls = (
             # Legacy URL (job class path based)
             reverse("extras:job", kwargs={"class_path": cls.test_required_args.class_path}),
-            # Current URL (job model slug based)
-            reverse("extras:job_run", kwargs={"slug": cls.test_required_args.slug}),
+            # Current URL (job model pk based)
+            reverse("extras:job_run", kwargs={"pk": cls.test_required_args.pk}),
         )
 
         # Create an entry for a non-installed Job as well
         cls.test_not_installed = Job(
-            source=JobSourceChoices.SOURCE_LOCAL,
             module_name="nonexistent",
             job_class_name="NoSuchJob",
             grouping="Nonexistent Jobs",
@@ -1505,7 +1522,6 @@ class JobTestCase(
         }
 
         cls.form_data = {
-            "slug": "custom-job-slug",
             "enabled": True,
             "grouping_override": True,
             "grouping": "Overridden Grouping",
@@ -1513,12 +1529,10 @@ class JobTestCase(
             "name": "Overridden Name",
             "description_override": True,
             "description": "This is an overridden description of a job.",
-            "commit_default_override": True,
-            "commit_default": False,
+            "dryrun_default_override": True,
+            "dryrun_default": True,
             "hidden_override": True,
             "hidden": False,
-            "read_only_override": True,
-            "read_only": False,
             "approval_required_override": True,
             "approval_required": True,
             "soft_time_limit_override": True,
@@ -1644,7 +1658,7 @@ class JobTestCase(
 
         for run_url in (
             reverse("extras:job", kwargs={"class_path": self.test_not_installed.class_path}),
-            reverse("extras:job_run", kwargs={"slug": self.test_not_installed.slug}),
+            reverse("extras:job_run", kwargs={"pk": self.test_not_installed.pk}),
         ):
             response = self.client.post(run_url, self.data_run_immediately)
             self.assertEqual(response.status_code, 200, msg=run_url)
@@ -1658,14 +1672,14 @@ class JobTestCase(
         self.add_permissions("extras.run_job")
 
         for run_url in (
-            reverse("extras:job", kwargs={"class_path": "local/test_fail/TestFail"}),
-            reverse("extras:job_run", kwargs={"slug": Job.objects.get(job_class_name="TestFail").slug}),
+            reverse("extras:job", kwargs={"class_path": "fail.TestFail"}),
+            reverse("extras:job_run", kwargs={"pk": Job.objects.get(job_class_name="TestFail").pk}),
         ):
             response = self.client.post(run_url, self.data_run_immediately)
             self.assertEqual(response.status_code, 200, msg=run_url)
             response_body = extract_page_body(response.content.decode(response.charset))
             self.assertIn("Job is not enabled to be run", response_body)
-            self.assertFalse(JobResult.objects.filter(name="local/test_fail/TestFail").exists())
+            self.assertFalse(JobResult.objects.filter(name="fail.TestFail").exists())
 
     def test_run_now_missing_args(self):
         self.add_permissions("extras.run_job")
@@ -1693,6 +1707,37 @@ class JobTestCase(
             result = JobResult.objects.latest()
             self.assertRedirects(response, reverse("extras:jobresult", kwargs={"pk": result.pk}))
 
+    @mock.patch("nautobot.extras.jobs.task_queues_as_choices")
+    def test_rerun_job(self, mock_task_queues_as_choices):
+        self.add_permissions("extras.run_job")
+        self.add_permissions("extras.view_jobresult")
+
+        mock_task_queues_as_choices.return_value = [("default", ""), ("queue1", ""), ("uniquequeue", "")]
+        job_celery_kwargs = {
+            "nautobot_job_job_model_id": self.test_required_args.id,
+            "nautobot_job_profile": True,
+            "nautobot_job_user_id": self.user.id,
+            "queue": "uniquequeue",
+        }
+
+        previous_result = JobResult.objects.create(
+            job_model=self.test_required_args,
+            user=self.user,
+            task_kwargs={"var": "456"},
+            celery_kwargs=job_celery_kwargs,
+        )
+
+        run_url = reverse("extras:job_run", kwargs={"pk": self.test_required_args.pk})
+        response = self.client.get(f"{run_url}?kwargs_from_job_result={previous_result.pk!s}")
+        content = extract_page_body(response.content.decode(response.charset))
+
+        self.assertInHTML('<option value="uniquequeue" selected>', content)
+        self.assertInHTML(
+            '<input type="text" name="var" value="456" class="form-control form-control" required placeholder="None" id="id_var">',
+            content,
+        )
+        self.assertInHTML('<input type="hidden" name="_profile" value="True" id="id__profile">', content)
+
     @mock.patch("nautobot.extras.views.get_worker_count", return_value=1)
     def test_run_later_missing_name(self, _):
         self.add_permissions("extras.run_job")
@@ -1736,7 +1781,7 @@ class JobTestCase(
         data = {
             "_schedule_type": "future",
             "_schedule_name": "test",
-            "_schedule_start_time": str(datetime.now() - timedelta(minutes=1)),
+            "_schedule_start_time": str(timezone.now() - timedelta(minutes=1)),
         }
 
         for run_url in self.run_urls:
@@ -1771,25 +1816,6 @@ class JobTestCase(
             self.assertEqual(scheduled.name, "test")
             self.assertEqual(scheduled.start_time, start_time)
 
-    @mock.patch("nautobot.extras.views.get_worker_count", return_value=1)
-    def test_run_later_sets_scheduled_job_kwargs_pk(self, _):
-        self.add_permissions("extras.run_job")
-        self.add_permissions("extras.view_scheduledjob")
-
-        start_time = timezone.now() + timedelta(minutes=1)
-        data = {
-            "_schedule_type": "future",
-            "_schedule_name": "test",
-            "_schedule_start_time": str(start_time),
-        }
-
-        for run_url in self.run_urls:
-            response = self.client.post(run_url, data)
-            self.assertRedirects(response, reverse("extras:scheduledjob_list"))
-
-            scheduled = ScheduledJob.objects.last()
-            self.assertEqual(scheduled.kwargs["scheduled_job_pk"], str(scheduled.pk))
-
     @mock.patch("nautobot.extras.views.get_worker_count", return_value=1)
     def test_run_job_with_sensitive_variables_for_future(self, _):
         self.add_permissions("extras.run_job")
@@ -1945,7 +1971,8 @@ class ObjectChangeTestCase(TestCase):
     @classmethod
     def setUpTestData(cls):
         location_type = LocationType.objects.get(name="Campus")
-        location = Location(name="Location 1", slug="location-1", location_type=location_type)
+        location_status = Status.objects.get_for_model(Location).first()
+        location = Location(name="Location 1", slug="location-1", location_type=location_type, status=location_status)
         location.save()
 
         # Create three ObjectChanges
@@ -1971,7 +1998,6 @@ class ObjectChangeTestCase(TestCase):
         self.assertHttpStatus(response, 200)
 
 
-@skip(reason="Content Types are BROKEN")
 class RelationshipTestCase(
     ViewTestCases.CreateObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
@@ -1983,7 +2009,7 @@ class RelationshipTestCase(
     RequiredRelationshipTestMixin,
 ):
     model = Relationship
-    slug_source = "name"
+    slug_source = "label"
     slugify_function = staticmethod(slugify_dashes_to_underscores)
 
     @classmethod
@@ -1994,29 +2020,29 @@ class RelationshipTestCase(
         status = Status.objects.get_for_model(Interface).first()
 
         Relationship(
-            name="Device VLANs",
-            slug="device-vlans",
+            label="Device VLANs",
+            key="device_vlans",
             type="many-to-many",
             source_type=device_type,
             destination_type=vlan_type,
         ).validated_save()
         Relationship(
-            name="Primary VLAN",
-            slug="primary-vlan",
+            label="Primary VLAN",
+            key="primary_vlan",
             type="one-to-many",
             source_type=vlan_type,
             destination_type=device_type,
         ).validated_save()
         Relationship(
-            name="Primary Interface",
+            label="Primary Interface",
             type="one-to-one",
             source_type=device_type,
             destination_type=interface_type,
         ).validated_save()
 
         cls.form_data = {
-            "name": "VLAN-to-Interface",
-            "slug": "vlan-to-interface",
+            "label": "VLAN-to-Interface",
+            "key": "vlan_to_interface",
             "type": "many-to-many",
             "source_type": vlan_type.pk,
             "source_label": "Interfaces",
@@ -2081,7 +2107,7 @@ class RelationshipTestCase(
             reverse("ipam:vlan_bulk_edit"),
             data={
                 "pk": [str(vlan.id) for vlan in vlans],
-                "add_cr_vlans-devices-m2m__source": [str(device_for_association.id)],
+                "add_cr_vlans_devices_m2m__source": [str(device_for_association.id)],
                 "_apply": [""],
             },
             follow=True,
@@ -2093,7 +2119,7 @@ class RelationshipTestCase(
             reverse("ipam:vlan_bulk_edit"),
             data={
                 "pk": [str(vlan.id) for vlan in vlans],
-                "remove_cr_vlans-devices-m2m__source": [str(device_for_association.id)],
+                "remove_cr_vlans_devices_m2m__source": [str(device_for_association.id)],
                 "_apply": [""],
             },
         )
@@ -2103,7 +2129,6 @@ class RelationshipTestCase(
         )
 
 
-@skip(reason="Content Types are BROKEN")
 class RelationshipAssociationTestCase(
     # TODO? ViewTestCases.CreateObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
@@ -2120,26 +2145,35 @@ class RelationshipAssociationTestCase(
         vlan_type = ContentType.objects.get_for_model(VLAN)
 
         relationship = Relationship(
-            name="Device VLANs",
-            slug="device-vlans",
+            label="Device VLANs",
+            key="device_vlans",
             type="many-to-many",
             source_type=device_type,
             destination_type=vlan_type,
         )
+        cls.relationship = relationship
         relationship.validated_save()
         manufacturer = Manufacturer.objects.first()
         devicetype = DeviceType.objects.create(manufacturer=manufacturer, model="Device Type 1", slug="device-type-1")
         devicerole = Role.objects.get_for_model(Device).first()
+        devicestatus = Status.objects.get_for_model(Device).first()
         location = Location.objects.first()
         devices = (
-            Device.objects.create(name="Device 1", device_type=devicetype, role=devicerole, location=location),
-            Device.objects.create(name="Device 2", device_type=devicetype, role=devicerole, location=location),
-            Device.objects.create(name="Device 3", device_type=devicetype, role=devicerole, location=location),
+            Device.objects.create(
+                name="Device 1", device_type=devicetype, role=devicerole, location=location, status=devicestatus
+            ),
+            Device.objects.create(
+                name="Device 2", device_type=devicetype, role=devicerole, location=location, status=devicestatus
+            ),
+            Device.objects.create(
+                name="Device 3", device_type=devicetype, role=devicerole, location=location, status=devicestatus
+            ),
         )
+        vlan_status = Status.objects.get_for_model(VLAN).first()
         vlans = (
-            VLAN.objects.create(vid=1, name="VLAN 1"),
-            VLAN.objects.create(vid=2, name="VLAN 2"),
-            VLAN.objects.create(vid=3, name="VLAN 3"),
+            VLAN.objects.create(vid=1, name="VLAN 1", status=vlan_status),
+            VLAN.objects.create(vid=2, name="VLAN 2", status=vlan_status),
+            VLAN.objects.create(vid=3, name="VLAN 3", status=vlan_status),
         )
 
         RelationshipAssociation(
@@ -2164,6 +2198,28 @@ class RelationshipAssociationTestCase(
             destination_id=vlans[2].pk,
         ).validated_save()
 
+    def test_list_objects_with_constrained_permission(self):
+        instance1, instance2 = self.relationship.relationship_associations.all()[:2]
+
+        # Add object-level permission
+        obj_perm = ObjectPermission(
+            name="Test permission",
+            constraints={"pk": instance1.pk},
+            actions=["view"],
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+
+        response = self.client.get(self._get_url("list"))
+        self.assertHttpStatus(response, 200)
+        content = extract_page_body(response.content.decode(response.charset))
+        # TODO: it'd make test failures more readable if we strip the page headers/footers from the content
+        self.assertIn(instance1.source.name, content, msg=content)
+        self.assertIn(instance1.destination.name, content, msg=content)
+        self.assertNotIn(instance2.source.name, content, msg=content)
+        self.assertNotIn(instance2.destination.name, content, msg=content)
+
 
 class StatusTestCase(
     ViewTestCases.CreateObjectViewTestCase,
@@ -2189,10 +2245,10 @@ class StatusTestCase(
 
         cls.csv_data = (
             "name,color,content_types"
-            'test_status1,ffffff,"dcim.device"'
-            'test_status2,ffffff,"dcim.device"'
-            'test_status3,ffffff,"dcim.device"'
-            'test_status4,ffffff,"dcim.device"'
+            "test_status1,ffffff,dcim.device"
+            'test_status2,ffffff,"dcim.device,dcim.location"'
+            "test_status3,ffffff,dcim.device"
+            "test_status4,ffffff,dcim.device"
         )
 
         cls.bulk_edit_data = {
@@ -2214,10 +2270,10 @@ class TagTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
         }
 
         cls.csv_data = (
-            "name,slug,color,description",
-            "Tag 4,tag-4,ff0000,Fourth tag",
-            "Tag 5,tag-5,00ff00,Fifth tag",
-            "Tag 6,tag-6,0000ff,Sixth tag",
+            "name,slug,color,description,content_types",
+            "Tag 4,tag-4,ff0000,Fourth tag,dcim.device",
+            'Tag 5,tag-5,00ff00,Fifth tag,"dcim.device,dcim.location"',
+            "Tag 6,tag-6,0000ff,Sixth tag,dcim.location",
         )
 
         cls.bulk_edit_data = {
@@ -2358,7 +2414,7 @@ class RoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
 
         cls.csv_data = (
             "name,weight,color,content_types,description",
-            'test_role1,1000,ffffff,"dcim.device",A Role',
+            "test_role1,1000,ffffff,dcim.device,A Role",
             'test_role2,200,ffffff,"dcim.device,dcim.rack",A Role',
             'test_role3,100,ffffff,"dcim.device,ipam.prefix",A Role',
             'test_role4,50,ffffff,"ipam.ipaddress,ipam.vlan",A Role',