NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-17 21:18:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source
This commit is contained in:
Jeremy Stretch 2022-05-11 10:06:21 -04:00 committed by GitHub
parent c7e2cb6102
commit c84ff70c17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/ipam/filtersets.py
View File

@ -707,7 +707,7 @@ class FHRPGroupAssignmentFilterSet(ChangeLoggedModelFilterSet):
fields = ['id', 'group_id', 'interface_type', 'interface_id', 'priority'] fields = ['id', 'group_id', 'interface_type', 'interface_id', 'priority']
def filter_device(self, queryset, name, value): 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(): if not devices.exists():
return queryset.none() return queryset.none()
interface_ids = [] interface_ids = []
@ -718,7 +718,7 @@ class FHRPGroupAssignmentFilterSet(ChangeLoggedModelFilterSet):
) )
def filter_virtual_machine(self, queryset, name, value): 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(): if not virtual_machines.exists():
return queryset.none() return queryset.none()
interface_ids = [] interface_ids = []

7
netbox/ipam/tests/test_filtersets.py
View File

@ -1025,20 +1025,17 @@ class FHRPGroupAssignmentTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
def test_device(self): def test_device(self):
device = Device.objects.all()[0] device = Device.objects.first()
params = {'device': [device.name]} params = {'device': [device.name]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
params = {'device_id': [device.pk]} params = {'device_id': [device.pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
def test_virtual_machine(self): def test_virtual_machine(self):
vm = VirtualMachine.objects.all()[0] vm = VirtualMachine.objects.first()
params = {'virtual_machine': [vm.name]} params = {'virtual_machine': [vm.name]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
params = {'virtual_machine_id': [vm.pk]} params = {'virtual_machine_id': [vm.pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)