nautobot 2.2.3__py3-none-any.whl → 2.2.4__py3-none-any.whl

nautobot/dcim/views.py

@@ -199,6 +199,7 @@ class LocationTypeView(generic.ObjectView):
         return {
             "children_table": children_table,
             "locations_table": locations_table,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -297,6 +298,7 @@ class LocationView(generic.ObjectView):
             "contact_association_permission": ["extras.add_contactassociation"],
             # show the button if any of these fields have non-empty value.
             "show_convert_to_contact_button": instance.contact_name or instance.contact_phone or instance.contact_email,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -494,9 +496,7 @@ class RackGroupView(generic.ObjectView):
         }
         RequestConfig(request, paginate).configure(rack_table)
 
-        return {
-            "rack_table": rack_table,
-        }
+        return {"rack_table": rack_table, **super().get_extra_context(request, instance)}
 
 
 class RackGroupEditView(generic.ObjectEditView):
@@ -615,6 +615,7 @@ class RackView(generic.ObjectView):
             "nonracked_devices": nonracked_devices,
             "next_rack": next_rack,
             "prev_rack": prev_rack,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -731,9 +732,7 @@ class ManufacturerView(generic.ObjectView):
         }
         RequestConfig(request, paginate).configure(device_table)
 
-        return {
-            "device_table": device_table,
-        }
+        return {"device_table": device_table, **super().get_extra_context(request, instance)}
 
 
 class ManufacturerEditView(generic.ObjectEditView):
@@ -839,6 +838,7 @@ class DeviceTypeView(generic.ObjectView):
             "rear_port_table": rear_port_table,
             "devicebay_table": devicebay_table,
             "software_image_files_table": software_image_files_table,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -1237,6 +1237,7 @@ class PlatformView(generic.ObjectView):
         return {
             "device_table": device_table,
             "network_driver_tool_names": get_network_driver_mapping_tool_names(),
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -1246,7 +1247,10 @@ class PlatformEditView(generic.ObjectEditView):
     template_name = "dcim/platform_edit.html"
 
     def get_extra_context(self, request, instance):
-        return {"network_driver_names": sorted(get_all_network_driver_mappings().keys())}
+        return {
+            "network_driver_names": sorted(get_all_network_driver_mappings().keys()),
+            **super().get_extra_context(request, instance),
+        }
 
 
 class PlatformDeleteView(generic.ObjectDeleteView):
@@ -1637,7 +1641,7 @@ class ConsolePortView(generic.ObjectView):
     queryset = ConsolePort.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_consoleports"}
+        return {"breadcrumb_url": "dcim:device_consoleports", **super().get_extra_context(request, instance)}
 
 
 class ConsolePortCreateView(generic.ComponentCreateView):
@@ -1699,7 +1703,7 @@ class ConsoleServerPortView(generic.ObjectView):
     queryset = ConsoleServerPort.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_consoleserverports"}
+        return {"breadcrumb_url": "dcim:device_consoleserverports", **super().get_extra_context(request, instance)}
 
 
 class ConsoleServerPortCreateView(generic.ComponentCreateView):
@@ -1761,7 +1765,7 @@ class PowerPortView(generic.ObjectView):
     queryset = PowerPort.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_powerports"}
+        return {"breadcrumb_url": "dcim:device_powerports", **super().get_extra_context(request, instance)}
 
 
 class PowerPortCreateView(generic.ComponentCreateView):
@@ -1823,7 +1827,7 @@ class PowerOutletView(generic.ObjectView):
     queryset = PowerOutlet.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_poweroutlets"}
+        return {"breadcrumb_url": "dcim:device_poweroutlets", **super().get_extra_context(request, instance)}
 
 
 class PowerOutletCreateView(generic.ComponentCreateView):
@@ -1919,6 +1923,7 @@ class InterfaceView(generic.ObjectView):
             "breadcrumb_url": "dcim:device_interfaces",
             "child_interfaces_table": child_interfaces_tables,
             "redundancy_table": redundancy_table,
+            **super().get_extra_context(request, instance),
         }
 
     def _get_interface_redundancy_groups_table(self, request, instance):
