nautobot 2.1.0b1__py3-none-any.whl → 2.1.1__py3-none-any.whl

nautobot/extras/test_jobs/has_sensitive_variables.py

@@ -1,6 +1,5 @@
 from nautobot.core.celery import register_jobs
-from nautobot.extras.jobs import Job, get_task_logger
-
+from nautobot.extras.jobs import get_task_logger, Job
 
 logger = get_task_logger(__name__)
 

nautobot/extras/test_jobs/ipaddress_vars.py

@@ -1,10 +1,7 @@
 import json
 
-from nautobot.extras.jobs import get_task_logger
-
 from nautobot.core.celery import register_jobs
-from nautobot.extras.jobs import Job, IPAddressVar, IPAddressWithMaskVar
-
+from nautobot.extras.jobs import get_task_logger, IPAddressVar, IPAddressWithMaskVar, Job
 
 logger = get_task_logger(__name__)
 name = "IP Addresses"

nautobot/extras/test_jobs/job_button_receiver.py

@@ -1,7 +1,6 @@
 from nautobot.core.celery import register_jobs
 from nautobot.dcim.models import Device, Location
-from nautobot.extras.jobs import JobButtonReceiver, get_task_logger
-
+from nautobot.extras.jobs import get_task_logger, JobButtonReceiver
 
 logger = get_task_logger(__name__)
 

nautobot/extras/test_jobs/job_hook_receiver.py

@@ -1,9 +1,8 @@
 from nautobot.core.celery import register_jobs
 from nautobot.dcim.models import Location, LocationType
-from nautobot.extras.jobs import JobHookReceiver, get_task_logger
+from nautobot.extras.jobs import get_task_logger, JobHookReceiver
 from nautobot.extras.models import Status
 
-
 logger = get_task_logger(__name__)
 
 

nautobot/extras/test_jobs/job_variables.py

@@ -1,5 +1,4 @@
 from nautobot.core.celery import register_jobs
