nautobot 2.4.0b1__py3-none-any.whl → 2.4.2__py3-none-any.whl

nautobot/dcim/tests/test_views.py

@@ -116,6 +116,7 @@ from nautobot.extras.models import (
     CustomField,
     CustomFieldChoice,
     ExternalIntegration,
+    JobResult,
     Relationship,
     RelationshipAssociation,
     Role,
@@ -128,6 +129,7 @@ from nautobot.ipam.choices import IPAddressTypeChoices
 from nautobot.ipam.models import IPAddress, Namespace, Prefix, VLAN, VLANGroup, VRF
 from nautobot.tenancy.models import Tenant
 from nautobot.users.models import ObjectPermission
+from nautobot.virtualization.models import Cluster, ClusterType
 
 # Use the proper swappable User model
 User = get_user_model()
@@ -159,7 +161,7 @@ def create_test_device(name):
     return device
 
 
-class LocationTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
+class LocationTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases.BulkEditObjectsViewTestCase):
     model = LocationType
     sort_on_field = "nestable"
 
@@ -192,6 +194,13 @@ class LocationTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
             "nestable": True,
         }
 
+        cls.bulk_edit_data = {
+            "description": "A generic description",
+            "add_content_types": [
+                ContentType.objects.get_for_model(CircuitTermination).pk,
+            ],
+        }
+
     def _get_queryset(self):
         return super()._get_queryset().order_by("-last_updated")
 
@@ -741,6 +750,7 @@ class DeviceFamilyTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         cls.form_data = {
             "name": "New Device Family",
             "description": "A new device family",
+            "tags": [t.pk for t in Tag.objects.get_for_model(DeviceFamily)],
         }
         cls.bulk_edit_data = {
             "description": "A new device family",
@@ -1150,9 +1160,15 @@ module-bays:
         }
 
         response = self.client.post(url, data)
+        job_result = JobResult.objects.filter(name="Bulk Edit Objects").first()
+        # Assert successfull redirect to Job Results; whcih means no form validation error was raised
+        self.assertRedirects(
+            response,
+            reverse("extras:jobresult", args=[job_result.pk]),
+            status_code=302,
+            target_status_code=200,
+        )
         self.assertHttpStatus(response, 302)
-        for instance in self._get_queryset().filter(pk__in=pk_list):
-            self.assertEqual(instance.u_height, data["u_height"])
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_rack_height_bulk_edit_invalid(self):
@@ -1168,7 +1184,12 @@ module-bays:
         }
 
         response = self.client.post(url, data)