@@ -2005,7 +2010,7 @@ class FrontPortView(generic.ObjectView):
     queryset = FrontPort.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_frontports"}
+        return {"breadcrumb_url": "dcim:device_frontports", **super().get_extra_context(request, instance)}
 
 
 class FrontPortCreateView(generic.ComponentCreateView):
@@ -2067,7 +2072,7 @@ class RearPortView(generic.ObjectView):
     queryset = RearPort.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_rearports"}
+        return {"breadcrumb_url": "dcim:device_rearports", **super().get_extra_context(request, instance)}
 
 
 class RearPortCreateView(generic.ComponentCreateView):
@@ -2129,7 +2134,7 @@ class DeviceBayView(generic.ObjectView):
     queryset = DeviceBay.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"breadcrumb_url": "dcim:device_devicebays"}
+        return {"breadcrumb_url": "dcim:device_devicebays", **super().get_extra_context(request, instance)}
 
 
 class DeviceBayCreateView(generic.ComponentCreateView):
@@ -2281,6 +2286,7 @@ class InventoryItemView(generic.ObjectView):
         return {
             "breadcrumb_url": "dcim:device_inventory",
             "software_version_images": software_version_images,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -2488,6 +2494,7 @@ class PathTraceView(generic.ObjectView):
             "path": path,
             "related_paths": related_paths,
             "total_length": path.get_total_length() if path else None,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -2698,9 +2705,7 @@ class VirtualChassisView(generic.ObjectView):
     def get_extra_context(self, request, instance):
         members = Device.objects.restrict(request.user).filter(virtual_chassis=instance)
 
-        return {
-            "members": members,
-        }
+        return {"members": members, **super().get_extra_context(request, instance)}
 
 
 class VirtualChassisCreateView(generic.ObjectEditView):
@@ -2938,9 +2943,7 @@ class PowerPanelView(generic.ObjectView):
         powerfeed_table = tables.PowerFeedTable(data=power_feeds, orderable=False)
         powerfeed_table.exclude = ["power_panel"]
 
-        return {
-            "powerfeed_table": powerfeed_table,
-        }
+        return {"powerfeed_table": powerfeed_table, **super().get_extra_context(request, instance)}
 
 
 class PowerPanelEditView(generic.ObjectEditView):

nautobot/extras/api/serializers.py

@@ -223,17 +223,28 @@ class ContactAssociationSerializer(NautobotModelSerializer):
         }
 
     def validate(self, data):
-        # Validate uniqueness of (contact/team, role)
+        # Validate uniqueness of (associated object, associated object type, contact/team, role)
+        unique_together_fields = None
+
         if data.get("contact") and data.get("role"):
