NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-02 05:46:25 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Add tests

Browse Source
This commit is contained in:
Jeremy Stretch 2024-10-03 18:38:31 +01:00
parent 1507840f35
commit c34f01b32b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/ipam/filtersets.py
View File

@ -1072,7 +1072,7 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
def get_for_virtualmachine(self, queryset, name, value): def get_for_virtualmachine(self, queryset, name, value):
return queryset.get_for_virtualmachine(value) return queryset.get_for_virtualmachine(value)
def test_filter_interface_id(self, queryset, name, value): def filter_interface_id(self, queryset, name, value):
if value is None: if value is None:
return queryset.none() return queryset.none()
return queryset.filter( return queryset.filter(
@ -1081,9 +1081,8 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
) )
def filter_vminterface_id(self, queryset, name, value): def filter_vminterface_id(self, queryset, name, value):
value = value.strip() if value is None:
if not value: return queryset.none()
return queryset
return queryset.filter( return queryset.filter(
Q(vminterfaces_as_tagged=value) | Q(vminterfaces_as_tagged=value) |
Q(vminterfaces_as_untagged=value) Q(vminterfaces_as_untagged=value)

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

@ -1887,6 +1887,16 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'available_at_site': site_id} params = {'available_at_site': site_id}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5) # 4 scoped + 1 global group + 1 global self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5) # 4 scoped + 1 global group + 1 global
def test_interface(self):
interface_id = Interface.objects.first().pk
params = {'interface_id': interface_id}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
def test_vminterface(self):
vminterface_id = VMInterface.objects.first().pk
params = {'vminterface_id': vminterface_id}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
class ServiceTemplateTestCase(TestCase, ChangeLoggedFilterSetTests): class ServiceTemplateTestCase(TestCase, ChangeLoggedFilterSetTests):
queryset = ServiceTemplate.objects.all() queryset = ServiceTemplate.objects.all()