mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Closes #3954: Add device_bays filter for devices and device types

Browse Source
This commit is contained in:
Jeremy Stretch
2020-01-17 16:39:31 -05:00
parent a4687be5e5
commit aa73a7ad02
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.7.md
View File

@ -3,6 +3,7 @@
## Enhancements ## Enhancements
* [#3842](https://github.com/netbox-community/netbox/issues/3842) - Add 802.11ax interface type * [#3842](https://github.com/netbox-community/netbox/issues/3842) - Add 802.11ax interface type
* [#3954](https://github.com/netbox-community/netbox/issues/3954) - Add `device_bays` filter for devices and device types
## Bug Fixes ## Bug Fixes

15
netbox/dcim/filters.py
View File

@ -1,6 +1,5 @@
import django_filters import django_filters
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db.models import Q
from extras.filters import CustomFieldFilterSet, LocalConfigContextFilterSet, CreatedUpdatedFilterSet from extras.filters import CustomFieldFilterSet, LocalConfigContextFilterSet, CreatedUpdatedFilterSet
from tenancy.filters import TenancyFilterSet from tenancy.filters import TenancyFilterSet
@ -356,6 +355,10 @@ class DeviceTypeFilterSet(CustomFieldFilterSet, CreatedUpdatedFilterSet):
method='_pass_through_ports', method='_pass_through_ports',
label='Has pass-through ports', label='Has pass-through ports',
) )
device_bays = django_filters.BooleanFilter(
method='_device_bays',
label='Has device bays',
)
tag = TagFilter() tag = TagFilter()
class Meta: class Meta:
@ -395,6 +398,9 @@ class DeviceTypeFilterSet(CustomFieldFilterSet, CreatedUpdatedFilterSet):
rearport_templates__isnull=value rearport_templates__isnull=value
) )
def _device_bays(self, queryset, name, value):
return queryset.exclude(device_bay_templates__isnull=value)
class DeviceTypeComponentFilterSet(NameSlugSearchFilterSet): class DeviceTypeComponentFilterSet(NameSlugSearchFilterSet):
devicetype_id = django_filters.ModelMultipleChoiceFilter( devicetype_id = django_filters.ModelMultipleChoiceFilter(
@ -623,6 +629,10 @@ class DeviceFilterSet(LocalConfigContextFilterSet, TenancyFilterSet, CustomField
method='_pass_through_ports', method='_pass_through_ports',
label='Has pass-through ports', label='Has pass-through ports',
) )
device_bays = django_filters.BooleanFilter(
method='_device_bays',
label='Has device bays',
)
tag = TagFilter() tag = TagFilter()
class Meta: class Meta:
@ -676,6 +686,9 @@ class DeviceFilterSet(LocalConfigContextFilterSet, TenancyFilterSet, CustomField
rearports__isnull=value rearports__isnull=value
) )
def _device_bays(self, queryset, name, value):
return queryset.exclude(device_bays__isnull=value)
class DeviceComponentFilterSet(django_filters.FilterSet): class DeviceComponentFilterSet(django_filters.FilterSet):
q = django_filters.CharFilter( q = django_filters.CharFilter(

22
netbox/dcim/tests/test_filters.py
View File

@ -595,12 +595,11 @@ class DeviceTypeTestCase(TestCase):
params = {'pass_through_ports': 'false'} params = {'pass_through_ports': 'false'}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
# TODO: Add device_bay filter def test_device_bays(self):
# def test_device_bays(self): params = {'device_bays': 'true'}
# params = {'device_bays': 'true'} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
# self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) params = {'device_bays': 'false'}
# params = {'device_bays': 'false'} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
# self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
class ConsolePortTemplateTestCase(TestCase): class ConsolePortTemplateTestCase(TestCase):
@ -1322,12 +1321,11 @@ class DeviceTestCase(TestCase):
params = {'pass_through_ports': 'false'} params = {'pass_through_ports': 'false'}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
# TODO: Add device_bay filter def test_device_bays(self):
# def test_device_bays(self): params = {'device_bays': 'true'}
# params = {'device_bays': 'true'} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
# self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) params = {'device_bays': 'false'}
# params = {'device_bays': 'false'} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
# self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
def test_local_context_data(self): def test_local_context_data(self):
params = {'local_context_data': 'true'} params = {'local_context_data': 'true'}