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

nautobot/dcim/tests/integration/test_device_bulk_delete.py

@@ -0,0 +1,189 @@
+from django.urls import reverse
+
+from nautobot.core.testing.integration import BulkOperationsMixin, ObjectsListMixin, SeleniumTestCase
+
+
+class BulkDeleteDeviceTestCase(SeleniumTestCase, ObjectsListMixin, BulkOperationsMixin):
+    """
+    Test devices bulk delete.
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        self.user.is_superuser = True
+        self.user.save()
+        self.login(self.user.username, self.password)
+
+        # Manufacturer
+        self.click_navbar_entry("Devices", "Manufacturers")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:manufacturer_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:manufacturer_add"))
+        self.browser.fill("name", "Test Manufacturer 1")
+        self.click_edit_form_create_button()
+
+        # Device Type
+        self.click_navbar_entry("Devices", "Device Types")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:devicetype_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:devicetype_add"))
+        self.fill_select2_field("manufacturer", "Test Manufacturer 1")
+        self.browser.fill("model", "Test Device Type 1")
+        self.click_edit_form_create_button()
+
+        # LocationType
+        self.click_navbar_entry("Organization", "Location Types")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:locationtype_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:locationtype_add"))
+        self.fill_select2_multiselect_field("content_types", "dcim | device")
+        self.browser.fill("name", "Test Location Type 1")
+        self.click_edit_form_create_button()
+
+        # Location 1
+        self.click_navbar_entry("Organization", "Locations")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_add"))
+        self.fill_select2_field("location_type", "Test Location Type 1")
+        self.fill_select2_field("status", "")  # pick first status
+        self.browser.fill("name", "Test Location 1")
+        self.click_edit_form_create_button()
+
+        # Location 2
+        self.click_navbar_entry("Organization", "Locations")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_add"))
+        self.fill_select2_field("location_type", "Test Location Type 1")
+        self.fill_select2_field("status", "")  # pick first status
+        self.browser.fill("name", "Test Location 2")
+        self.click_edit_form_create_button()
+
+        # Role
+        self.click_navbar_entry("Organization", "Roles")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("extras:role_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("extras:role_add"))
+        self.browser.fill("name", "Test Role 1")
+        self.fill_select2_multiselect_field("content_types", "dcim | device")
+        self.click_edit_form_create_button()
+
+    def _create_device(self, name, location="Test Location 1"):
+        self.click_navbar_entry("Devices", "Devices")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_add"))
+        self.browser.fill("name", name)
+        self.fill_select2_field("role", "Test Role 1")
+        self.fill_select2_field("device_type", "Test Device Type 1")
+        self.fill_select2_field("location", location)
+        self.fill_select2_field("status", "")  # pick first status
+        self.click_edit_form_create_button()
+
+    def tearDown(self):
+        self.logout()
+        super().tearDown()
+
+    def _go_to_devices_list(self):
+        self.click_navbar_entry("Devices", "Devices")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_list"))
+
+    def test_bulk_delete_require_selection(self):
+        self._go_to_devices_list()
+
+        # Click "delete selected" without selecting anything
+        self.click_bulk_delete()
+
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_list"))
+        self.assertTrue(self.browser.is_text_present("No devices were selected for deletion.", wait_time=5))
+
+    def test_bulk_delete_all_devices(self):
+        # Create device for test
+        self._create_device("Test Device Integration Test 1")
+        self._create_device("Test Device Integration Test 2")
+        self._go_to_devices_list()
+
+        # Select all devices and delete them
+        self.select_all_items()
+        self.click_bulk_delete()
+        self.confirm_bulk_delete_operation()
+
+        # Verify job output
+        self.assertIsBulkDeleteJob()
+        job_status = self.wait_for_job_result()
+
+        self.assertEqual(job_status, "Completed")
+
+        self._go_to_devices_list()
+        self.assertEqual(self.objects_list_visible_items, 0)
+
+    def test_bulk_delete_one_device(self):
+        # Create device for test
+        self._create_device("Test Device Integration Test 1")
+        self._create_device("Test Device Integration Test 2")
+        self._go_to_devices_list()
+
+        # Select one device and delete it
+        self.select_one_item()
+        self.click_bulk_delete()
+        self.browser.find_by_xpath('//button[@name="_confirm" and @type="submit"]').click()
+
+        # Verify job output
+        self.assertIsBulkDeleteJob()
+        job_status = self.wait_for_job_result()
+
+        self.assertEqual(job_status, "Completed")
+
+        self._go_to_devices_list()
+        self.assertEqual(self.objects_list_visible_items, 1)
+
+    def test_bulk_delete_all_filtered_devices(self):
+        # Create device for test
+        self._create_device("Test Device Integration Test 1")
+        self._create_device("Test Device Integration Test 2")
+        self._create_device("Test Device Integration Test 3", location="Test Location 2")
+        self._go_to_devices_list()
+
+        # Filter devices
+        self.apply_filter("location", "Test Location 2")
+
+        # Select all devices and delete them
+        self.select_all_items()
+        self.click_bulk_delete()
+        self.confirm_bulk_delete_operation()
+
+        # Verify job output
+        self.assertIsBulkDeleteJob()
+        job_status = self.wait_for_job_result()
+
+        self.assertEqual(job_status, "Completed")
+
+        self._go_to_devices_list()
+        self.assertEqual(self.objects_list_visible_items, 2)
+
+    def test_bulk_delete_one_filtered_devices(self):
+        # Create device for test
+        self._create_device("Test Device Integration Test 1")
+        self._create_device("Test Device Integration Test 2")
+        self._create_device("Test Device Integration Test 3", location="Test Location 2")
+        self._create_device("Test Device Integration Test 4", location="Test Location 2")
+        self._go_to_devices_list()
+
+        # Filter devices
+        self.apply_filter("location", "Test Location 2")
+
+        # Select one device and delete it
+        self.select_one_item()
+        self.click_bulk_delete()
+        self.confirm_bulk_delete_operation()
+
+        # Verify job output
+        self.assertIsBulkDeleteJob()
+        job_status = self.wait_for_job_result()
+
+        self.assertEqual(job_status, "Completed")
+
+        self._go_to_devices_list()
+        self.assertEqual(self.objects_list_visible_items, 3)

nautobot/dcim/tests/integration/test_device_bulk_edit.py

@@ -0,0 +1,181 @@
+from django.urls import reverse
+
+from nautobot.core.testing.integration import BulkOperationsMixin, ObjectsListMixin, SeleniumTestCase
+
+
+class BulkEditDeviceTestCase(SeleniumTestCase, ObjectsListMixin, BulkOperationsMixin):
+    """
+    Test devices bulk delete.
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        self.user.is_superuser = True
+        self.user.save()
+        self.login(self.user.username, self.password)
+
+        # Manufacturer
+        self.click_navbar_entry("Devices", "Manufacturers")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:manufacturer_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:manufacturer_add"))
+        self.browser.fill("name", "Test Manufacturer 1")
+        self.click_edit_form_create_button()
+
+        # Device Type
+        self.click_navbar_entry("Devices", "Device Types")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:devicetype_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:devicetype_add"))
+        self.fill_select2_field("manufacturer", "Test Manufacturer 1")
+        self.browser.fill("model", "Test Device Type 1")
+        self.click_edit_form_create_button()
+
+        # LocationType
+        self.click_navbar_entry("Organization", "Location Types")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:locationtype_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:locationtype_add"))
+        self.fill_select2_multiselect_field("content_types", "dcim | device")
+        self.browser.fill("name", "Test Location Type 1")
+        self.click_edit_form_create_button()
+
+        # Location 1
+        self.click_navbar_entry("Organization", "Locations")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_add"))
+        self.fill_select2_field("location_type", "Test Location Type 1")
+        self.fill_select2_field("status", "")  # pick first status
+        self.browser.fill("name", "Test Location 1")
+        self.click_edit_form_create_button()
+
+        # Location 2
+        self.click_navbar_entry("Organization", "Locations")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_add"))
+        self.fill_select2_field("location_type", "Test Location Type 1")
+        self.fill_select2_field("status", "")  # pick first status
+        self.browser.fill("name", "Test Location 2")
+        self.click_edit_form_create_button()
+
+        # Role
+        self.click_navbar_entry("Organization", "Roles")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("extras:role_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("extras:role_add"))
+        self.browser.fill("name", "Test Role 1")
+        self.fill_select2_multiselect_field("content_types", "dcim | device")
+        self.click_edit_form_create_button()
+
+    def _create_device(self, name, location="Test Location 1"):
+        self.click_navbar_entry("Devices", "Devices")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_add"))
+        self.browser.fill("name", name)
+        self.fill_select2_field("role", "Test Role 1")
+        self.fill_select2_field("device_type", "Test Device Type 1")
+        self.fill_select2_field("location", location)
+        self.fill_select2_field("status", "")  # pick first status
+        self.click_edit_form_create_button()
+
+    def tearDown(self):
+        self.logout()
+        super().tearDown()
+
+    def _go_to_devices_list(self):
+        self.click_navbar_entry("Devices", "Devices")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_list"))
+
+    def test_bulk_edit_require_selection(self):
+        self._go_to_devices_list()
+
+        # Click "edit selected" without selecting anything
+        self.click_bulk_edit()
+
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_list"))
+        self.assertTrue(self.browser.is_text_present("No devices were selected.", wait_time=5))
+
+    def test_bulk_edit_all_devices(self):
+        # Create device for test
+        self._create_device("Test Device Integration Test 1")
+        self._create_device("Test Device Integration Test 2")
+        self._go_to_devices_list()
+
+        # Select all devices and edit them
+        self.select_all_items()
+        self.click_bulk_edit()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_bulk_edit"))
+
+        # Submit bulk edit form without any changes
+        self.submit_bulk_edit_operation()
+
+        # Verify job output
+        self.assertIsBulkEditJob()
+        self.assertJobStatusIsCompleted()
+
+    def test_bulk_edit_one_device(self):
+        # Create device for test
+        self._create_device("Test Device Integration Test 1")
+        self._create_device("Test Device Integration Test 2")
+        self._go_to_devices_list()
+
+        # Select one device and edit it
+        self.select_one_item()
+        self.click_bulk_edit()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_bulk_edit"))
+
+        # Submit bulk edit form without any changes
+        self.submit_bulk_edit_operation()
+
+        # Verify job output
+        self.assertIsBulkEditJob()
+        self.assertJobStatusIsCompleted()
+
+    def test_bulk_edit_all_filtered_devices(self):
+        # Create device for test
+        self._create_device("Test Device Integration Test 1")
+        self._create_device("Test Device Integration Test 2")
+        self._create_device("Test Device Integration Test 3", location="Test Location 2")
+        self._go_to_devices_list()
+
+        # Filter devices
+        self.apply_filter("location", "Test Location 2")
+
+        # Select all devices and edit them
+        self.select_all_items()
+        self.click_bulk_edit()
+        self.assertIn(self.live_server_url + reverse("dcim:device_bulk_edit"), self.browser.url)
+
+        # Submit bulk edit form without any changes
+        self.submit_bulk_edit_operation()
+
+        # Verify job output
+        self.assertIsBulkEditJob()
+        self.assertJobStatusIsCompleted()
+
+    def test_bulk_edit_one_filtered_devices(self):
+        # Create device for test
+        self._create_device("Test Device Integration Test 1")
+        self._create_device("Test Device Integration Test 2")
+        self._create_device("Test Device Integration Test 3", location="Test Location 2")
+        self._create_device("Test Device Integration Test 4", location="Test Location 2")
+        self._go_to_devices_list()
+
+        # Filter devices
+        self.apply_filter("location", "Test Location 2")
+
+        # Select one device and edit it
+        self.select_all_items()
+        self.click_bulk_edit()
+        self.assertIn(self.live_server_url + reverse("dcim:device_bulk_edit"), self.browser.url)
+
+        # Submit bulk edit form without any changes
+        self.submit_bulk_edit_operation()
+
+        # Verify job output
+        self.assertIsBulkEditJob()
+        self.assertJobStatusIsCompleted()

nautobot/dcim/tests/test_api.py

@@ -3366,7 +3366,6 @@ class ControllerTestCase(APIViewTestCases.APIViewTestCase):
                 "status": statuses[1].pk,
                 "role": roles[1].pk,
                 "location": locations[1].pk,
-                "capabilities": [],
             },
             {
                 "name": "Controller 3",
@@ -3402,7 +3401,6 @@ class ControllerManagedDeviceGroupTestCase(APIViewTestCases.APIViewTestCase):
                 "name": "ControllerManagedDeviceGroup 2",
                 "controller": controllers[1].pk,
                 "weight": 150,
-                "capabilities": [],
             },
             {
                 "name": "ControllerManagedDeviceGroup 3",

nautobot/dcim/tests/test_models.py

@@ -2185,45 +2185,59 @@ class CableTestCase(ModelTestCases.BaseModelTestCase):
         """
         A cable cannot terminate to a virtual interface
         """
+        virtual_interface_choices = self.interface_choices["Virtual interfaces"]
+
         self.cable.delete()
         interface_status = Status.objects.get_for_model(Interface).first()
-        virtual_interface = Interface.objects.create(
-            device=self.device1,
-            name="V1",
-            type=InterfaceTypeChoices.TYPE_VIRTUAL,
-            status=interface_status,
-        )
-        cable = Cable(termination_a=self.interface2, termination_b=virtual_interface)
-        with self.assertRaises(ValidationError) as cm:
-            cable.clean()
 
-        virtual_interface_choices = self.interface_choices["Virtual interfaces"]
-        self.assertIn(
-            f"Cables cannot be terminated to {virtual_interface_choices[InterfaceTypeChoices.TYPE_VIRTUAL]} interfaces",
-            str(cm.exception),
-        )
+        for virtual_interface_type in virtual_interface_choices:
+            virtual_interface = Interface.objects.create(
+                device=self.device1,
+                name=f"V-{virtual_interface_type}",
+                type=virtual_interface_type,
+                status=interface_status,
+            )
+            with self.assertRaises(
+                ValidationError,
+                msg=f"Virtual interface type '{virtual_interface_choices[virtual_interface_type]}' should not accept a cable.",
+            ) as cm:
+                Cable(
+                    termination_a=self.interface2,
+                    termination_b=virtual_interface,
+                ).clean()
+
+            self.assertIn(
+                f"Cables cannot be terminated to {virtual_interface_choices[virtual_interface_type]} interfaces",
+                str(cm.exception),
+            )
 
     def test_cable_cannot_terminate_to_a_wireless_interface(self):
         """
         A cable cannot terminate to a wireless interface
         """
+        wireless_interface_choices = self.interface_choices["Wireless"]
+
         self.cable.delete()
         interface_status = Status.objects.get_for_model(Interface).first()
-        wireless_interface = Interface.objects.create(
-            device=self.device1,
-            name="W1",
-            type=InterfaceTypeChoices.TYPE_80211A,
-            status=interface_status,
-        )
-        cable = Cable(termination_a=self.interface2, termination_b=wireless_interface)
-        with self.assertRaises(ValidationError) as cm:
-            cable.clean()
 
-        wireless_interface_choices = self.interface_choices["Wireless"]
-        self.assertIn(
-            f"Cables cannot be terminated to {wireless_interface_choices[InterfaceTypeChoices.TYPE_80211A]} interfaces",
-            str(cm.exception),
-        )
+        for wireless_interface_type in wireless_interface_choices:
+            wireless_interface = Interface.objects.create(
+                device=self.device1,
+                name=f"W-{wireless_interface_type}",
+                type=wireless_interface_type,
+                status=interface_status,
+            )
+
+            with self.assertRaises(
+                ValidationError,
+                msg=f"Wireless interface type '{wireless_interface_choices[wireless_interface_type]}' should not accept a cable.",
+            ) as cm:
+                Cable(termination_a=self.interface2, termination_b=wireless_interface).clean()
+
+            self.assertIn(
+                f"Cables cannot be terminated to {wireless_interface_choices[wireless_interface_type]} interfaces",
+                str(cm.exception),
+            )
 
     def test_create_cable_with_missing_status_connected(self):
         """Test for https://github.com/nautobot/nautobot/issues/2081"""

nautobot/extras/forms/mixins.py

@@ -327,7 +327,7 @@ class RelationshipModelBulkEditFormMixin(BulkEditForm):
                     field_name,
                     instance,
                 )
