nautobot 2.4.0__py3-none-any.whl → 2.4.1__py3-none-any.whl

nautobot/extras/tests/test_jobs.py

@@ -37,7 +37,7 @@ from nautobot.extras.choices import (
     ObjectChangeEventContextChoices,
 )
 from nautobot.extras.context_managers import change_logging, JobHookChangeContext, web_request_context
-from nautobot.extras.jobs import get_job, get_jobs
+from nautobot.extras.jobs import BaseJob, get_job, get_jobs
 from nautobot.extras.models import Job, JobQueue
 from nautobot.extras.models.jobs import JobLogEntry
 
@@ -47,6 +47,11 @@ class JobTest(TestCase):
     Test job features that don't require a transaction test case.
     """
 
+    def test_as_form_no_job_model(self):
+        """Job.as_form() test with no corresponding job_model (https://github.com/nautobot/nautobot/issues/6773)."""
+        form = BaseJob.as_form()
+        self.assertSequenceEqual(list(form.fields.keys()), ["_job_queue", "_profile"])
+
     def test_field_default(self):
         """
         Job test with field that is a default value that is falsey.
@@ -55,7 +60,7 @@ class JobTest(TestCase):
         module = "field_default"
         name = "TestFieldDefault"
         job_class = get_job(f"{module}.{name}")
-        form = job_class().as_form()
+        form = job_class.as_form()
 
         self.assertInHTML(
             """<tr><th><label for="id_var_int">Var int:</label></th><td>
@@ -74,7 +79,7 @@ class JobTest(TestCase):
         module = "field_order"
         name = "TestFieldOrder"
         job_class = get_job(f"{module}.{name}")
-        form = job_class().as_form()
+        form = job_class.as_form()
         self.assertSequenceEqual(list(form.fields.keys()), ["var1", "var2", "var23", "_job_queue", "_profile"])
 
     def test_no_field_order(self):
@@ -84,7 +89,7 @@ class JobTest(TestCase):
         module = "no_field_order"
         name = "TestNoFieldOrder"
         job_class = get_job(f"{module}.{name}")
-        form = job_class().as_form()
+        form = job_class.as_form()
         self.assertSequenceEqual(list(form.fields.keys()), ["var23", "var2", "_job_queue", "_profile"])
 
     def test_no_field_order_inherited_variable(self):
@@ -94,7 +99,7 @@ class JobTest(TestCase):
         module = "no_field_order"
         name = "TestDefaultFieldOrderWithInheritance"
         job_class = get_job(f"{module}.{name}")
-        form = job_class().as_form()
+        form = job_class.as_form()
         self.assertSequenceEqual(
             list(form.fields.keys()),
             ["testvar1", "b_testvar2", "a_testvar3", "_job_queue", "_profile"],
@@ -109,14 +114,14 @@ class JobTest(TestCase):
         # not overridden on job model, initial form field value should match job class
         job_model.dryrun_default_override = False
         job_model.save()
-        form = job_class().as_form()
+        form = job_class.as_form()
         self.assertEqual(form.fields["dryrun"].initial, job_class.dryrun_default)
 
         # overridden on job model, initial form field value should match job model
         job_model.dryrun_default_override = True
         job_model.dryrun_default = not job_class.dryrun_default
         job_model.save()
-        form = job_class().as_form()
+        form = job_class.as_form()
         self.assertEqual(form.fields["dryrun"].initial, job_model.dryrun_default)
 
     def test_job_task_queues_setter(self):
@@ -145,7 +150,7 @@ class JobTest(TestCase):
             name="irrelevant", defaults={"queue_type": JobQueueTypeChoices.TYPE_CELERY}
         )
         job_model.job_queues.set([jq_1, jq_2])
-        form = job_class().as_form()
+        form = job_class.as_form()
         self.assertQuerySetEqual(
             form.fields["_job_queue"].queryset,
             models.JobQueue.objects.filter(jobs=job_model),
@@ -576,7 +581,7 @@ class JobTransactionTest(TransactionTestCase):
             "ipv6_with_mask": "2001:db8::1/64",
             "ipv6_network": "2001:db8::/64",
         }
-        form = job_class().as_form(form_data)
+        form = job_class.as_form(form_data)
         self.assertTrue(form.is_valid())
 
         # Prepare the job data
@@ -786,7 +791,7 @@ class JobFileUploadTest(TransactionTestCase):
 
         # Serialize the file to FileProxy
         data = {"file": self.test_file}
-        form = job_class().as_form(files=data)
+        form = job_class.as_form(files=data)
         self.assertTrue(form.is_valid())
         serialized_data = job_class.serialize_data(form.cleaned_data)
 
@@ -816,7 +821,7 @@ class JobFileUploadTest(TransactionTestCase):
 
         # Serialize the file to FileProxy
         data = {"file": self.test_file}
-        form = job_class().as_form(files=data)
+        form = job_class.as_form(files=data)
         self.assertTrue(form.is_valid())
         serialized_data = job_class.serialize_data(form.cleaned_data)
 
@@ -1021,7 +1026,7 @@ class JobButtonReceiverTest(TestCase):
         module = "job_button_receiver"
         name = "TestJobButtonReceiverSimple"
         job_class, _job_model = get_job_class_and_model(module, name)
-        form = job_class().as_form()
+        form = job_class.as_form()
         self.assertSequenceEqual(list(form.fields.keys()), ["object_pk", "object_model_name", "_job_queue", "_profile"])
 
     def test_hidden(self):
@@ -1084,7 +1089,7 @@ class JobHookReceiverTest(TestCase):
         module = "job_hook_receiver"
         name = "TestJobHookReceiverLog"
         job_class, _job_model = get_job_class_and_model(module, name)
-        form = job_class().as_form()
+        form = job_class.as_form()
         self.assertSequenceEqual(list(form.fields.keys()), ["object_change", "_job_queue", "_profile"])
 
     def test_hidden(self):

nautobot/extras/tests/test_models.py

@@ -2146,6 +2146,12 @@ class ScheduledJobTest(ModelTestCases.BaseModelTestCase):
     #     entry = NautobotScheduleEntry(model=sj)
     #     scheduler = NautobotDatabaseScheduler(app=entry.app)
     #     scheduler.apply_async(entry=entry, producer=None, advance=False)
+    #     Check scheduled job runs correctly with no job queue
+    #     sj.job_queue = None
+    #     sj.save()
+    #     entry = NautobotScheduleEntry(model=sj)
+    #     scheduler = NautobotDatabaseScheduler(app=entry.app)
+    #     scheduler.apply_async(entry=entry, producer=None, advance=False)
 
 
 class SecretTest(ModelTestCases.BaseModelTestCase):

nautobot/extras/tests/test_views.py

@@ -2955,8 +2955,9 @@ class JobButtonRenderingTestCase(TestCase):
         response = self.client.get(self.location_type.get_absolute_url(), follow=True)
         self.assertEqual(response.status_code, 200)
         content = extract_page_body(response.content.decode(response.charset))
-        job_queues = self.job.job_queues.all().values_list("name", flat=True)
-        self.assertIn(f'<input type="hidden" name="_job_queue" value="{job_queues[0]}">', content, content)
+        job_queues = self.job.job_queues.all()
+        _job_queue = job_queues[0]
+        self.assertIn(f'<input type="hidden" name="_job_queue" value="{_job_queue.pk}">', content, content)
 
         self.job.job_queues_override = False
         self.job.save()
@@ -2965,7 +2966,7 @@ class JobButtonRenderingTestCase(TestCase):
         self.assertEqual(response.status_code, 200)
         content = extract_page_body(response.content.decode(response.charset))
         self.assertIn(
-            f'<input type="hidden" name="_job_queue" value="{self.job.default_job_queue.name}">', content, content
+            f'<input type="hidden" name="_job_queue" value="{self.job.default_job_queue.pk}">', content, content
         )
 
     def test_view_object_with_unsafe_text(self):

nautobot/ipam/tests/test_api.py

@@ -965,6 +965,26 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(len(response.data), 0)
 
+    def test_prefix_type_filter(self):
+        url = reverse("ipam-api:prefix-list")
+        self.add_permissions("ipam.view_prefix")
+
+        test_cases = {
+            "ic": "WOR",
+            "isw": "NET",
+            "iew": "WORK",
+            "ie": "NETWORK",
+        }
+
+        for type_filter_lookup, type_filter_value in test_cases.items():
+            with self.subTest(render_as=type_filter_lookup):
+                response = self.client.get(f"{url}?type__{type_filter_lookup}={type_filter_value}", **self.header)
+
+                # Assert that the prefixes returned match the type filter
+                self.assertEqual(response.status_code, 200)
+                for result in response.data["results"]:
+                    self.assertEqual(result["type"]["value"], "network")
+
 
 class PrefixLocationAssignmentTest(APIViewTestCases.APIViewTestCase):
     model = PrefixLocationAssignment

nautobot/project-static/docs/code-reference/nautobot/apps/testing.html

@@ -8394,6 +8394,15 @@
     </span>
   </a>
   
+</li>
+        
+          <li class="md-nav__item">
+  <a href="#nautobot.apps.testing.SeleniumTestCase.fill_filters_select2_field" class="md-nav__link">
+    <span class="md-ellipsis">
+      fill_filters_select2_field
+    </span>
+  </a>
+  
 </li>
         
           <li class="md-nav__item">
@@ -11570,6 +11579,15 @@
     </span>
   </a>
   
+</li>
+        
+          <li class="md-nav__item">
+  <a href="#nautobot.apps.testing.SeleniumTestCase.fill_filters_select2_field" class="md-nav__link">
+    <span class="md-ellipsis">
+      fill_filters_select2_field
+    </span>
+  </a>
+  
 </li>
         
           <li class="md-nav__item">
@@ -14769,6 +14787,23 @@ so there is no need to run <code>collectstatic</code> prior to running tests.</p
 <div class="doc doc-object doc-function">
 
 
+<h3 id="nautobot.apps.testing.SeleniumTestCase.fill_filters_select2_field" class="doc doc-heading">
+            <code class="highlight language-python"><span class="n">fill_filters_select2_field</span><span class="p">(</span><span class="n">field_name</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span></code>
+
+<a href="#nautobot.apps.testing.SeleniumTestCase.fill_filters_select2_field" class="headerlink" title="Permanent link">&para;</a></h3>
+
+
+    <div class="doc doc-contents ">
+
+        <p>Helper function to fill a Select2 single selection field on filters modals.</p>
+
+    </div>
+
+</div>
+
+<div class="doc doc-object doc-function">
+
+
 <h3 id="nautobot.apps.testing.SeleniumTestCase.fill_select2_field" class="doc doc-heading">
             <code class="highlight language-python"><span class="n">fill_select2_field</span><span class="p">(</span><span class="n">field_name</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span></code>
 
@@ -14777,7 +14812,7 @@ so there is no need to run <code>collectstatic</code> prior to running tests.</p
 
     <div class="doc doc-contents ">
 
-        <p>Helper function to fill a Select2 single selection field.</p>
+        <p>Helper function to fill a Select2 single selection field on add/edit forms.</p>
 
     </div>
 

nautobot/project-static/docs/release-notes/version-2.4.html

@@ -8686,6 +8686,48 @@
       </ul>
     </nav>
   
+</li>
+      
+        <li class="md-nav__item">
+  <a href="#v241-2025-01-21" class="md-nav__link">
+    <span class="md-ellipsis">
+      v2.4.1 (2025-01-21)
+    </span>
+  </a>
+  
+    <nav class="md-nav" aria-label="v2.4.1 (2025-01-21)">
+      <ul class="md-nav__list">
+        
+          <li class="md-nav__item">
+  <a href="#security-in-v241" class="md-nav__link">
+    <span class="md-ellipsis">
+      Security in v2.4.1
+    </span>
+  </a>
+  
+</li>
+        
+          <li class="md-nav__item">
+  <a href="#fixed-in-v241" class="md-nav__link">
+    <span class="md-ellipsis">
+      Fixed in v2.4.1
+    </span>
+  </a>
+  
+</li>
+        
+          <li class="md-nav__item">
+  <a href="#housekeeping-in-v241" class="md-nav__link">
+    <span class="md-ellipsis">
+      Housekeeping in v2.4.1
+    </span>
+  </a>
+  
+</li>
+        
+      </ul>
+    </nav>
+  
 </li>
       
         <li class="md-nav__item">
@@ -9672,6 +9714,48 @@
       </ul>
     </nav>
   
+</li>
+      
+        <li class="md-nav__item">
+  <a href="#v241-2025-01-21" class="md-nav__link">
+    <span class="md-ellipsis">
+      v2.4.1 (2025-01-21)
+    </span>
+  </a>
+  
+    <nav class="md-nav" aria-label="v2.4.1 (2025-01-21)">
+      <ul class="md-nav__list">
+        
+          <li class="md-nav__item">
+  <a href="#security-in-v241" class="md-nav__link">
+    <span class="md-ellipsis">
+      Security in v2.4.1
+    </span>
+  </a>
+  
+</li>
+        
+          <li class="md-nav__item">
+  <a href="#fixed-in-v241" class="md-nav__link">
+    <span class="md-ellipsis">
+      Fixed in v2.4.1
+    </span>
+  </a>
+  
+</li>
+        
+          <li class="md-nav__item">
+  <a href="#housekeeping-in-v241" class="md-nav__link">
+    <span class="md-ellipsis">
+      Housekeeping in v2.4.1
+    </span>
+  </a>
+  
+</li>
+        
+      </ul>
+    </nav>
+  
 </li>
       
         <li class="md-nav__item">
@@ -9946,6 +10030,30 @@
 
 <!-- towncrier release notes start -->
 
+<h2 id="v241-2025-01-21">v2.4.1 (2025-01-21)<a class="headerlink" href="#v241-2025-01-21" title="Permanent link">&para;</a></h2>
+<h3 id="security-in-v241">Security in v2.4.1<a class="headerlink" href="#security-in-v241" title="Permanent link">&para;</a></h3>
+<ul>
+<li><a href="https://github.com/nautobot/nautobot/issues/6780">#6780</a> - Updated <code>Django</code> to <code>4.2.18</code> to address <code>CVE-2024-56374</code>.</li>
+</ul>
+<h3 id="fixed-in-v241">Fixed in v2.4.1<a class="headerlink" href="#fixed-in-v241" title="Permanent link">&para;</a></h3>
+<ul>
+<li><a href="https://github.com/nautobot/nautobot/issues/6427">#6427</a> - Fixed a bug which allowed several wireless interface types to accept cables.</li>
+<li><a href="https://github.com/nautobot/nautobot/issues/6489">#6489</a> - Fixed partial-match filters (such as <code>__ic</code> and <code>__isw</code>) on fields that have restricted choices (<code>Prefix.type</code>, <code>Interface.type</code>, etc.) so that partial values are no longer rejected.</li>
+<li><a href="https://github.com/nautobot/nautobot/issues/6763">#6763</a> - Fixed the issue where the Wireless Network detail view fails to render when any record in the Controller Managed Device Groups table is missing a VLAN.</li>
+<li><a href="https://github.com/nautobot/nautobot/issues/6770">#6770</a> - Fixed breakage of JobButton functionality.</li>
+<li><a href="https://github.com/nautobot/nautobot/issues/6771">#6771</a> - Reverted breaking changes to various generic View base class attributes.</li>
+<li><a href="https://github.com/nautobot/nautobot/issues/6773">#6773</a> - Fixed an exception when trying to render a Job class to a form when no corresponding Job database record exists.</li>
+<li><a href="https://github.com/nautobot/nautobot/issues/6776">#6776</a> - Fixed <code>FilterTestCase.generic_filter_tests</code> to again be optional as intended.</li>
+<li><a href="https://github.com/nautobot/nautobot/issues/6779">#6779</a> - Fixed Object Bulk Delete and Object Bulk Edit functionalities.</li>
+<li><a href="https://github.com/nautobot/nautobot/issues/6783">#6783</a> - Fixed <code>NautobotDataBaseScheduler</code> unable to run Scheduled Jobs without job queues assigned.</li>
+<li><a href="https://github.com/nautobot/nautobot/issues/6786">#6786</a> - Fixed incorrect marking of <code>capabilities</code> field as required on Controller and ControllerManagedDeviceGroup REST APIs.</li>
+<li><a href="https://github.com/nautobot/nautobot/issues/6792">#6792</a> - Fixed <code>natural_key_field_lookups</code> for proxy models.</li>
+</ul>
+<h3 id="housekeeping-in-v241">Housekeeping in v2.4.1<a class="headerlink" href="#housekeeping-in-v241" title="Permanent link">&para;</a></h3>
+<ul>
+<li><a href="https://github.com/nautobot/nautobot/issues/6768">#6768</a> - Fixed link to changelog fragment documentation.</li>
+<li><a href="https://github.com/nautobot/nautobot/issues/6794">#6794</a> - Fixed Device factory to ensure that it only selects SoftwareImageFiles that are permitted for a given Device.</li>
+</ul>
 <h2 id="v240-2025-01-10">v2.4.0 (2025-01-10)<a class="headerlink" href="#v240-2025-01-10" title="Permanent link">&para;</a></h2>
 <h3 id="added-in-v240">Added in v2.4.0<a class="headerlink" href="#added-in-v240" title="Permanent link">&para;</a></h3>
 <ul>