diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index f5e54c3f4..62d436e4e 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -707,7 +707,7 @@ class FHRPGroupAssignmentFilterSet(ChangeLoggedModelFilterSet): fields = ['id', 'group_id', 'interface_type', 'interface_id', 'priority'] def filter_device(self, queryset, name, value): - devices = Device.objects.filter(**{'{}__in'.format(name): value}) + devices = Device.objects.filter(**{f'{name}__in': value}) if not devices.exists(): return queryset.none() interface_ids = [] @@ -718,7 +718,7 @@ class FHRPGroupAssignmentFilterSet(ChangeLoggedModelFilterSet): ) def filter_virtual_machine(self, queryset, name, value): - virtual_machines = VirtualMachine.objects.filter(**{'{}__in'.format(name): value}) + virtual_machines = VirtualMachine.objects.filter(**{'f{name}__in': value}) if not virtual_machines.exists(): return queryset.none() interface_ids = [] diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py index 94c806d0d..6431afb0b 100644 --- a/netbox/ipam/tests/test_filtersets.py +++ b/netbox/ipam/tests/test_filtersets.py @@ -1025,20 +1025,17 @@ class FHRPGroupAssignmentTestCase(TestCase, ChangeLoggedFilterSetTests): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) def test_device(self): - device = Device.objects.all()[0] + device = Device.objects.first() params = {'device': [device.name]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) - params = {'device_id': [device.pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) def test_virtual_machine(self): - vm = VirtualMachine.objects.all()[0] - + vm = VirtualMachine.objects.first() params = {'virtual_machine': [vm.name]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) - params = {'virtual_machine_id': [vm.pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)