nautobot 2.4.9__py3-none-any.whl → 2.4.11__py3-none-any.whl

nautobot/extras/tests/test_views.py

@@ -1137,7 +1137,7 @@ class ExportTemplateTestCase(
 
 class ExternalIntegrationTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = ExternalIntegration
-    bulk_edit_data = {"timeout": 10, "verify_ssl": True, "extra_config": r"{}", "headers": r"{}"}
+    bulk_edit_data = {"timeout": 10, "verify_ssl": True, "extra_config": '{"baz": "quux"}', "headers": '{"a": "b"}'}
     form_data = {
         "name": "Test External Integration",
         "remote_url": "https://example.com/test1/",
@@ -1956,21 +1956,21 @@ class ScheduledJobTestCase(
         user = User.objects.create(username="user1", is_active=True)
         ScheduledJob.objects.create(
             name="test1",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=user,
             start_time=timezone.now(),
         )
         ScheduledJob.objects.create(
             name="test2",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             interval=JobExecutionType.TYPE_DAILY,
             user=user,
             start_time=timezone.now(),
         )
         ScheduledJob.objects.create(
             name="test3",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             interval=JobExecutionType.TYPE_CUSTOM,
             user=user,
             start_time=timezone.now(),
@@ -1984,7 +1984,7 @@ class ScheduledJobTestCase(
         ScheduledJob.objects.create(
             enabled=False,
             name="test4",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=self.user,
             start_time=timezone.now(),
@@ -2001,7 +2001,7 @@ class ScheduledJobTestCase(
             ScheduledJob.objects.create(
                 enabled=True,
                 name=name,
-                task="pass.TestPassJob",
+                task="pass_job.TestPassJob",
                 interval=JobExecutionType.TYPE_CUSTOM,
                 user=self.user,
                 start_time=timezone.now(),
@@ -2032,7 +2032,7 @@ class ScheduledJobTestCase(
         ScheduledJob.objects.create(
             enabled=True,
             name="test11",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             interval=JobExecutionType.TYPE_CUSTOM,
             user=self.user,
             start_time=timezone.now(),
@@ -2092,7 +2092,7 @@ class ApprovalQueueTestCase(
 
         ScheduledJob.objects.create(
             name="test4",
-            task="pass.TestPassJob",
+            task="pass_job.TestPassJob",
             job_model=self.job_model,
             interval=JobExecutionType.TYPE_IMMEDIATELY,
             user=self.user,
@@ -2483,7 +2483,7 @@ class JobResultTestCase(
 
     @classmethod
     def setUpTestData(cls):
-        JobResult.objects.create(name="pass.TestPassJob")
+        JobResult.objects.create(name="pass_job.TestPassJob")
         JobResult.objects.create(name="fail.TestFailJob")
         JobLogEntry.objects.create(
             log_level=LogLevelChoices.LOG_INFO,
@@ -3079,6 +3079,25 @@ class JobTestCase(
                 "One of these two flags must be removed before this job can be scheduled or run.",
             )
 
+    @mock.patch("nautobot.extras.views.get_worker_count", return_value=1)
+    def test_run_job_with_approval_required_creates_scheduled_job_internal_future(self, _):
+        self.add_permissions("extras.run_job")
+        self.add_permissions("extras.view_scheduledjob")
+
+        self.test_pass.approval_required = True
+        self.test_pass.save()
+        data = {
+            "_schedule_type": "immediately",
+        }
+        for run_url in self.run_urls:
+            response = self.client.post(run_url, data)
+            scheduled_job = ScheduledJob.objects.last()
+            self.assertTrue(scheduled_job.interval, JobExecutionType.TYPE_FUTURE)
+            self.assertRedirects(
+                response,
+                reverse("extras:scheduledjob_approval_queue_list"),
+            )
+
     def test_job_object_change_log_view(self):
         """Assert Job change log view displays appropriate header"""
         instance = self.test_pass
@@ -3657,6 +3676,43 @@ class RelationshipAssociationTestCase(
         self.assertNotIn(instance2.source.name, content, msg=content)
         self.assertNotIn(instance2.destination.name, content, msg=content)
 
+    def test_get_object_with_advanced_relationships(self):
+        device_type = ContentType.objects.get_for_model(Device)
+        vlan_type = ContentType.objects.get_for_model(VLAN)
+        Relationship.objects.create(
+            label="Device VLANs 4",
+            key="device_vlans_4",
+            type="one-to-many",
+            source_type=device_type,
+            source_label="Device VLANs Advanced",
+            destination_type=vlan_type,
+            destination_label="VLANs",
+            advanced_ui=True,
+        )
+        Relationship.objects.create(
+            label="Device VLANs 5",
+            key="device_vlans_5",
+            type="one-to-many",
+            source_type=device_type,
+            source_label="Device VLANs Main",
+            destination_type=vlan_type,
+            destination_label="VLANs",
+            advanced_ui=False,
+        )
+
+        device = Device.objects.first()
+        # Add model-level permission
+        self.add_permissions(f"{Device._meta.app_label}.view_{Device._meta.model_name}")
+        # Try GET the main tab
+        response = self.client.get(device.get_absolute_url())
+        response_content = extract_page_body(response.content.decode(response.charset))
+        # The relationship's source label should be in the advanced tab since advance_ui=True
+        # a.k.a its index should be greater than the index of the advanced tab
+        self.assertGreater(response_content.find("Device VLANs Advanced"), response_content.find('id="advanced"'))
+        # The relationship's source label should not be in the advanced tab since advance_ui=False
+        # a.k.a its index should be smaller than the index of the advanced tab
+        self.assertGreater(response_content.find('id="advanced"'), response_content.find("Device VLANs Main"))
+
 
 class StaticGroupAssociationTestCase(
     ViewTestCases.BulkDeleteObjectsViewTestCase,
@@ -3920,8 +3976,7 @@ class WebhookTestCase(
             "http_content_type": "application/json",
         }
         cls.bulk_edit_data = {
-            "name": "webhook-4",
-            "enabled": True,
+            "enabled": False,
             "type_create": True,
             "type_update": True,
             "type_delete": False,

nautobot/extras/urls.py

@@ -3,8 +3,6 @@ from django.urls import path
 from nautobot.core.views.routers import NautobotUIViewSetRouter
 from nautobot.extras import views
 from nautobot.extras.models import (
-    ConfigContext,
-    ConfigContextSchema,
     CustomField,
     DynamicGroup,
     GitRepository,
@@ -13,13 +11,14 @@ from nautobot.extras.models import (
     Note,
     Relationship,
     SecretsGroup,
-    Tag,
 )
 
 app_name = "extras"
 
 router = NautobotUIViewSetRouter()
 router.register("computed-fields", views.ComputedFieldUIViewSet)
+router.register("config-context-schemas", views.ConfigContextSchemaUIViewSet)
+router.register("config-contexts", views.ConfigContextUIViewSet)
 router.register("contacts", views.ContactUIViewSet)
 router.register("contact-associations", views.ContactAssociationUIViewSet)
 router.register("custom-links", views.CustomLinkUIViewSet)
@@ -30,12 +29,14 @@ router.register("job-hooks", views.JobHookUIViewSet)
 router.register("job-queues", views.JobQueueUIViewSet)
 router.register("metadata-types", views.MetadataTypeUIViewSet)
 router.register("object-metadata", views.ObjectMetadataUIViewSet)
+router.register("relationship-associations", views.RelationshipAssociationUIViewSet)
 router.register("relationships", views.RelationshipUIViewSet)
 router.register("roles", views.RoleUIViewSet)
 router.register("saved-views", views.SavedViewUIViewSet)
 router.register("secrets", views.SecretUIViewSet)
 router.register("static-group-associations", views.StaticGroupAssociationUIViewSet)
 router.register("statuses", views.StatusUIViewSet)
+router.register("tags", views.TagUIViewSet)
 router.register("teams", views.TeamUIViewSet)
 router.register("webhooks", views.WebhookUIViewSet)
 
@@ -43,107 +44,12 @@ urlpatterns = [
     # Change logging
     path("object-changes/", views.ObjectChangeListView.as_view(), name="objectchange_list"),
     path("object-changes/<uuid:pk>/", views.ObjectChangeView.as_view(), name="objectchange"),
-    # Config contexts
-    path(
-        "config-contexts/",
-        views.ConfigContextListView.as_view(),
-        name="configcontext_list",
-    ),
-    path(
-        "config-contexts/add/",
-        views.ConfigContextEditView.as_view(),
-        name="configcontext_add",
-    ),
-    path(
-        "config-contexts/edit/",
-        views.ConfigContextBulkEditView.as_view(),
-        name="configcontext_bulk_edit",
-    ),
-    path(
-        "config-contexts/delete/",
-        views.ConfigContextBulkDeleteView.as_view(),
-        name="configcontext_bulk_delete",
-    ),
-    path(
-        "config-contexts/<uuid:pk>/",
-        views.ConfigContextView.as_view(),
-        name="configcontext",
-    ),
-    path(
-        "config-contexts/<uuid:pk>/edit/",
-        views.ConfigContextEditView.as_view(),
-        name="configcontext_edit",
-    ),
-    path(
-        "config-contexts/<uuid:pk>/delete/",
-        views.ConfigContextDeleteView.as_view(),
-        name="configcontext_delete",
-    ),
-    path(
-        "config-contexts/<uuid:pk>/changelog/",
-        views.ObjectChangeLogView.as_view(),
-        name="configcontext_changelog",
-        kwargs={"model": ConfigContext},
-    ),
-    path(
-        "config-contexts/<uuid:pk>/notes/",
-        views.ObjectNotesView.as_view(),
-        name="configcontext_notes",
-        kwargs={"model": ConfigContext},
-    ),
     # Config context schema
-    path(
-        "config-context-schemas/",
-        views.ConfigContextSchemaListView.as_view(),
-        name="configcontextschema_list",
-    ),
-    path(
-        "config-context-schemas/add/",
-        views.ConfigContextSchemaEditView.as_view(),
-        name="configcontextschema_add",
-    ),
-    path(
-        "config-context-schemas/edit/",
-        views.ConfigContextSchemaBulkEditView.as_view(),
-        name="configcontextschema_bulk_edit",
-    ),
-    path(
-        "config-context-schemas/delete/",
-        views.ConfigContextSchemaBulkDeleteView.as_view(),
-        name="configcontextschema_bulk_delete",
-    ),
-    path(
-        "config-context-schemas/<uuid:pk>/",
-        views.ConfigContextSchemaView.as_view(),
-        name="configcontextschema",
-    ),
     path(
         "config-context-schemas/<uuid:pk>/validation/",
         views.ConfigContextSchemaObjectValidationView.as_view(),
         name="configcontextschema_object_validation",
     ),
-    path(
-        "config-context-schemas/<uuid:pk>/edit/",
-        views.ConfigContextSchemaEditView.as_view(),
-        name="configcontextschema_edit",
-    ),
-    path(
-        "config-context-schemas/<uuid:pk>/delete/",
-        views.ConfigContextSchemaDeleteView.as_view(),
-        name="configcontextschema_delete",
-    ),
-    path(
-        "config-context-schemas/<uuid:pk>/changelog/",
-        views.ObjectChangeLogView.as_view(),
-        name="configcontextschema_changelog",
-        kwargs={"model": ConfigContextSchema},
-    ),
-    path(
-        "config-context-schemas/<uuid:pk>/notes/",
-        views.ObjectNotesView.as_view(),
-        name="configcontextschema_notes",
-        kwargs={"model": ConfigContextSchema},
-    ),
     # contacts
     path("contact-associations/add-new-contact/", views.ObjectNewContactView.as_view(), name="object_contact_add"),
     path("contact-associations/add-new-team/", views.ObjectNewTeamView.as_view(), name="object_team_add"),
@@ -399,21 +305,6 @@ urlpatterns = [
         name="relationship_notes",
         kwargs={"model": Relationship},
     ),
-    path(
-        "relationship-associations/",
-        views.RelationshipAssociationListView.as_view(),
-        name="relationshipassociation_list",
-    ),
-    path(
-        "relationship-associations/delete/",
-        views.RelationshipAssociationBulkDeleteView.as_view(),
-        name="relationshipassociation_bulk_delete",
-    ),
-    path(
-        "relationship-associations/<uuid:pk>/delete/",
-        views.RelationshipAssociationDeleteView.as_view(),
-        name="relationshipassociation_delete",
-    ),
     # Secrets
     path(
         "secrets/provider/<str:provider_slug>/form/",
@@ -438,27 +329,6 @@ urlpatterns = [
         name="secretsgroup_notes",
         kwargs={"model": SecretsGroup},
     ),
-    # Tags
-    path("tags/", views.TagListView.as_view(), name="tag_list"),
-    path("tags/add/", views.TagEditView.as_view(), name="tag_add"),
-    path("tags/import/", views.TagBulkImportView.as_view(), name="tag_import"),  # 3.0 TODO: remove, unused
-    path("tags/edit/", views.TagBulkEditView.as_view(), name="tag_bulk_edit"),
-    path("tags/delete/", views.TagBulkDeleteView.as_view(), name="tag_bulk_delete"),
-    path("tags/<uuid:pk>/", views.TagView.as_view(), name="tag"),
-    path("tags/<uuid:pk>/edit/", views.TagEditView.as_view(), name="tag_edit"),
-    path("tags/<uuid:pk>/delete/", views.TagDeleteView.as_view(), name="tag_delete"),
-    path(
-        "tags/<uuid:pk>/changelog/",
-        views.ObjectChangeLogView.as_view(),
-        name="tag_changelog",
-        kwargs={"model": Tag},
-    ),
-    path(
-        "tags/<uuid:pk>/notes/",
-        views.ObjectNotesView.as_view(),
-        name="tag_notes",
-        kwargs={"model": Tag},
-    ),
 ]
 
 urlpatterns += router.urls