-        self.assertBodyContains(response, "failed validation")
+        response_content = response.content.decode(response.charset)
+        self.assertHttpStatus(response, 200)
+        self.assertInHTML(
+            '<strong class="panel-title">U height</strong>: <ul class="errorlist"><li>Ensure this value is greater than or equal to 0.</li></ul>',
+            response_content,
+        )
 
 
 class ModuleTypeTestCase(
@@ -2045,6 +2066,9 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
         rack_group = RackGroup.objects.create(location=locations[0], name="Rack Group 1")
 
+        cluster_type = ClusterType.objects.create(name="Cluster Type 1")
+        cluster = Cluster.objects.create(name="Cluster 1", cluster_type=cluster_type)
+
         rack_status = Status.objects.get_for_model(Rack).first()
         racks = (
             Rack.objects.create(
@@ -2216,6 +2240,8 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "status": statuses[2].pk,
             "location": locations[1].pk,
             "rack": racks[1].pk,
+            "cluster": cluster.pk,
+            "comments": "An older device",
             "position": None,
             "face": DeviceFaceChoices.FACE_FRONT,
             "secrets_group": secrets_groups[1].pk,
@@ -4574,46 +4600,6 @@ class SoftwareImageFileTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "download_url": "https://example.com/software_image_file_test_case.bin",
         }
 
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
-    def test_correct_handling_for_model_protected_error(self):
-        platform = Platform.objects.first()
-        software_version_status = Status.objects.get_for_model(SoftwareVersion).first()
-        software_image_file_status = Status.objects.get_for_model(SoftwareImageFile).first()
-        software_version = SoftwareVersion.objects.create(
-            platform=platform, version="Test version 1.0.0", status=software_version_status
-        )
-        software_image_file = SoftwareImageFile.objects.create(
-            software_version=software_version,
-            image_file_name="software_image_file_qs_test_1.bin",
-            status=software_image_file_status,
-        )
-        device_type = DeviceType.objects.first()
-        device_role = Role.objects.get_for_model(Device).first()
-        device_status = Status.objects.get_for_model(Device).first()
-        location = Location.objects.filter(location_type__name="Campus").first()
-        Device.objects.create(
-            device_type=device_type,
-            role=device_role,
-            name="Device 1",
-            location=location,
-            status=device_status,
-            software_version=software_version,
-        )
-        device_type_to_software_image_file = DeviceTypeToSoftwareImageFile.objects.create(
-            device_type=device_type, software_image_file=software_image_file
-        )
-
-        self.add_permissions("dcim.delete_softwareimagefile")
-        pk_list = [software_image_file.pk]
-        data = {
-            "pk": pk_list,
-            "confirm": True,
-            "_confirm": True,  # Form button
-        }
-        response = self.client.post(self._get_url("bulk_delete"), data, follow=True)
-        # Assert protected error message included in the response body
-        self.assertBodyContains(response, f"<span>{device_type_to_software_image_file}</span>", html=True)
-
 
 class SoftwareVersionTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = SoftwareVersion
@@ -4652,46 +4638,6 @@ class SoftwareVersionTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "pre_release": True,
         }
 
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
-    def test_correct_handling_for_model_protected_error(self):
-        platform = Platform.objects.first()
-        software_version_status = Status.objects.get_for_model(SoftwareVersion).first()
-        software_image_file_status = Status.objects.get_for_model(SoftwareImageFile).first()
-        software_version = SoftwareVersion.objects.create(
-            platform=platform, version="Test version 1.0.0", status=software_version_status
-        )
-        software_image_file = SoftwareImageFile.objects.create(
-            software_version=software_version,
-            image_file_name="software_image_file_qs_test_1.bin",
-            status=software_image_file_status,
-        )
-        device_type = DeviceType.objects.first()
-        device_role = Role.objects.get_for_model(Device).first()
-        device_status = Status.objects.get_for_model(Device).first()
-        location = Location.objects.filter(location_type__name="Campus").first()
-        Device.objects.create(
-            device_type=device_type,
-            role=device_role,
-            name="Device 1",
-            location=location,
-            status=device_status,
-            software_version=software_version,
-        )
-        device_type_to_software_image_file = DeviceTypeToSoftwareImageFile.objects.create(
-            device_type=device_type, software_image_file=software_image_file
-        )
-
-        self.add_permissions("dcim.delete_softwareversion")
-        pk_list = [software_version.pk]
-        data = {
-            "pk": pk_list,
-            "confirm": True,
-            "_confirm": True,  # Form button
-        }
-        response = self.client.post(self._get_url("bulk_delete"), data, follow=True)
-        # Assert protected error message included in the response body
-        self.assertBodyContains(response, f"<span>{device_type_to_software_image_file}</span>", html=True)
-
 
 class ControllerTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Controller

nautobot/dcim/views.py

@@ -40,7 +40,7 @@ from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.utils.lookup import get_form_for_model
 from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.utils.requests import normalize_querydict
-from nautobot.core.views import generic, mixins as view_mixins
+from nautobot.core.views import generic
 from nautobot.core.views.mixins import (
     GetReturnURLMixin,
     ObjectBulkDestroyViewMixin,
@@ -213,21 +213,13 @@ class BaseDeviceComponentTemplatesBulkRenameView(generic.BulkRenameView):
 #
 
 
-class LocationTypeUIViewSet(
-    view_mixins.ObjectDetailViewMixin,
-    view_mixins.ObjectListViewMixin,
-    view_mixins.ObjectEditViewMixin,
-    view_mixins.ObjectDestroyViewMixin,
-    view_mixins.ObjectBulkDestroyViewMixin,
-    view_mixins.ObjectBulkCreateViewMixin,  # 3.0 TODO: remove this mixin as it's no longer used
-    view_mixins.ObjectChangeLogViewMixin,
-    view_mixins.ObjectNotesViewMixin,
-):
+class LocationTypeUIViewSet(NautobotUIViewSet):
     queryset = LocationType.objects.all()
     filterset_class = filters.LocationTypeFilterSet
     filterset_form_class = forms.LocationTypeFilterForm
     table_class = tables.LocationTypeTable
     form_class = forms.LocationTypeForm
+    bulk_update_form_class = forms.LocationTypeBulkEditForm
     serializer_class = serializers.LocationSerializer
 
     object_detail_content = object_detail.ObjectDetailContent(
@@ -697,7 +689,7 @@ class RackReservationEditView(generic.ObjectEditView):
     model_form = forms.RackReservationForm
     template_name = "dcim/rackreservation_edit.html"
 
-    def alter_obj(self, obj, request, args, kwargs):
+    def alter_obj(self, obj, request, url_args, url_kwargs):
         if not obj.present_in_database:
             if "rack" in request.GET:
                 obj.rack = get_object_or_404(Rack, pk=request.GET.get("rack"))
@@ -1755,16 +1747,21 @@ class DeviceListView(generic.ObjectListView):
 
 class DeviceView(generic.ObjectView):
     queryset = Device.objects.select_related(
+        "cluster__cluster_group",
+        "controller_managed_device_group__controller",
+        "device_redundancy_group",
+        "device_type__device_family",
         "location",
-        "rack__rack_group",
-        "tenant__tenant_group",
-        "role",
         "platform",
         "primary_ip4",
         "primary_ip6",
+        "rack__rack_group",
+        "role",
+        "secrets_group",
         "software_version",
         "status",
-    )
+        "tenant__tenant_group",
+    ).prefetch_related("images", "software_image_files")
 
     object_detail_content = object_detail.ObjectDetailContent(
         extra_buttons=(
@@ -4502,12 +4499,6 @@ class ControllerManagedDeviceGroupUIViewSet(NautobotUIViewSet):
 
         return obj
 
-    def extra_post_save_action(self, obj, form):
-        if form.cleaned_data.get("add_radio_profiles", None):
-            obj.radio_profiles.add(*form.cleaned_data["add_radio_profiles"])
-        if form.cleaned_data.get("remove_radio_profiles", None):
-            obj.radio_profiles.remove(*form.cleaned_data["remove_radio_profiles"])
-
 
 #
 # Virtual Device Context
@@ -4534,9 +4525,3 @@ class VirtualDeviceContextUIViewSet(NautobotUIViewSet):
                 **super().get_extra_context(request, instance),
             }
         return super().get_extra_context(request, instance)
-
-    def extra_post_save_action(self, obj, form):
-        if form.cleaned_data.get("add_interfaces", None):
-            obj.prefixes.add(*form.cleaned_data["add_interfaces"])
-        if form.cleaned_data.get("remove_interfaces", None):
-            obj.prefixes.remove(*form.cleaned_data["remove_interfaces"])

nautobot/extras/api/customfields.py

@@ -42,8 +42,8 @@ class CustomFieldsDataField(Field):
     def custom_field_keys(self):
         return CustomField.objects.keys_for_model(self.parent.Meta.model)
 
-    def to_representation(self, obj):
-        return {key: obj.get(key) for key in self.custom_field_keys}
+    def to_representation(self, value):
+        return {key: value.get(key) for key in self.custom_field_keys}
 
     def to_internal_value(self, data):
         """Support updates to individual fields on an existing instance without needing to provide the entire dict."""