diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index a3cc217c6..f9bfeb985 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -1754,6 +1754,13 @@ class VirtualDeviceContextBulkEditForm(PrimaryModelBulkEditForm): ) nullable_fields = ('device', 'tenant', ) + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + # Remove parent device passed as context to avoid conflicts with the actual device field + # on this form (see bug #21990) + self.initial.pop('device', None) + # # Addressing diff --git a/netbox/virtualization/forms/bulk_edit.py b/netbox/virtualization/forms/bulk_edit.py index f8868d8d3..887a89e9f 100644 --- a/netbox/virtualization/forms/bulk_edit.py +++ b/netbox/virtualization/forms/bulk_edit.py @@ -164,6 +164,10 @@ class VirtualMachineBulkEditForm(PrimaryModelBulkEditForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) + # Remove parent device passed as context to avoid conflicts with the actual device field + # on this form (see bug #21990) + self.initial.pop('device', None) + # Set unit labels based on configured RAM_BASE_UNIT / DISK_BASE_UNIT (MB vs MiB) self.fields['memory'].label = _('Memory ({unit})').format(unit=get_capacity_unit_label(settings.RAM_BASE_UNIT)) self.fields['disk'].label = _('Disk ({unit})').format(unit=get_capacity_unit_label(settings.DISK_BASE_UNIT)) diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py index 435e9579e..972505705 100644 --- a/netbox/virtualization/tests/test_views.py +++ b/netbox/virtualization/tests/test_views.py @@ -335,6 +335,33 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase): url = reverse('virtualization:virtualmachine_interfaces', kwargs={'pk': virtualmachine.pk}) self.assertHttpStatus(self.client.get(url), 200) + def test_bulk_edit_device_context_preserves_device(self): + """ + Regression test for #21990: Bulk editing VMs from the Device's VMs tab (URL contains + ?device=) must not clear the device field on those VMs. + """ + self.add_permissions('virtualization.view_virtualmachine', 'virtualization.change_virtualmachine') + + device = VirtualMachine.objects.filter(device__isnull=False).first().device + vms = list(VirtualMachine.objects.filter(device=device)[:3]) + pk_list = [vm.pk for vm in vms] + + data = { + 'pk': pk_list, + '_apply': True, + # Only change status — device is intentionally omitted + 'status': VirtualMachineStatusChoices.STATUS_STAGED, + } + + # Simulate navigation from Device -> Virtual Machines tab by passing ?device= as GET param + url = reverse('virtualization:virtualmachine_bulk_edit') + f'?device={device.pk}' + response = self.client.post(url, data) + self.assertHttpStatus(response, 302) + + for vm in VirtualMachine.objects.filter(pk__in=pk_list): + self.assertEqual(vm.device, device, msg=f"Device was unexpectedly cleared on VM '{vm.name}'") + self.assertEqual(vm.status, VirtualMachineStatusChoices.STATUS_STAGED) + def test_virtualmachine_renderconfig(self): configtemplate = ConfigTemplate.objects.create( name='Test Config Template',