-from nautobot.extras.models import Role
 from nautobot.extras.jobs import (
     BooleanVar,
     ChoiceVar,
@@ -9,13 +8,14 @@ from nautobot.extras.jobs import (
     IPAddressWithMaskVar,
     IPNetworkVar,
     Job,
+    JSONVar,
     MultiChoiceVar,
     MultiObjectVar,
     ObjectVar,
     StringVar,
     TextVar,
 )
-
+from nautobot.extras.models import Role
 
 CHOICES = (("ff0000", "Red"), ("00ff00", "Green"), ("0000ff", "Blue"))
 
@@ -68,6 +68,10 @@ class TextVarJob(Job):
     var1 = TextVar()
 
 
+class JSONVarJob(Job):
+    var1 = JSONVar()
+
+
 job_list = [
     BooleanVarJob,
     ChoiceVarJob,
@@ -76,6 +80,7 @@ job_list = [
     IPAddressVarJob,
     IPAddressWithMaskVarJob,
     IPNetworkVarJob,
+    JSONVarJob,
     MultiChoiceVarJob,
     MultiObjectVarJob,
     ObjectVarJob,

nautobot/extras/test_jobs/location_with_custom_field.py

@@ -4,10 +4,9 @@ from django.db import transaction
 from nautobot.core.celery import register_jobs
 from nautobot.dcim.models import Location, LocationType
 from nautobot.extras.choices import CustomFieldTypeChoices
-from nautobot.extras.jobs import Job, get_task_logger
+from nautobot.extras.jobs import get_task_logger, Job
 from nautobot.extras.models import CustomField, Status
 
-
 logger = get_task_logger(__name__)
 
 

nautobot/extras/test_jobs/log_redaction.py

@@ -1,6 +1,5 @@
 from nautobot.core.celery import register_jobs
-from nautobot.extras.jobs import Job, get_task_logger
-
+from nautobot.extras.jobs import get_task_logger, Job
 
 logger = get_task_logger(__name__)
 

nautobot/extras/test_jobs/log_skip_db_logging.py

@@ -1,6 +1,5 @@
 from nautobot.core.celery import register_jobs
-from nautobot.extras.jobs import Job, get_task_logger
-
+from nautobot.extras.jobs import get_task_logger, Job
 
 logger = get_task_logger(__name__)
 

nautobot/extras/test_jobs/modify_db.py

@@ -1,8 +1,7 @@
 from nautobot.core.celery import register_jobs
-from nautobot.extras.jobs import Job, get_task_logger
+from nautobot.extras.jobs import get_task_logger, Job
 from nautobot.extras.models import Status
 
-
 logger = get_task_logger(__name__)
 
 

nautobot/extras/test_jobs/object_var_optional.py

@@ -1,7 +1,6 @@
 from nautobot.core.celery import register_jobs
-from nautobot.extras.jobs import Job, ObjectVar, get_task_logger
 from nautobot.dcim.models import Location
-
+from nautobot.extras.jobs import get_task_logger, Job, ObjectVar
 
 logger = get_task_logger(__name__)
 

nautobot/extras/test_jobs/object_var_required.py

@@ -1,7 +1,6 @@
 from nautobot.core.celery import register_jobs
-from nautobot.extras.jobs import Job, ObjectVar, get_task_logger
 from nautobot.dcim.models import Location
-
+from nautobot.extras.jobs import get_task_logger, Job, ObjectVar
 
 logger = get_task_logger(__name__)
 

nautobot/extras/test_jobs/object_vars.py

@@ -1,8 +1,7 @@
 from nautobot.core.celery import register_jobs
-from nautobot.extras.jobs import Job, ObjectVar, MultiObjectVar, get_task_logger
+from nautobot.extras.jobs import get_task_logger, Job, MultiObjectVar, ObjectVar
 from nautobot.extras.models import Role
 
-
 logger = get_task_logger(__name__)
 name = "Object Vars"
 

nautobot/extras/test_jobs/pass.py

@@ -1,6 +1,5 @@
 from nautobot.core.celery import register_jobs
-from nautobot.extras.jobs import Job, get_task_logger
-
+from nautobot.extras.jobs import get_task_logger, Job
 
 logger = get_task_logger(__name__)
 

nautobot/extras/test_jobs/profiling.py

@@ -2,8 +2,7 @@ import pstats
 import tempfile
 
 from nautobot.core.celery import register_jobs
-from nautobot.extras.jobs import Job, get_task_logger
-
+from nautobot.extras.jobs import get_task_logger, Job
 
 logger = get_task_logger(__name__)
 

nautobot/extras/tests/integration/__init__.py

@@ -2,8 +2,8 @@ import uuid
 
 from django.contrib.contenttypes.models import ContentType
 
-from nautobot.extras.models import Role, Status
 from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Manufacturer
+from nautobot.extras.models import Role, Status
 
 
 def create_test_device():

nautobot/extras/tests/integration/test_computedfields.py

@@ -67,7 +67,7 @@ class ComputedFieldsTestCase(SeleniumTestCase):
         and then checks to see if it actually appears there.
         """
         self.browser.visit(f"{self.live_server_url}/dcim/devices/")
-        self.browser.find_by_xpath(".//button[@title='Configure table']").click()
+        self.browser.find_by_xpath(".//button[@data-original-title='Configure table']").click()
         select_option = self.browser.find_by_xpath(
             ".//select[@id='id_columns']/option[contains(text(), 'Device Computed Field')]"
         )
@@ -75,6 +75,6 @@ class ComputedFieldsTestCase(SeleniumTestCase):
         select_option.click()
         self.browser.find_by_xpath(".//input[@value='Save']").click()
         self.assertTrue(self.browser.is_text_present(f"{self.device.name} is awesome!"))
-        self.browser.find_by_xpath(".//button[@title='Configure table']").click()
+        self.browser.find_by_xpath(".//button[@data-original-title='Configure table']").click()
         self.browser.find_by_xpath(".//input[@value='Reset']").click()
         self.assertFalse(self.browser.is_text_present(f"{self.device.name} is awesome!"))

nautobot/extras/tests/integration/test_configcontextschema.py

@@ -148,7 +148,7 @@ class ConfigContextSchemaTestCase(SeleniumTestCase):
         for row in self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr"):
             self.assertEqual(
                 row.find_by_tag("td")[-2].html,
-                '<span class="text-success"><i class="mdi mdi-check-bold" title="Yes"></i></span>',
+                '<span class="text-success"><i class="mdi mdi-check-bold" title="" data-original-title="Yes"></i></span>',
             )
 
         # Edit the schema
@@ -170,7 +170,7 @@ class ConfigContextSchemaTestCase(SeleniumTestCase):
         for row in self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr"):
             self.assertEqual(
                 row.find_by_tag("td")[-2].html,
-                '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
+                '<span class="text-danger"><i class="mdi mdi-close-thick" title="" data-original-title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
             )
 
         # Edit the device local context data and redirect back to the validation tab
@@ -188,15 +188,15 @@ class ConfigContextSchemaTestCase(SeleniumTestCase):
         # Config context still fails
         self.assertEqual(
             self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")[0].find_by_tag("td")[-2].html,
-            '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
+            '<span class="text-danger"><i class="mdi mdi-close-thick" title="" data-original-title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
         )
         # Device now passes
         self.assertEqual(
             self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")[1].find_by_tag("td")[-2].html,
-            '<span class="text-success"><i class="mdi mdi-check-bold" title="Yes"></i></span>',
+            '<span class="text-success"><i class="mdi mdi-check-bold" title="" data-original-title="Yes"></i></span>',
         )
         # Virtual machine still fails
         self.assertEqual(
             self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")[2].find_by_tag("td")[-2].html,
-            '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
+            '<span class="text-danger"><i class="mdi mdi-close-thick" title="" data-original-title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
         )

nautobot/extras/tests/integration/test_plugins.py

@@ -28,9 +28,10 @@ class PluginWebhookTest(SeleniumTestCase):
 
     def setUp(self):
         super().setUp()
-        for f in os.listdir("/tmp"):
+        tempdir = tempfile.gettempdir()
+        for f in os.listdir(tempdir):
             if f.startswith("test_plugin_webhook_"):
-                os.remove(os.path.join("/tmp", f))
+                os.remove(os.path.join(tempdir, f))
 
         self.url = f"http://localhost:{self.server_thread.port}" + reverse(
             "plugins-api:example_plugin-api:examplemodel_webhook"
@@ -200,7 +201,7 @@ class PluginTabsTestCase(SeleniumTestCase):
         self.browser.links.find_by_partial_text("Example App Tab")[0].click()
         self.assertTrue(
             self.browser.is_text_present(
-                f"I am some content for the example plugin's circuit ({str(circuit.pk)}) detail tab."
+                f"I am some content for the example plugin's circuit ({circuit.pk!s}) detail tab."
             )
         )
 
@@ -218,6 +219,6 @@ class PluginTabsTestCase(SeleniumTestCase):
             self.browser.links.find_by_partial_text(f"Example App Tab {tab_i}")[0].click()
             self.assertTrue(
                 self.browser.is_text_present(
-                    f"I am some content for the example plugin's device ({str(device.pk)}) detail tab {tab_i}."
+                    f"I am some content for the example plugin's device ({device.pk!s}) detail tab {tab_i}."
                 )
             )

nautobot/extras/tests/integration/test_tagfilter.py

@@ -3,8 +3,8 @@ import time
 from django.contrib.contenttypes.models import ContentType
 
 from nautobot.circuits.models import Provider
-from nautobot.extras.models import Tag
 from nautobot.core.testing.integration import SeleniumTestCase
+from nautobot.extras.models import Tag
 
 
 class TagFilterTestCase(SeleniumTestCase):

nautobot/extras/tests/test_api.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
-import uuid
 import tempfile
 from unittest import mock, skip
+import uuid
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -13,16 +13,16 @@ from django.utils.timezone import make_aware, now
 from rest_framework import status
 
 from nautobot.core.choices import ColorChoices
+from nautobot.core.models.fields import slugify_dashes_to_underscores
 from nautobot.core.testing import APITestCase, APIViewTestCases
 from nautobot.core.testing.utils import disable_warnings
 from nautobot.core.utils.lookup import get_route_for_model
-from nautobot.core.models.fields import slugify_dashes_to_underscores
 from nautobot.dcim.models import (
     Device,
     DeviceType,
-    Manufacturer,
     Location,
     LocationType,
+    Manufacturer,
     Rack,
     RackGroup,
 )
@@ -37,6 +37,7 @@ from nautobot.extras.choices import (
     RelationshipTypeChoices,
     SecretsGroupAccessTypeChoices,
     SecretsGroupSecretTypeChoices,
+    WebhookHttpMethodChoices,
 )
 from nautobot.extras.jobs import get_job
 from nautobot.extras.models import (
@@ -69,15 +70,13 @@ from nautobot.extras.models import (
     Tag,
     Webhook,
 )
-from nautobot.extras.models.jobs import JobHook, JobButton
+from nautobot.extras.models.jobs import JobButton, JobHook
 from nautobot.extras.tests.constants import BIG_GRAPHQL_DEVICE_QUERY
 from nautobot.extras.tests.test_relationships import RequiredRelationshipTestMixin
 from nautobot.extras.utils import TaggableClassesQuery
-
-from nautobot.ipam.models import IPAddress, Prefix, VLANGroup, VLAN
+from nautobot.ipam.models import IPAddress, Prefix, VLAN, VLANGroup
 from nautobot.users.models import ObjectPermission
 
-
 User = get_user_model()
 
 
@@ -824,10 +823,14 @@ class ExternalIntegrationTest(APIViewTestCases.APIViewTestCase):
             "verify_ssl": False,
             "timeout": 5,
             "extra_config": "{'foo': 'bar'}",
+            "http_method": WebhookHttpMethodChoices.METHOD_DELETE,
+            "headers": "{'header': 'fake header'}",
+            "ca_file_path": "/this/is/a/file/path",
         },
         {
             "name": "Test External Integration 2",
             "remote_url": "http://example.com/test2/",
+            "http_method": WebhookHttpMethodChoices.METHOD_POST,
         },
         {
             "name": "Test External Integration 3",
@@ -835,9 +838,12 @@ class ExternalIntegrationTest(APIViewTestCases.APIViewTestCase):
             "verify_ssl": True,
             "timeout": 30,
             "extra_config": "{'foo': ['bat', 'baz']}",
+            "headers": "{'new_header': 'fake header'}",
+            "ca_file_path": "/this/is/a/new/file/path",
         },
     ]
     bulk_update_data = {"timeout": 10, "verify_ssl": True, "extra_config": r"{}"}
+    choices_fields = ["http_method"]
 
 
 class FileProxyTest(
@@ -3198,7 +3204,7 @@ class SecretTest(APIViewTestCases.APIViewTestCase):
             test_secret = Secret.objects.create(
                 name="secret-check-test-not-accessible",
                 provider="text-file",
-                parameters={"path": "/tmp/does-not-matter"},
+                parameters={"path": "/tmp/does-not-matter"},  # noqa: S108  # hardcoded-temp-file -- false positive
             )
             response = self.client.get(reverse("extras-api:secret-check", kwargs={"pk": test_secret.pk}), **self.header)
             self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
@@ -3223,7 +3229,7 @@ class SecretTest(APIViewTestCases.APIViewTestCase):
             test_secret = Secret.objects.create(
                 name="secret-check-test-failed",
                 provider="text-file",
-                parameters={"path": "/tmp/does-not-exist"},
+                parameters={"path": "/tmp/does-not-exist"},  # noqa: S108  # hardcoded-temp-file -- false positive
             )
             response = self.client.get(reverse("extras-api:secret-check", kwargs={"pk": test_secret.pk}), **self.header)
             self.assertHttpStatus(response, status.HTTP_200_OK)

nautobot/extras/tests/test_changelog.py

@@ -4,7 +4,6 @@ from django.urls import reverse
 from django.utils.html import escape
 from rest_framework import status
 
-from example_plugin.signals import EXAMPLE_PLUGIN_CUSTOM_FIELD_DEFAULT, EXAMPLE_PLUGIN_CUSTOM_FIELD_NAME
 from nautobot.core.graphql import execute_query
 from nautobot.core.testing import APITestCase, TestCase
 from nautobot.core.testing.utils import post_data
@@ -16,7 +15,9 @@ from nautobot.extras import context_managers
 from nautobot.extras.choices import CustomFieldTypeChoices, ObjectChangeActionChoices, ObjectChangeEventContextChoices
 from nautobot.extras.models import CustomField, CustomFieldChoice, ObjectChange, Status, Tag
 from nautobot.ipam.models import VLAN, VLANGroup
-from nautobot.virtualization.models import Cluster, ClusterType, VMInterface, VirtualMachine
+from nautobot.virtualization.models import Cluster, ClusterType, VirtualMachine, VMInterface
+
+from example_plugin.signals import EXAMPLE_PLUGIN_CUSTOM_FIELD_DEFAULT, EXAMPLE_PLUGIN_CUSTOM_FIELD_NAME
 
 
 class ChangeLogViewTest(ModelViewTestCase):

nautobot/extras/tests/test_context_managers.py

@@ -10,18 +10,21 @@ from nautobot.extras.choices import ObjectChangeActionChoices, ObjectChangeEvent
 from nautobot.extras.context_managers import web_request_context
 from nautobot.extras.models import Status, Webhook
 
-
 # Use the proper swappable User model
 User = get_user_model()
 
 
 class WebRequestContextTestCase(TestCase):
     def setUp(self):
-        self.user = User.objects.create_user(username="jacob", email="jacob@example.com", password="top_secret")
+        self.user = User.objects.create_user(
+            username="jacob",
+            email="jacob@example.com",
+            password="top_secret",  # noqa: S106  # hardcoded-password-func-arg -- ok as this is test code only
+        )
 
         location_ct = ContentType.objects.get_for_model(Location)
         MOCK_URL = "http://localhost/"
-        MOCK_SECRET = "LOOKATMEIMASECRETSTRING"
+        MOCK_SECRET = "LOOKATMEIMASECRETSTRING"  # noqa: S105  # hardcoded-password-string -- ok as this is test code
 
         webhooks = Webhook.objects.bulk_create(
             (

nautobot/extras/tests/test_customfields.py

@@ -7,9 +7,9 @@ from django.db.models import ProtectedError
 from django.forms import ChoiceField, IntegerField, NumberInput
 from django.urls import reverse
 from rest_framework import status
-from nautobot.core.forms.widgets import MultiValueCharInput, StaticSelect2
 
 from nautobot.circuits.models import Provider
+from nautobot.core.forms.widgets import MultiValueCharInput, StaticSelect2
 from nautobot.core.models.fields import slugify_dashes_to_underscores
 from nautobot.core.tables import CustomFieldColumn
 from nautobot.core.testing import APITestCase, TestCase, TransactionTestCase
@@ -19,7 +19,7 @@ from nautobot.dcim.filters import LocationFilterSet
 from nautobot.dcim.forms import RackFilterForm
 from nautobot.dcim.models import Device, Location, LocationType, Rack
 from nautobot.dcim.tables import LocationTable
-from nautobot.extras.choices import CustomFieldTypeChoices, CustomFieldFilterLogicChoices
+from nautobot.extras.choices import CustomFieldFilterLogicChoices, CustomFieldTypeChoices
 from nautobot.extras.models import ComputedField, CustomField, CustomFieldChoice, Status
 from nautobot.users.models import ObjectPermission
 from nautobot.virtualization.models import VirtualMachine
@@ -408,14 +408,14 @@ class CustomFieldDataAPITest(APITestCase):
 
         # Text custom field
         cls.cf_text = CustomField(
-            type=CustomFieldTypeChoices.TYPE_TEXT, label="Text Field", key="text_cf", default="foo"
+            type=CustomFieldTypeChoices.TYPE_TEXT, label="Text Field", key="text_cf", default="FOO"
         )
         cls.cf_text.save()
         cls.cf_text.content_types.set([content_type])
 
         # Integer custom field
         cls.cf_integer = CustomField(
-            type=CustomFieldTypeChoices.TYPE_INTEGER, label="Number Field", key="number_cf", default=123
+            type=CustomFieldTypeChoices.TYPE_INTEGER, label="Number Field", key="number_cf", default=12
         )
         cls.cf_integer.save()
         cls.cf_integer.content_types.set([content_type])

nautobot/extras/tests/test_datasources.py

@@ -13,9 +13,9 @@ import yaml
 
 from nautobot.core.jobs import GitRepositoryDryRun, GitRepositorySync
 from nautobot.core.testing import (
-    TransactionTestCase,
     create_job_result_and_run_job,
     run_job_for_testing,
+    TransactionTestCase,
 )
 from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Manufacturer
 from nautobot.extras.choices import (

nautobot/extras/tests/test_dynamicgroups.py

@@ -1,14 +1,13 @@
 import random
 import time
-
 from unittest.mock import patch
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.db.models import ProtectedError
-from django.urls import reverse
 from django.test import override_settings
+from django.urls import reverse
 
 from nautobot.core.forms.fields import MultiMatchModelMultipleChoiceField, MultiValueCharField
 from nautobot.core.forms.widgets import APISelectMultiple, MultiValueCharInput
@@ -49,6 +48,7 @@ from nautobot.tenancy.models import Tenant
 class DynamicGroupTestBase(TestCase):
     @classmethod
     def setUpTestData(cls):
+        Device.objects.all().delete()
         cls.device_ct = ContentType.objects.get_for_model(Device)
         cls.dynamicgroup_ct = ContentType.objects.get_for_model(DynamicGroup)
         cls.lt = LocationType.objects.get(name="Campus")
@@ -1010,7 +1010,7 @@ class DynamicGroupModelTest(DynamicGroupTestBase):  # TODO: BaseModelTestCase mi
             group.members_cached
             self.assertEqual(mock_get_queryset.call_count, 1)
 
-            time.sleep(2)  # Let the cache expire
+            time.sleep(5)  # Let the cache expire
 
             group.members_cached
             self.assertEqual(mock_get_queryset.call_count, 2)

nautobot/extras/tests/test_filters.py

@@ -39,8 +39,8 @@ from nautobot.extras.filters import (
     GitRepositoryFilterSet,
     GraphQLQueryFilterSet,
     ImageAttachmentFilterSet,
-    JobFilterSet,
     JobButtonFilterSet,
+    JobFilterSet,
     JobHookFilterSet,
     JobLogEntryFilterSet,
     JobResultFilterSet,
@@ -85,7 +85,7 @@ from nautobot.extras.models import (
 )
 from nautobot.extras.tests.constants import BIG_GRAPHQL_DEVICE_QUERY
 from nautobot.ipam.filters import VLANFilterSet
-from nautobot.ipam.models import IPAddress, VLAN, VLANGroup, Namespace, Prefix
+from nautobot.ipam.models import IPAddress, Namespace, Prefix, VLAN, VLANGroup
 from nautobot.tenancy.models import Tenant, TenantGroup
 from nautobot.virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine
 
@@ -537,6 +537,7 @@ class ExternalIntegrationTestCase(FilterTestCases.FilterTestCase):
         ["timeout"],
         ["secrets_group", "secrets_group__id"],
         ["secrets_group", "secrets_group__name"],
+        ["http_method"],
     )
 
     @classmethod

nautobot/extras/tests/test_forms.py

@@ -1,18 +1,18 @@
 import json
 import warnings
 
-from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth import get_user_model
+from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
-from django.test import TestCase, override_settings
+from django.test import override_settings, TestCase
 
 from nautobot.dcim.forms import DeviceForm, LocationBulkEditForm, LocationForm
 import nautobot.dcim.models as dcim_models
 from nautobot.dcim.models import Device, Location, LocationType
 from nautobot.extras.choices import RelationshipTypeChoices
 from nautobot.extras.forms import (
-    ConfigContextForm,
     ConfigContextFilterForm,
+    ConfigContextForm,
     CustomFieldModelBulkEditFormMixin,
     CustomFieldModelFilterFormMixin,
     CustomFieldModelFormMixin,
@@ -37,10 +37,9 @@ from nautobot.extras.models import (
     Webhook,
 )
 from nautobot.ipam.choices import IPAddressTypeChoices
-from nautobot.ipam.forms import IPAddressForm, IPAddressBulkEditForm, VLANGroupForm
+from nautobot.ipam.forms import IPAddressBulkEditForm, IPAddressForm, VLANGroupForm
 import nautobot.ipam.models as ipam_models
 
-
 # Use the proper swappable User model
 User = get_user_model()
 
@@ -1088,8 +1087,8 @@ class DeprecatedAliasesTestCase(TestCase):
         # Importing these mixin classes doesn't directly warn, but subclassing them does.
         from nautobot.extras.forms import (
             AddRemoveTagsForm,
-            CustomFieldBulkEditForm,
             CustomFieldBulkCreateForm,
+            CustomFieldBulkEditForm,
             CustomFieldFilterForm,
             CustomFieldModelForm,
             RelationshipModelForm,

nautobot/extras/tests/test_git.py

@@ -2,7 +2,7 @@ from unittest import mock
 
 from django.test import TestCase
 
-from nautobot.core.utils.git import GitRepo, convert_git_diff_log_to_list
+from nautobot.core.utils.git import convert_git_diff_log_to_list, GitRepo
 
 
 @mock.patch("nautobot.core.utils.git.Repo")

nautobot/extras/tests/test_job_variables.py

@@ -4,7 +4,6 @@ from netaddr import IPAddress, IPNetwork
 
 from nautobot.dcim.models import Device
 from nautobot.extras.models import Role
-
 from nautobot.extras.test_jobs.job_variables import (
     BooleanVarJob,
     ChoiceVarJob,
@@ -13,6 +12,7 @@ from nautobot.extras.test_jobs.job_variables import (
     IPAddressVarJob,
     IPAddressWithMaskVarJob,
     IPNetworkVarJob,
+    JSONVarJob,
     MultiChoiceVarJob,
     MultiObjectVarJob,
     ObjectVarJob,
@@ -200,3 +200,22 @@ class JobVariablesTest(TestCase):
         form = IPNetworkVarJob().as_form(data)
         self.assertTrue(form.is_valid())
         self.assertEqual(form.cleaned_data["var1"], IPNetwork(data["var1"]))
+
+    def test_jsonvar(self):
+        # Valid JSON value as dictionary
+        data = {"var1": {"key1": "value1"}}
+        form = JSONVarJob().as_form(data)
+        self.assertTrue(form.is_valid())
+        self.assertEqual(form.cleaned_data["var1"], {"key1": "value1"})
+
+        # Valid JSON value as jsonified dictionary
+        data = {"var1": '{"key1": "value1"}'}
+        form = JSONVarJob().as_form(data)
+        self.assertTrue(form.is_valid())
+        self.assertEqual(form.cleaned_data["var1"], {"key1": "value1"})
+
+        # Invalid JSON value
+        data = {"var1": '{"key1": True}'}
+        form = JSONVarJob().as_form(data)
+        self.assertFalse(form.is_valid())
+        self.assertIn("var1", form.errors)