nautobot 3.0.0a2__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
@@ -132,14 +132,14 @@ class ApprovalWorkflowDefinitionViewTestCase(
             ApprovalWorkflowDefinition.objects.create(
                 name=f"Test Approval Workflow {i}",
                 model_content_type=cls.scheduledjob_ct,
-                priority=i,
+                weight=i,
             )
 
         cls.form_data = {
             "name": "Test Approval Workflow Definition 5",
             "model_content_type": cls.scheduledjob_ct.pk,
             "model_constraints": '{"name": "Bulk Delete Objects"}',
-            "priority": 5,
+            "weight": 5,
             # These are the "management_form" fields required by the dynamic CustomFieldChoice formsets.
             "approval_workflow_stage_definitions-TOTAL_FORMS": "0",  # Set to 0 so validation succeeds until we need it
             "approval_workflow_stage_definitions-INITIAL_FORMS": "1",
@@ -161,14 +161,14 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         cls.approval_workflow_definition = ApprovalWorkflowDefinition.objects.create(
             name="Test Approval Workflow Definition 1",
             model_content_type=cls.scheduledjob_ct,
-            priority=10,
+            weight=10,
         )
         cls.approver_group = Group.objects.create(name="Test Group 1")
         cls.updated_approver_group = Group.objects.create(name="Test Group 2")
         # Deletable objects
         ApprovalWorkflowStageDefinition.objects.create(
             approval_workflow_definition=cls.approval_workflow_definition,
-            weight=100,
+            sequence=100,
             name="Test Approval Workflow 1 Stage 1 Definition",
             min_approvers=2,
             denial_message="Stage 1 Denial Message",
@@ -176,7 +176,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         )
         ApprovalWorkflowStageDefinition.objects.create(
             approval_workflow_definition=cls.approval_workflow_definition,
-            weight=200,
+            sequence=200,
             name="Test Approval Workflow 1 Stage 2 Definition",
             min_approvers=3,
             denial_message="Stage 2 Denial Message",
@@ -184,7 +184,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         )
         ApprovalWorkflowStageDefinition.objects.create(
             approval_workflow_definition=cls.approval_workflow_definition,
-            weight=300,
+            sequence=300,
             name="Test Approval Workflow 1 Stage 3 Definition",
             min_approvers=4,
             denial_message="Stage 3 Denial Message",
@@ -192,7 +192,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         )
         ApprovalWorkflowStageDefinition.objects.create(
             approval_workflow_definition=cls.approval_workflow_definition,
-            weight=400,
+            sequence=400,
             name="Test Approval Workflow 1 Stage 4 Definition",
             min_approvers=4,
             denial_message="Stage 4 Denial Message",
@@ -200,7 +200,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         )
         ApprovalWorkflowStageDefinition.objects.create(
             approval_workflow_definition=cls.approval_workflow_definition,
-            weight=500,
+            sequence=500,
             name="Test Approval Workflow 1 Stage 5 Definition",
             min_approvers=4,
             denial_message="Stage 5 Denial Message",
@@ -209,7 +209,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
 
         cls.form_data = {
             "approval_workflow_definition": cls.approval_workflow_definition.pk,
-            "weight": 600,
+            "sequence": 600,
             "name": "Approval Workflow Stage 1 Definition",
             "min_approvers": 2,
             "denial_message": "Stage 1 is denied",
@@ -218,7 +218,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
 
         cls.update_data = {
             "approval_workflow_definition": cls.approval_workflow_definition.pk,
-            "weight": 700,
+            "sequence": 700,
             "name": "Updated approval workflow stage 1",
             "min_approvers": 3,
             "denial_message": "updated message",
@@ -226,7 +226,7 @@ class ApprovalWorkflowStageDefinitionViewTestCase(ViewTestCases.PrimaryObjectVie
         }
 
         cls.bulk_edit_data = {
-            "weight": 800,
+            "sequence": 800,
             "min_approvers": 5,
             "denial_message": "updated denial message",
         }
@@ -264,7 +264,7 @@ class ApprovalWorkflowViewTestCase(
         ]
         approval_workflow_definitions = [
             ApprovalWorkflowDefinition.objects.create(
-                name=f"Test Approval Workflow {i}", model_content_type=cls.scheduledjob_ct, priority=i
+                name=f"Test Approval Workflow {i}", model_content_type=cls.scheduledjob_ct, weight=i
             )
             for i in range(5)
         ]
@@ -332,7 +332,7 @@ class ApprovalWorkflowStageViewTestCase(
             ApprovalWorkflowDefinition.objects.create(
                 name=f"Test Approval Workflow {i}",
                 model_content_type=cls.scheduledjob_ct,
-                priority=i,
+                weight=i,
             )
             for i in range(5)
         ]
@@ -342,7 +342,7 @@ class ApprovalWorkflowStageViewTestCase(
                 cls.approval_workflow_stage_definitions.append(
                     ApprovalWorkflowStageDefinition.objects.create(
                         approval_workflow_definition=approval_workflow_definition,
-                        weight=i * 100,
+                        sequence=i * 100,
                         name=f"Test Approval Workflow Stage {i} Definition",
                         min_approvers=i + 1,
                         denial_message=f"Stage {i} Denial Message",
@@ -516,7 +516,7 @@ class ApprovalWorkflowStageResponseViewTestCase(
             ApprovalWorkflowDefinition.objects.create(
                 name=f"Test Approval Workflow {i} Definition",
                 model_content_type=cls.scheduledjob_ct,
-                priority=i,
+                weight=i,
             )
             for i in range(5)
         ]
@@ -526,7 +526,7 @@ class ApprovalWorkflowStageResponseViewTestCase(
                 cls.approval_workflow_stage_definitions.append(
                     ApprovalWorkflowStageDefinition.objects.create(
                         approval_workflow_definition=approval_workflow_definition,
-                        weight=i * 100,
+                        sequence=i * 100,
                         name=f"Test Approval Workflow Stage {i} Definition",
                         min_approvers=i + 1,
                         denial_message=f"Stage {i} Denial Message",
@@ -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": [],
@@ -2346,6 +2349,7 @@ class SavedViewTest(ModelViewTestCase):
         self.assertIn(str(sv_shared.pk), response_body, msg=response_body)
         self.assertNotIn(str(sv_not_shared.pk), response_body, msg=response_body)
 
+    @tag("example_app")
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_create_saved_views_contain_boolean_filter_params(self):
         """
@@ -2754,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")
 
@@ -3290,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")
@@ -3327,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)
@@ -3461,7 +3412,7 @@ class JobTestCase(
         ApprovalWorkflowDefinition.objects.create(
             name="Test Approval Workflow Definition 1",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
 
         self.add_permissions("extras.run_job")
@@ -3491,7 +3442,7 @@ class JobTestCase(
         ApprovalWorkflowDefinition.objects.create(
             name="Approval Definition",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
         data = {
             "_schedule_type": "immediately",
@@ -3510,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),
-            priority=0,
+            weight=0,
+            model_constraints={"job_model__name": self.test_pass.name},
         )
+        workflow.validated_save()
         data = {
             "_schedule_type": "future",
             "_schedule_name": "test",
@@ -3522,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, _):
@@ -3574,7 +3528,7 @@ class JobTestCase(
         ApprovalWorkflowDefinition.objects.create(
             name="Approval Definition",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
 
         data = {
@@ -3599,7 +3553,7 @@ class JobTestCase(
         ApprovalWorkflowDefinition.objects.create(
             name="Approval Definition",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
 
         data = {
@@ -3625,7 +3579,7 @@ class JobTestCase(
         ApprovalWorkflowDefinition.objects.create(
             name="Approval Definition",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
         data = {
             "_schedule_type": "future",
@@ -3765,14 +3719,12 @@ class JobButtonRenderingTestCase(TestCase):
 
         self.location_type = LocationType.objects.get(name="Campus")
 
-    @tag("fix_in_v3")
     def test_view_object_with_job_button(self):
         """Ensure that the job button is rendered."""
         response = self.client.get(self.location_type.get_absolute_url(), follow=True)
         self.assertBodyContains(response, f"JobButton {self.location_type.name}")
         self.assertBodyContains(response, "Click me!")
 
-    @tag("fix_in_v3")
     def test_task_queue_hidden_input_is_present(self):
         """
         Ensure that the job button respects the job class' task_queues and the job class default job queue is passed as a hidden form input.
@@ -3800,7 +3752,6 @@ class JobButtonRenderingTestCase(TestCase):
             f'<input type="hidden" name="_job_queue" value="{self.job.default_job_queue.pk}">', content, content
         )
 
-    @tag("fix_in_v3")
     def test_view_object_with_unsafe_text(self):
         """Ensure that JobButton text can't be used as a vector for XSS."""
         self.job_button_1.text = '<script>alert("Hello world!")</script>'
@@ -3820,7 +3771,6 @@ class JobButtonRenderingTestCase(TestCase):
         self.assertNotIn("<script>alert", content, content)
         self.assertIn("&lt;script&gt;alert", content, content)
 
-    @tag("fix_in_v3")
     def test_view_object_with_unsafe_name(self):
         """Ensure that JobButton names can't be used as a vector for XSS."""
         self.job_button_1.text = "JobButton {{ obj"
@@ -3832,7 +3782,6 @@ class JobButtonRenderingTestCase(TestCase):
         self.assertNotIn("<script>alert", content, content)
         self.assertIn("&lt;script&gt;alert", content, content)
 
-    @tag("fix_in_v3")
     def test_render_constrained_run_permissions(self):
         obj_perm = ObjectPermission(
             name="Test permission",
@@ -3851,8 +3800,9 @@ class JobButtonRenderingTestCase(TestCase):
                 NO_CONFIRM_BUTTON.format(
                     button_id=self.job_button_1.pk,
                     button_text=f"JobButton {self.location_type.name}",
-                    button_class=self.job_button_1.button_class,
+                    button_class=self.job_button_1.button_class_css_class,
                     disabled="",
+                    menu_item="",
                 ),
                 content,
             )
@@ -3860,8 +3810,9 @@ class JobButtonRenderingTestCase(TestCase):
                 NO_CONFIRM_BUTTON.format(
                     button_id=self.job_button_2.pk,
                     button_text="Click me!",
-                    button_class=self.job_button_2.button_class,
+                    button_class=self.job_button_2.button_class_css_class,
                     disabled="disabled",
+                    menu_item="",
                 ),
                 content,
             )
@@ -3882,6 +3833,7 @@ class JobButtonRenderingTestCase(TestCase):
                     button_text=f"JobButton {self.location_type.name}",
                     button_class="link",
                     disabled="",
+                    menu_item="dropdown-item",
                 )
                 + "</li>",
                 content,
@@ -3893,12 +3845,14 @@ class JobButtonRenderingTestCase(TestCase):
                     button_text="Click me!",
                     button_class="link",
                     disabled="disabled",
+                    menu_item="dropdown-item",
                 )
                 + "</li>",
                 content,
             )
 
 
+@tag("example_app")
 class JobCustomTemplateTestCase(TestCase):
     @classmethod
     def setUpTestData(cls):
@@ -4067,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)
@@ -4591,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):
         """
@@ -4610,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="pull-right 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/",