-                if field_name in self.nullable_fields and field_name in nullified_fields:
+                if field_name in self.nullable_fields and nullified_fields and field_name in nullified_fields:
                     logger.debug("Deleting existing relationship associations for %s on %s", relationship, instance)
                     relationshipassociation_queryset.delete()
                 elif field_name in self.cleaned_data:

nautobot/extras/jobs.py

@@ -534,7 +534,10 @@ class BaseJob:
             job_model = JobModel.objects.get(module_name=cls.__module__, job_class_name=cls.__name__)
             is_singleton = job_model.is_singleton
         except JobModel.DoesNotExist:
+            logger.warning("No Job instance found in the database corresponding to %s", cls.class_path)
+            job_model = None
             is_singleton = cls.is_singleton
+
         if is_singleton:
             form.fields["_ignore_singleton_lock"] = forms.BooleanField(
                 required=False,
@@ -543,10 +546,12 @@ class BaseJob:
                 help_text="Allow this singleton job to run even when another instance is already running",
             )
 
-        job_model = JobModel.objects.get_for_class_path(cls.class_path)
-        dryrun_default = job_model.dryrun_default if job_model.dryrun_default_override else cls.dryrun_default
-        job_queue_queryset = JobQueue.objects.filter(jobs=job_model)
-        job_queue_params = {"jobs": [job_model.pk]}
+        if job_model is not None:
+            job_queue_queryset = JobQueue.objects.filter(jobs=job_model)
+            job_queue_params = {"jobs": [job_model.pk]}
+        else:
+            job_queue_queryset = JobQueue.objects.all()
+            job_queue_params = {}
 
         # Initialize job_queue choices
         form.fields["_job_queue"] = DynamicModelChoiceField(
@@ -556,8 +561,12 @@ class BaseJob:
             help_text="The job queue to route this job to",
             label="Job queue",
         )