-            validator = UniqueTogetherValidator(
-                queryset=ContactAssociation.objects.all(),
-                fields=("contact", "role"),
+            unique_together_fields = (
+                "associated_object_type",
+                "associated_object_id",
+                "contact",
+                "role",
             )
-            validator(data, self)
         elif data.get("team") and data.get("role"):
+            unique_together_fields = (
+                "associated_object_type",
+                "associated_object_id",
+                "team",
+                "role",
+            )
+
+        if unique_together_fields is not None:
             validator = UniqueTogetherValidator(
                 queryset=ContactAssociation.objects.all(),
-                fields=("team", "role"),
+                fields=unique_together_fields,
             )
             validator(data, self)
 

nautobot/extras/tests/test_context_managers.py

@@ -12,6 +12,7 @@ from nautobot.extras.context_managers import (
     web_request_context,
 )
 from nautobot.extras.models import Status, Webhook
+from nautobot.extras.utils import bulk_delete_with_bulk_change_logging
 
 # Use the proper swappable User model
 User = get_user_model()
@@ -231,6 +232,23 @@ class BulkEditDeleteChangeLogging(TestCase):
                     location.save()
                     location.delete()
 
+    def test_bulk_delete_has_user_in_change_log(self):
+        """Test that the bulk delete operation adds the user to the change log"""
+        location_type = LocationType.objects.get(name="Campus")
+        location_status = Status.objects.get_for_model(Location).first()
+        with web_request_context(self.user):
+            location = Location(name="Test Location 1", location_type=location_type, status=location_status)
+            location.save()
+            location_pk = location.pk
+            location_qs = Location.objects.filter(pk=location_pk)
+            bulk_delete_with_bulk_change_logging(location_qs)
+
+        oc_list = get_changes_for_model(location)
+        self.assertEqual(len(oc_list), 2)
+        self.assertEqual(oc_list[0].action, ObjectChangeActionChoices.ACTION_DELETE)
+        self.assertEqual(oc_list[0].user, self.user)
+        self.assertEqual(oc_list[0].user_name, self.user.username)
+
     def test_create_then_update(self):
         """Test that a create followed by an update is logged as a single create"""
         location_type = LocationType.objects.get(name="Campus")

nautobot/extras/utils.py

@@ -637,7 +637,8 @@ def bulk_delete_with_bulk_change_logging(qs, batch_size=1000):
                     ObjectChange.objects.bulk_create(queued_object_changes)
                     queued_object_changes = []
                 oc = obj.to_objectchange(ObjectChangeActionChoices.ACTION_DELETE)
-                oc.user = change_context.user
+                oc.user = change_context.get_user()
+                oc.user_name = oc.user.username
                 oc.request_id = change_context.change_id
                 oc.change_context = change_context.context
                 oc.change_context_detail = change_context.context_detail[:CHANGELOG_MAX_CHANGE_CONTEXT_DETAIL]

nautobot/extras/views.py

@@ -152,19 +152,18 @@ class ConfigContextView(generic.ObjectView):
     queryset = ConfigContext.objects.all()
 
     def get_extra_context(self, request, instance):
+        context = super().get_extra_context(request, instance)
         # Determine user's preferred output format
         if request.GET.get("format") in ["json", "yaml"]:
-            format_ = request.GET.get("format")
+            context["format"] = request.GET.get("format")
             if request.user.is_authenticated:
-                request.user.set_config("extras.configcontext.format", format_, commit=True)
+                request.user.set_config("extras.configcontext.format", context["format"], commit=True)
         elif request.user.is_authenticated:
-            format_ = request.user.get_config("extras.configcontext.format", "json")
+            context["format"] = request.user.get_config("extras.configcontext.format", "json")
         else:
-            format_ = "json"
+            context["format"] = "json"
 
-        return {
-            "format": format_,
-        }
+        return context
 
 
 class ConfigContextEditView(generic.ObjectEditView):
@@ -236,19 +235,18 @@ class ConfigContextSchemaView(generic.ObjectView):
     queryset = ConfigContextSchema.objects.all()
 
     def get_extra_context(self, request, instance):
+        context = super().get_extra_context(request, instance)
         # Determine user's preferred output format
         if request.GET.get("format") in ["json", "yaml"]:
-            format_ = request.GET.get("format")
+            context["format"] = request.GET.get("format")
             if request.user.is_authenticated:
-                request.user.set_config("extras.configcontextschema.format", format_, commit=True)
+                request.user.set_config("extras.configcontextschema.format", context["format"], commit=True)
         elif request.user.is_authenticated:
-            format_ = request.user.get_config("extras.configcontextschema.format", "json")
+            context["format"] = request.user.get_config("extras.configcontextschema.format", "json")
         else:
-            format_ = "json"
+            context["format"] = "json"
 
-        return {
-            "format": format_,
-        }
+        return context
 
 
 class ConfigContextSchemaObjectValidationView(generic.ObjectView):
@@ -994,6 +992,7 @@ class GitRepositoryView(generic.ObjectView):
     def get_extra_context(self, request, instance):
         return {
             "datasource_contents": get_datasource_contents("extras.gitrepository"),
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -1520,9 +1519,7 @@ class JobApprovalRequestView(generic.ObjectView):
         else:
             job_form = None
 
-        return {
-            "job_form": job_form,
-        }
+        return {"job_form": job_form, **super().get_extra_context(request, instance)}
 
     def post(self, request, pk):
         """
@@ -1652,7 +1649,11 @@ class ScheduledJobView(generic.ObjectView):
                     labels[name] = field.label
                 else:
                     labels[name] = pretty_name(name)
-        return {"labels": labels, "job_class_found": (job_class is not None)}
+        return {
+            "labels": labels,
+            "job_class_found": (job_class is not None),
+            **super().get_extra_context(request, instance),
+        }
 
 
 class ScheduledJobDeleteView(generic.ObjectDeleteView):
@@ -1676,7 +1677,10 @@ class JobHookView(generic.ObjectView):
     queryset = JobHook.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"content_types": instance.content_types.order_by("app_label", "model")}
+        return {
+            "content_types": instance.content_types.order_by("app_label", "model"),
+            **super().get_extra_context(request, instance),
+        }
 
 
 class JobHookEditView(generic.ObjectEditView):
@@ -1761,6 +1765,7 @@ class JobResultView(generic.ObjectView):
             "job": job_class,
             "associated_record": associated_record,
             "result": instance,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -1848,6 +1853,7 @@ class ObjectChangeView(generic.ObjectView):
             "prev_change": instance.get_prev_change(request.user),
             "related_changes_table": related_changes_table,
             "related_changes_count": related_changes.count(),
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -2192,6 +2198,7 @@ class SecretView(generic.ObjectView):
             "format": format_,
             "provider_name": provider.name if provider else instance.provider,
             "groups_table": groups_table,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -2407,7 +2414,10 @@ class StatusView(generic.ObjectView):
 
     def get_extra_context(self, request, instance):
         """Return ordered content types."""
-        return {"content_types": instance.content_types.order_by("app_label", "model")}
+        return {
+            "content_types": instance.content_types.order_by("app_label", "model"),
+            **super().get_extra_context(request, instance),
+        }
 
 
 #
@@ -2442,6 +2452,7 @@ class TagView(generic.ObjectView):
             "items_count": tagged_items.count(),
             "items_table": items_table,
             "content_types": instance.content_types.order_by("app_label", "model"),
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -2522,7 +2533,10 @@ class WebhookView(generic.ObjectView):
     queryset = Webhook.objects.all()
 
     def get_extra_context(self, request, instance):
-        return {"content_types": instance.content_types.order_by("app_label", "model")}
+        return {
+            "content_types": instance.content_types.order_by("app_label", "model"),
+            **super().get_extra_context(request, instance),
+        }
 
 
 class WebhookEditView(generic.ObjectEditView):

nautobot/ipam/views.py

@@ -332,6 +332,7 @@ class RouteTargetView(generic.ObjectView):
         return {
             "importing_vrfs_table": importing_vrfs_table,
             "exporting_vrfs_table": exporting_vrfs_table,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -389,9 +390,7 @@ class RIRView(generic.ObjectView):
         }
         RequestConfig(request, paginate).configure(assigned_prefix_table)
 
-        return {
-            "assigned_prefix_table": assigned_prefix_table,
-        }
+        return {"assigned_prefix_table": assigned_prefix_table, **super().get_extra_context(request, instance)}
 
 
 class RIREditView(generic.ObjectEditView):
@@ -457,6 +456,7 @@ class PrefixView(generic.ObjectView):
         return {
             "vrf_table": vrf_table,
             "parent_prefix_table": parent_prefix_table,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -780,6 +780,7 @@ class IPAddressView(generic.ObjectView):
         return {
             "parent_prefixes_table": parent_prefixes_table,
             "related_ips_table": related_ips_table,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -1261,6 +1262,7 @@ class VLANGroupView(generic.ObjectView):
             "vlan_table": vlan_table,
             "permissions": permissions,
             "vlans_count": vlans_count,
+            **super().get_extra_context(request, instance),
         }
 
 
@@ -1317,9 +1319,7 @@ class VLANView(generic.ObjectView):
         prefix_table = tables.PrefixTable(list(prefixes))
         prefix_table.exclude = ("vlan",)
 
-        return {
-            "prefix_table": prefix_table,
-        }
+        return {"prefix_table": prefix_table, **super().get_extra_context(request, instance)}
 
 
 class VLANInterfacesView(generic.ObjectView):