-        # Populate the job queue field on the JobRun Form
-        form.fields["_job_queue"].initial = job_model.default_job_queue.pk
+
+        dryrun_default = cls.dryrun_default
+        if job_model is not None:
+            form.fields["_job_queue"].initial = job_model.default_job_queue.pk
+            if job_model.dryrun_default_override:
+                dryrun_default = job_model.dryrun_default
 
         if cls.supports_dryrun and (not initial or "dryrun" not in initial):
             # Set initial "dryrun" checkbox state based on the Meta parameter

nautobot/extras/templatetags/job_buttons.py

@@ -8,7 +8,7 @@ from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from nautobot.core.utils.data import render_jinja2
-from nautobot.extras.models import Job, JobButton
+from nautobot.extras.models import Job, JobButton, JobQueue
 
 register = template.Library()
 
@@ -108,17 +108,17 @@ def _render_job_button_for_obj(job_button, obj, context, content_type):
     # Disable buttons if the user doesn't have permission to run the underlying Job.
     has_run_perm = Job.objects.check_perms(context["user"], instance=job_button.job, action="run")
     try:
-        job_queues = list(job_button.job.job_queues.all().values_list("name", flat=True))
+        job_queues = job_button.job.job_queues.all()
         _job_queue = job_queues[0]
     except IndexError:
-        _job_queue = settings.CELERY_TASK_DEFAULT_QUEUE
+        _job_queue = JobQueue.objects.get(name=settings.CELERY_TASK_DEFAULT_QUEUE)
     hidden_inputs = format_html(
         HIDDEN_INPUTS,
         csrf_token=context["csrf_token"],
         object_pk=obj.pk,
         object_model_name=f"{content_type.app_label}.{content_type.model}",
         redirect_path=context["request"].path,
-        job_queue=_job_queue,
+        job_queue=_job_queue.pk,
     )
     template_args = {
         "button_id": job_button.pk,

nautobot/extras/tests/test_forms.py

@@ -910,6 +910,19 @@ class RelationshipModelBulkEditFormMixinTestCase(TestCase):
         ras = RelationshipAssociation.objects.filter(relationship=self.rel_mtom_s)
         self.assertEqual(1, ras.count())
 
+    def test_form_save_relationship_with_nullified_fields_is_none(self):
+        """Test save_relationships with nullified_fields=None."""
+        form = LocationBulkEditForm(
+            model=dcim_models.Location,
+            data={
+                "pks": [self.locations[0].pk],
+                "add_cr_multiplexing__destination": [ipaddress.pk for ipaddress in self.ipaddresses],
+                "add_cr_peer_locations__peer": [self.locations[1].pk],
+            },
+        )
+        form.is_valid()
+        form.save_relationships(instance=self.locations[0], nullified_fields=None)
+
     def test_location_form_remove_mtom(self):
         """Test removal of relationship-associations for many-to-many relationships."""
         RelationshipAssociation.objects.create(