From 0767de205e05ee6efca990862abc634232fd9066 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 9 Jan 2020 20:30:40 -0500 Subject: [PATCH] Renamed dcim FilterSets --- netbox/dcim/api/views.py | 70 +++++++-------- netbox/dcim/filters.py | 140 +++++++++++++++--------------- netbox/dcim/tests/test_filters.py | 72 +++++++-------- netbox/dcim/views.py | 96 ++++++++++---------- netbox/netbox/views.py | 20 ++--- 5 files changed, 199 insertions(+), 199 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 68fd62eb2..6fa202994 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -106,7 +106,7 @@ class RegionViewSet(ModelViewSet): site_count=Count('sites') ) serializer_class = serializers.RegionSerializer - filterset_class = filters.RegionFilter + filterset_class = filters.RegionFilterSet # @@ -125,7 +125,7 @@ class SiteViewSet(CustomFieldModelViewSet): virtualmachine_count=get_subquery(VirtualMachine, 'cluster__site'), ) serializer_class = serializers.SiteSerializer - filterset_class = filters.SiteFilter + filterset_class = filters.SiteFilterSet @action(detail=True) def graphs(self, request, pk): @@ -147,7 +147,7 @@ class RackGroupViewSet(ModelViewSet): rack_count=Count('racks') ) serializer_class = serializers.RackGroupSerializer - filterset_class = filters.RackGroupFilter + filterset_class = filters.RackGroupFilterSet # @@ -159,7 +159,7 @@ class RackRoleViewSet(ModelViewSet): rack_count=Count('racks') ) serializer_class = serializers.RackRoleSerializer - filterset_class = filters.RackRoleFilter + filterset_class = filters.RackRoleFilterSet # @@ -174,7 +174,7 @@ class RackViewSet(CustomFieldModelViewSet): powerfeed_count=get_subquery(PowerFeed, 'rack') ) serializer_class = serializers.RackSerializer - filterset_class = filters.RackFilter + filterset_class = filters.RackFilterSet @swagger_auto_schema(deprecated=True) @action(detail=True) @@ -244,7 +244,7 @@ class RackViewSet(CustomFieldModelViewSet): class RackReservationViewSet(ModelViewSet): queryset = RackReservation.objects.prefetch_related('rack', 'user', 'tenant') serializer_class = serializers.RackReservationSerializer - filterset_class = filters.RackReservationFilter + filterset_class = filters.RackReservationFilterSet # Assign user from request def perform_create(self, serializer): @@ -262,7 +262,7 @@ class ManufacturerViewSet(ModelViewSet): platform_count=get_subquery(Platform, 'manufacturer') ) serializer_class = serializers.ManufacturerSerializer - filterset_class = filters.ManufacturerFilter + filterset_class = filters.ManufacturerFilterSet # @@ -274,7 +274,7 @@ class DeviceTypeViewSet(CustomFieldModelViewSet): device_count=Count('instances') ) serializer_class = serializers.DeviceTypeSerializer - filterset_class = filters.DeviceTypeFilter + filterset_class = filters.DeviceTypeFilterSet # @@ -284,49 +284,49 @@ class DeviceTypeViewSet(CustomFieldModelViewSet): class ConsolePortTemplateViewSet(ModelViewSet): queryset = ConsolePortTemplate.objects.prefetch_related('device_type__manufacturer') serializer_class = serializers.ConsolePortTemplateSerializer - filterset_class = filters.ConsolePortTemplateFilter + filterset_class = filters.ConsolePortTemplateFilterSet class ConsoleServerPortTemplateViewSet(ModelViewSet): queryset = ConsoleServerPortTemplate.objects.prefetch_related('device_type__manufacturer') serializer_class = serializers.ConsoleServerPortTemplateSerializer - filterset_class = filters.ConsoleServerPortTemplateFilter + filterset_class = filters.ConsoleServerPortTemplateFilterSet class PowerPortTemplateViewSet(ModelViewSet): queryset = PowerPortTemplate.objects.prefetch_related('device_type__manufacturer') serializer_class = serializers.PowerPortTemplateSerializer - filterset_class = filters.PowerPortTemplateFilter + filterset_class = filters.PowerPortTemplateFilterSet class PowerOutletTemplateViewSet(ModelViewSet): queryset = PowerOutletTemplate.objects.prefetch_related('device_type__manufacturer') serializer_class = serializers.PowerOutletTemplateSerializer - filterset_class = filters.PowerOutletTemplateFilter + filterset_class = filters.PowerOutletTemplateFilterSet class InterfaceTemplateViewSet(ModelViewSet): queryset = InterfaceTemplate.objects.prefetch_related('device_type__manufacturer') serializer_class = serializers.InterfaceTemplateSerializer - filterset_class = filters.InterfaceTemplateFilter + filterset_class = filters.InterfaceTemplateFilterSet class FrontPortTemplateViewSet(ModelViewSet): queryset = FrontPortTemplate.objects.prefetch_related('device_type__manufacturer') serializer_class = serializers.FrontPortTemplateSerializer - filterset_class = filters.FrontPortTemplateFilter + filterset_class = filters.FrontPortTemplateFilterSet class RearPortTemplateViewSet(ModelViewSet): queryset = RearPortTemplate.objects.prefetch_related('device_type__manufacturer') serializer_class = serializers.RearPortTemplateSerializer - filterset_class = filters.RearPortTemplateFilter + filterset_class = filters.RearPortTemplateFilterSet class DeviceBayTemplateViewSet(ModelViewSet): queryset = DeviceBayTemplate.objects.prefetch_related('device_type__manufacturer') serializer_class = serializers.DeviceBayTemplateSerializer - filterset_class = filters.DeviceBayTemplateFilter + filterset_class = filters.DeviceBayTemplateFilterSet # @@ -339,7 +339,7 @@ class DeviceRoleViewSet(ModelViewSet): virtualmachine_count=get_subquery(VirtualMachine, 'role') ) serializer_class = serializers.DeviceRoleSerializer - filterset_class = filters.DeviceRoleFilter + filterset_class = filters.DeviceRoleFilterSet # @@ -352,7 +352,7 @@ class PlatformViewSet(ModelViewSet): virtualmachine_count=get_subquery(VirtualMachine, 'platform') ) serializer_class = serializers.PlatformSerializer - filterset_class = filters.PlatformFilter + filterset_class = filters.PlatformFilterSet # @@ -364,7 +364,7 @@ class DeviceViewSet(CustomFieldModelViewSet): 'device_type__manufacturer', 'device_role', 'tenant', 'platform', 'site', 'rack', 'parent_bay', 'virtual_chassis__master', 'primary_ip4__nat_outside', 'primary_ip6__nat_outside', 'tags', ) - filterset_class = filters.DeviceFilter + filterset_class = filters.DeviceFilterSet def get_serializer_class(self): """ @@ -503,13 +503,13 @@ class DeviceViewSet(CustomFieldModelViewSet): class ConsolePortViewSet(CableTraceMixin, ModelViewSet): queryset = ConsolePort.objects.prefetch_related('device', 'connected_endpoint__device', 'cable', 'tags') serializer_class = serializers.ConsolePortSerializer - filterset_class = filters.ConsolePortFilter + filterset_class = filters.ConsolePortFilterSet class ConsoleServerPortViewSet(CableTraceMixin, ModelViewSet): queryset = ConsoleServerPort.objects.prefetch_related('device', 'connected_endpoint__device', 'cable', 'tags') serializer_class = serializers.ConsoleServerPortSerializer - filterset_class = filters.ConsoleServerPortFilter + filterset_class = filters.ConsoleServerPortFilterSet class PowerPortViewSet(CableTraceMixin, ModelViewSet): @@ -517,13 +517,13 @@ class PowerPortViewSet(CableTraceMixin, ModelViewSet): 'device', '_connected_poweroutlet__device', '_connected_powerfeed', 'cable', 'tags' ) serializer_class = serializers.PowerPortSerializer - filterset_class = filters.PowerPortFilter + filterset_class = filters.PowerPortFilterSet class PowerOutletViewSet(CableTraceMixin, ModelViewSet): queryset = PowerOutlet.objects.prefetch_related('device', 'connected_endpoint__device', 'cable', 'tags') serializer_class = serializers.PowerOutletSerializer - filterset_class = filters.PowerOutletFilter + filterset_class = filters.PowerOutletFilterSet class InterfaceViewSet(CableTraceMixin, ModelViewSet): @@ -533,7 +533,7 @@ class InterfaceViewSet(CableTraceMixin, ModelViewSet): device__isnull=False ) serializer_class = serializers.InterfaceSerializer - filterset_class = filters.InterfaceFilter + filterset_class = filters.InterfaceFilterSet @action(detail=True) def graphs(self, request, pk): @@ -549,25 +549,25 @@ class InterfaceViewSet(CableTraceMixin, ModelViewSet): class FrontPortViewSet(ModelViewSet): queryset = FrontPort.objects.prefetch_related('device__device_type__manufacturer', 'rear_port', 'cable', 'tags') serializer_class = serializers.FrontPortSerializer - filterset_class = filters.FrontPortFilter + filterset_class = filters.FrontPortFilterSet class RearPortViewSet(ModelViewSet): queryset = RearPort.objects.prefetch_related('device__device_type__manufacturer', 'cable', 'tags') serializer_class = serializers.RearPortSerializer - filterset_class = filters.RearPortFilter + filterset_class = filters.RearPortFilterSet class DeviceBayViewSet(ModelViewSet): queryset = DeviceBay.objects.prefetch_related('installed_device').prefetch_related('tags') serializer_class = serializers.DeviceBaySerializer - filterset_class = filters.DeviceBayFilter + filterset_class = filters.DeviceBayFilterSet class InventoryItemViewSet(ModelViewSet): queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer').prefetch_related('tags') serializer_class = serializers.InventoryItemSerializer - filterset_class = filters.InventoryItemFilter + filterset_class = filters.InventoryItemFilterSet # @@ -581,7 +581,7 @@ class ConsoleConnectionViewSet(ListModelMixin, GenericViewSet): connected_endpoint__isnull=False ) serializer_class = serializers.ConsolePortSerializer - filterset_class = filters.ConsoleConnectionFilter + filterset_class = filters.ConsoleConnectionFilterSet class PowerConnectionViewSet(ListModelMixin, GenericViewSet): @@ -591,7 +591,7 @@ class PowerConnectionViewSet(ListModelMixin, GenericViewSet): _connected_poweroutlet__isnull=False ) serializer_class = serializers.PowerPortSerializer - filterset_class = filters.PowerConnectionFilter + filterset_class = filters.PowerConnectionFilterSet class InterfaceConnectionViewSet(ListModelMixin, GenericViewSet): @@ -603,7 +603,7 @@ class InterfaceConnectionViewSet(ListModelMixin, GenericViewSet): pk__lt=F('_connected_interface') ) serializer_class = serializers.InterfaceConnectionSerializer - filterset_class = filters.InterfaceConnectionFilter + filterset_class = filters.InterfaceConnectionFilterSet # @@ -615,7 +615,7 @@ class CableViewSet(ModelViewSet): 'termination_a', 'termination_b' ) serializer_class = serializers.CableSerializer - filterset_class = filters.CableFilter + filterset_class = filters.CableFilterSet # @@ -627,7 +627,7 @@ class VirtualChassisViewSet(ModelViewSet): member_count=Count('members') ) serializer_class = serializers.VirtualChassisSerializer - filterset_class = filters.VirtualChassisFilter + filterset_class = filters.VirtualChassisFilterSet # @@ -641,7 +641,7 @@ class PowerPanelViewSet(ModelViewSet): powerfeed_count=Count('powerfeeds') ) serializer_class = serializers.PowerPanelSerializer - filterset_class = filters.PowerPanelFilter + filterset_class = filters.PowerPanelFilterSet # @@ -651,7 +651,7 @@ class PowerPanelViewSet(ModelViewSet): class PowerFeedViewSet(CustomFieldModelViewSet): queryset = PowerFeed.objects.prefetch_related('power_panel', 'rack', 'tags') serializer_class = serializers.PowerFeedSerializer - filterset_class = filters.PowerFeedFilter + filterset_class = filters.PowerFeedFilterSet # diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 98ecf2fb4..dc09ee6da 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -23,45 +23,45 @@ from .models import ( __all__ = ( - 'CableFilter', - 'ConsoleConnectionFilter', - 'ConsolePortFilter', - 'ConsolePortTemplateFilter', - 'ConsoleServerPortFilter', - 'ConsoleServerPortTemplateFilter', - 'DeviceBayFilter', - 'DeviceBayTemplateFilter', - 'DeviceFilter', - 'DeviceRoleFilter', - 'DeviceTypeFilter', - 'FrontPortFilter', - 'FrontPortTemplateFilter', - 'InterfaceConnectionFilter', - 'InterfaceFilter', - 'InterfaceTemplateFilter', - 'InventoryItemFilter', - 'ManufacturerFilter', - 'PlatformFilter', - 'PowerConnectionFilter', - 'PowerFeedFilter', - 'PowerOutletFilter', - 'PowerOutletTemplateFilter', - 'PowerPanelFilter', - 'PowerPortFilter', - 'PowerPortTemplateFilter', - 'RackFilter', - 'RackGroupFilter', - 'RackReservationFilter', - 'RackRoleFilter', - 'RearPortFilter', - 'RearPortTemplateFilter', - 'RegionFilter', - 'SiteFilter', - 'VirtualChassisFilter', + 'CableFilterSet', + 'ConsoleConnectionFilterSet', + 'ConsolePortFilterSet', + 'ConsolePortTemplateFilterSet', + 'ConsoleServerPortFilterSet', + 'ConsoleServerPortTemplateFilterSet', + 'DeviceBayFilterSet', + 'DeviceBayTemplateFilterSet', + 'DeviceFilterSet', + 'DeviceRoleFilterSet', + 'DeviceTypeFilterSet', + 'FrontPortFilterSet', + 'FrontPortTemplateFilterSet', + 'InterfaceConnectionFilterSet', + 'InterfaceFilterSet', + 'InterfaceTemplateFilterSet', + 'InventoryItemFilterSet', + 'ManufacturerFilterSet', + 'PlatformFilterSet', + 'PowerConnectionFilterSet', + 'PowerFeedFilterSet', + 'PowerOutletFilterSet', + 'PowerOutletTemplateFilterSet', + 'PowerPanelFilterSet', + 'PowerPortFilterSet', + 'PowerPortTemplateFilterSet', + 'RackFilterSet', + 'RackGroupFilterSet', + 'RackReservationFilterSet', + 'RackRoleFilterSet', + 'RearPortFilterSet', + 'RearPortTemplateFilterSet', + 'RegionFilterSet', + 'SiteFilterSet', + 'VirtualChassisFilterSet', ) -class RegionFilter(NameSlugSearchFilterSet): +class RegionFilterSet(NameSlugSearchFilterSet): parent_id = django_filters.ModelMultipleChoiceFilter( queryset=Region.objects.all(), label='Parent region (ID)', @@ -78,7 +78,7 @@ class RegionFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug'] -class SiteFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): +class SiteFilterSet(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -132,7 +132,7 @@ class SiteFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet return queryset.filter(qs_filter) -class RackGroupFilter(NameSlugSearchFilterSet): +class RackGroupFilterSet(NameSlugSearchFilterSet): region_id = TreeNodeMultipleChoiceFilter( queryset=Region.objects.all(), field_name='site__region__in', @@ -160,14 +160,14 @@ class RackGroupFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug'] -class RackRoleFilter(NameSlugSearchFilterSet): +class RackRoleFilterSet(NameSlugSearchFilterSet): class Meta: model = RackRole fields = ['id', 'name', 'slug', 'color'] -class RackFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): +class RackFilterSet(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -245,7 +245,7 @@ class RackFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet ) -class RackReservationFilter(TenancyFilterSet): +class RackReservationFilterSet(TenancyFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -306,14 +306,14 @@ class RackReservationFilter(TenancyFilterSet): ) -class ManufacturerFilter(NameSlugSearchFilterSet): +class ManufacturerFilterSet(NameSlugSearchFilterSet): class Meta: model = Manufacturer fields = ['id', 'name', 'slug'] -class DeviceTypeFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): +class DeviceTypeFilterSet(CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -404,70 +404,70 @@ class DeviceTypeComponentFilterSet(NameSlugSearchFilterSet): ) -class ConsolePortTemplateFilter(DeviceTypeComponentFilterSet): +class ConsolePortTemplateFilterSet(DeviceTypeComponentFilterSet): class Meta: model = ConsolePortTemplate fields = ['id', 'name', 'type'] -class ConsoleServerPortTemplateFilter(DeviceTypeComponentFilterSet): +class ConsoleServerPortTemplateFilterSet(DeviceTypeComponentFilterSet): class Meta: model = ConsoleServerPortTemplate fields = ['id', 'name', 'type'] -class PowerPortTemplateFilter(DeviceTypeComponentFilterSet): +class PowerPortTemplateFilterSet(DeviceTypeComponentFilterSet): class Meta: model = PowerPortTemplate fields = ['id', 'name', 'type', 'maximum_draw', 'allocated_draw'] -class PowerOutletTemplateFilter(DeviceTypeComponentFilterSet): +class PowerOutletTemplateFilterSet(DeviceTypeComponentFilterSet): class Meta: model = PowerOutletTemplate fields = ['id', 'name', 'type', 'feed_leg'] -class InterfaceTemplateFilter(DeviceTypeComponentFilterSet): +class InterfaceTemplateFilterSet(DeviceTypeComponentFilterSet): class Meta: model = InterfaceTemplate fields = ['id', 'name', 'type', 'mgmt_only'] -class FrontPortTemplateFilter(DeviceTypeComponentFilterSet): +class FrontPortTemplateFilterSet(DeviceTypeComponentFilterSet): class Meta: model = FrontPortTemplate fields = ['id', 'name', 'type'] -class RearPortTemplateFilter(DeviceTypeComponentFilterSet): +class RearPortTemplateFilterSet(DeviceTypeComponentFilterSet): class Meta: model = RearPortTemplate fields = ['id', 'name', 'type', 'positions'] -class DeviceBayTemplateFilter(DeviceTypeComponentFilterSet): +class DeviceBayTemplateFilterSet(DeviceTypeComponentFilterSet): class Meta: model = DeviceBayTemplate fields = ['id', 'name'] -class DeviceRoleFilter(NameSlugSearchFilterSet): +class DeviceRoleFilterSet(NameSlugSearchFilterSet): class Meta: model = DeviceRole fields = ['id', 'name', 'slug', 'color', 'vm_role'] -class PlatformFilter(NameSlugSearchFilterSet): +class PlatformFilterSet(NameSlugSearchFilterSet): manufacturer_id = django_filters.ModelMultipleChoiceFilter( field_name='manufacturer', queryset=Manufacturer.objects.all(), @@ -485,7 +485,7 @@ class PlatformFilter(NameSlugSearchFilterSet): fields = ['id', 'name', 'slug', 'napalm_driver'] -class DeviceFilter(LocalConfigContextFilter, TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): +class DeviceFilterSet(LocalConfigContextFilter, TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -723,7 +723,7 @@ class DeviceComponentFilterSet(django_filters.FilterSet): ) -class ConsolePortFilter(DeviceComponentFilterSet): +class ConsolePortFilterSet(DeviceComponentFilterSet): type = django_filters.MultipleChoiceFilter( choices=ConsolePortTypeChoices, null_value=None @@ -739,7 +739,7 @@ class ConsolePortFilter(DeviceComponentFilterSet): fields = ['id', 'name', 'description', 'connection_status'] -class ConsoleServerPortFilter(DeviceComponentFilterSet): +class ConsoleServerPortFilterSet(DeviceComponentFilterSet): type = django_filters.MultipleChoiceFilter( choices=ConsolePortTypeChoices, null_value=None @@ -755,7 +755,7 @@ class ConsoleServerPortFilter(DeviceComponentFilterSet): fields = ['id', 'name', 'description', 'connection_status'] -class PowerPortFilter(DeviceComponentFilterSet): +class PowerPortFilterSet(DeviceComponentFilterSet): type = django_filters.MultipleChoiceFilter( choices=PowerPortTypeChoices, null_value=None @@ -771,7 +771,7 @@ class PowerPortFilter(DeviceComponentFilterSet): fields = ['id', 'name', 'maximum_draw', 'allocated_draw', 'description', 'connection_status'] -class PowerOutletFilter(DeviceComponentFilterSet): +class PowerOutletFilterSet(DeviceComponentFilterSet): type = django_filters.MultipleChoiceFilter( choices=PowerOutletTypeChoices, null_value=None @@ -787,7 +787,7 @@ class PowerOutletFilter(DeviceComponentFilterSet): fields = ['id', 'name', 'feed_leg', 'description', 'connection_status'] -class InterfaceFilter(django_filters.FilterSet): +class InterfaceFilterSet(django_filters.FilterSet): """ Not using DeviceComponentFilterSet for Interfaces because we need to check for VirtualChassis membership. """ @@ -915,7 +915,7 @@ class InterfaceFilter(django_filters.FilterSet): }.get(value, queryset.none()) -class FrontPortFilter(DeviceComponentFilterSet): +class FrontPortFilterSet(DeviceComponentFilterSet): cabled = django_filters.BooleanFilter( field_name='cable', lookup_expr='isnull', @@ -927,7 +927,7 @@ class FrontPortFilter(DeviceComponentFilterSet): fields = ['id', 'name', 'type', 'description'] -class RearPortFilter(DeviceComponentFilterSet): +class RearPortFilterSet(DeviceComponentFilterSet): cabled = django_filters.BooleanFilter( field_name='cable', lookup_expr='isnull', @@ -939,14 +939,14 @@ class RearPortFilter(DeviceComponentFilterSet): fields = ['id', 'name', 'type', 'positions', 'description'] -class DeviceBayFilter(DeviceComponentFilterSet): +class DeviceBayFilterSet(DeviceComponentFilterSet): class Meta: model = DeviceBay fields = ['id', 'name', 'description'] -class InventoryItemFilter(DeviceComponentFilterSet): +class InventoryItemFilterSet(DeviceComponentFilterSet): q = django_filters.CharFilter( method='search', label='Search', @@ -1017,7 +1017,7 @@ class InventoryItemFilter(DeviceComponentFilterSet): return queryset.filter(qs_filter) -class VirtualChassisFilter(django_filters.FilterSet): +class VirtualChassisFilterSet(django_filters.FilterSet): q = django_filters.CharFilter( method='search', label='Search', @@ -1071,7 +1071,7 @@ class VirtualChassisFilter(django_filters.FilterSet): return queryset.filter(qs_filter) -class CableFilter(django_filters.FilterSet): +class CableFilterSet(django_filters.FilterSet): q = django_filters.CharFilter( method='search', label='Search', @@ -1126,7 +1126,7 @@ class CableFilter(django_filters.FilterSet): return queryset -class ConsoleConnectionFilter(django_filters.FilterSet): +class ConsoleConnectionFilterSet(django_filters.FilterSet): site = django_filters.CharFilter( method='filter_site', label='Site (slug)', @@ -1157,7 +1157,7 @@ class ConsoleConnectionFilter(django_filters.FilterSet): ) -class PowerConnectionFilter(django_filters.FilterSet): +class PowerConnectionFilterSet(django_filters.FilterSet): site = django_filters.CharFilter( method='filter_site', label='Site (slug)', @@ -1188,7 +1188,7 @@ class PowerConnectionFilter(django_filters.FilterSet): ) -class InterfaceConnectionFilter(django_filters.FilterSet): +class InterfaceConnectionFilterSet(django_filters.FilterSet): site = django_filters.CharFilter( method='filter_site', label='Site (slug)', @@ -1222,7 +1222,7 @@ class InterfaceConnectionFilter(django_filters.FilterSet): ) -class PowerPanelFilter(django_filters.FilterSet): +class PowerPanelFilterSet(django_filters.FilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -1271,7 +1271,7 @@ class PowerPanelFilter(django_filters.FilterSet): return queryset.filter(qs_filter) -class PowerFeedFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet): +class PowerFeedFilterSet(CustomFieldFilterSet, CreatedUpdatedFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' diff --git a/netbox/dcim/tests/test_filters.py b/netbox/dcim/tests/test_filters.py index d4167d2d7..18d0a581b 100644 --- a/netbox/dcim/tests/test_filters.py +++ b/netbox/dcim/tests/test_filters.py @@ -42,27 +42,27 @@ class RegionTestCase(TestCase): def test_id(self): id_list = self.queryset.values_list('id', flat=True)[:2] params = {'id': [str(id) for id in id_list]} - self.assertEqual(RegionFilter(params, self.queryset).qs.count(), 2) + self.assertEqual(RegionFilterSet(params, self.queryset).qs.count(), 2) def test_name(self): params = {'name': ['Region 1', 'Region 2']} - self.assertEqual(RegionFilter(params, self.queryset).qs.count(), 2) + self.assertEqual(RegionFilterSet(params, self.queryset).qs.count(), 2) def test_slug(self): params = {'slug': ['region-1', 'region-2']} - self.assertEqual(RegionFilter(params, self.queryset).qs.count(), 2) + self.assertEqual(RegionFilterSet(params, self.queryset).qs.count(), 2) def test_parent(self): parent_regions = Region.objects.filter(parent__isnull=True)[:2] params = {'parent_id': [parent_regions[0].pk, parent_regions[1].pk]} - self.assertEqual(RegionFilter(params, self.queryset).qs.count(), 4) + self.assertEqual(RegionFilterSet(params, self.queryset).qs.count(), 4) params = {'parent': [parent_regions[0].slug, parent_regions[1].slug]} - self.assertEqual(RegionFilter(params, self.queryset).qs.count(), 4) + self.assertEqual(RegionFilterSet(params, self.queryset).qs.count(), 4) class SiteTestCase(TestCase): queryset = Site.objects.all() - filterset = SiteFilter + filterset = SiteFilterSet @classmethod def setUpTestData(cls): @@ -142,7 +142,7 @@ class SiteTestCase(TestCase): class RackGroupTestCase(TestCase): queryset = RackGroup.objects.all() - filterset = RackGroupFilter + filterset = RackGroupFilterSet @classmethod def setUpTestData(cls): @@ -199,7 +199,7 @@ class RackGroupTestCase(TestCase): class RackRoleTestCase(TestCase): queryset = RackRole.objects.all() - filterset = RackRoleFilter + filterset = RackRoleFilterSet @classmethod def setUpTestData(cls): @@ -231,7 +231,7 @@ class RackRoleTestCase(TestCase): class RackTestCase(TestCase): queryset = Rack.objects.all() - filterset = RackFilter + filterset = RackFilterSet @classmethod def setUpTestData(cls): @@ -368,7 +368,7 @@ class RackTestCase(TestCase): class RackReservationTestCase(TestCase): queryset = RackReservation.objects.all() - filterset = RackReservationFilter + filterset = RackReservationFilterSet @classmethod def setUpTestData(cls): @@ -438,7 +438,7 @@ class RackReservationTestCase(TestCase): class ManufacturerTestCase(TestCase): queryset = Manufacturer.objects.all() - filterset = ManufacturerFilter + filterset = ManufacturerFilterSet @classmethod def setUpTestData(cls): @@ -466,7 +466,7 @@ class ManufacturerTestCase(TestCase): class DeviceTypeTestCase(TestCase): queryset = DeviceType.objects.all() - filterset = DeviceTypeFilter + filterset = DeviceTypeFilterSet @classmethod def setUpTestData(cls): @@ -604,7 +604,7 @@ class DeviceTypeTestCase(TestCase): class ConsolePortTemplateTestCase(TestCase): queryset = ConsolePortTemplate.objects.all() - filterset = ConsolePortTemplateFilter + filterset = ConsolePortTemplateFilterSet @classmethod def setUpTestData(cls): @@ -641,7 +641,7 @@ class ConsolePortTemplateTestCase(TestCase): class ConsoleServerPortTemplateTestCase(TestCase): queryset = ConsoleServerPortTemplate.objects.all() - filterset = ConsoleServerPortTemplateFilter + filterset = ConsoleServerPortTemplateFilterSet @classmethod def setUpTestData(cls): @@ -678,7 +678,7 @@ class ConsoleServerPortTemplateTestCase(TestCase): class PowerPortTemplateTestCase(TestCase): queryset = PowerPortTemplate.objects.all() - filterset = PowerPortTemplateFilter + filterset = PowerPortTemplateFilterSet @classmethod def setUpTestData(cls): @@ -723,7 +723,7 @@ class PowerPortTemplateTestCase(TestCase): class PowerOutletTemplateTestCase(TestCase): queryset = PowerOutletTemplate.objects.all() - filterset = PowerOutletTemplateFilter + filterset = PowerOutletTemplateFilterSet @classmethod def setUpTestData(cls): @@ -765,7 +765,7 @@ class PowerOutletTemplateTestCase(TestCase): class InterfaceTemplateTestCase(TestCase): queryset = InterfaceTemplate.objects.all() - filterset = InterfaceTemplateFilter + filterset = InterfaceTemplateFilterSet @classmethod def setUpTestData(cls): @@ -813,7 +813,7 @@ class InterfaceTemplateTestCase(TestCase): class FrontPortTemplateTestCase(TestCase): queryset = FrontPortTemplate.objects.all() - filterset = FrontPortTemplateFilter + filterset = FrontPortTemplateFilterSet @classmethod def setUpTestData(cls): @@ -862,7 +862,7 @@ class FrontPortTemplateTestCase(TestCase): class RearPortTemplateTestCase(TestCase): queryset = RearPortTemplate.objects.all() - filterset = RearPortTemplateFilter + filterset = RearPortTemplateFilterSet @classmethod def setUpTestData(cls): @@ -908,7 +908,7 @@ class RearPortTemplateTestCase(TestCase): class DeviceBayTemplateTestCase(TestCase): queryset = DeviceBayTemplate.objects.all() - filterset = DeviceBayTemplateFilter + filterset = DeviceBayTemplateFilterSet @classmethod def setUpTestData(cls): @@ -945,7 +945,7 @@ class DeviceBayTemplateTestCase(TestCase): class DeviceRoleTestCase(TestCase): queryset = DeviceRole.objects.all() - filterset = DeviceRoleFilter + filterset = DeviceRoleFilterSet @classmethod def setUpTestData(cls): @@ -983,7 +983,7 @@ class DeviceRoleTestCase(TestCase): class PlatformTestCase(TestCase): queryset = Platform.objects.all() - filterset = PlatformFilter + filterset = PlatformFilterSet @classmethod def setUpTestData(cls): @@ -1029,7 +1029,7 @@ class PlatformTestCase(TestCase): class DeviceTestCase(TestCase): queryset = Device.objects.all() - filterset = DeviceFilter + filterset = DeviceFilterSet @classmethod def setUpTestData(cls): @@ -1331,7 +1331,7 @@ class DeviceTestCase(TestCase): class ConsolePortTestCase(TestCase): queryset = ConsolePort.objects.all() - filterset = ConsolePortFilter + filterset = ConsolePortFilterSet @classmethod def setUpTestData(cls): @@ -1401,7 +1401,7 @@ class ConsolePortTestCase(TestCase): class ConsoleServerPortTestCase(TestCase): queryset = ConsoleServerPort.objects.all() - filterset = ConsoleServerPortFilter + filterset = ConsoleServerPortFilterSet @classmethod def setUpTestData(cls): @@ -1471,7 +1471,7 @@ class ConsoleServerPortTestCase(TestCase): class PowerPortTestCase(TestCase): queryset = PowerPort.objects.all() - filterset = PowerPortFilter + filterset = PowerPortFilterSet @classmethod def setUpTestData(cls): @@ -1549,7 +1549,7 @@ class PowerPortTestCase(TestCase): class PowerOutletTestCase(TestCase): queryset = PowerOutlet.objects.all() - filterset = PowerOutletFilter + filterset = PowerOutletFilterSet @classmethod def setUpTestData(cls): @@ -1624,7 +1624,7 @@ class PowerOutletTestCase(TestCase): class InterfaceTestCase(TestCase): queryset = Interface.objects.all() - filterset = InterfaceFilter + filterset = InterfaceFilterSet @classmethod def setUpTestData(cls): @@ -1725,7 +1725,7 @@ class InterfaceTestCase(TestCase): class FrontPortTestCase(TestCase): queryset = FrontPort.objects.all() - filterset = FrontPortFilter + filterset = FrontPortFilterSet @classmethod def setUpTestData(cls): @@ -1802,7 +1802,7 @@ class FrontPortTestCase(TestCase): class RearPortTestCase(TestCase): queryset = RearPort.objects.all() - filterset = RearPortFilter + filterset = RearPortFilterSet @classmethod def setUpTestData(cls): @@ -1873,7 +1873,7 @@ class RearPortTestCase(TestCase): class DeviceBayTestCase(TestCase): queryset = DeviceBay.objects.all() - filterset = DeviceBayFilter + filterset = DeviceBayFilterSet @classmethod def setUpTestData(cls): @@ -1920,7 +1920,7 @@ class DeviceBayTestCase(TestCase): class InventoryItemTestCase(TestCase): queryset = InventoryItem.objects.all() - filterset = InventoryItemFilter + filterset = InventoryItemFilterSet @classmethod def setUpTestData(cls): @@ -2038,7 +2038,7 @@ class InventoryItemTestCase(TestCase): class VirtualChassisTestCase(TestCase): queryset = VirtualChassis.objects.all() - filterset = VirtualChassisFilter + filterset = VirtualChassisFilterSet @classmethod def setUpTestData(cls): @@ -2109,7 +2109,7 @@ class VirtualChassisTestCase(TestCase): class CableTestCase(TestCase): queryset = Cable.objects.all() - filterset = CableFilter + filterset = CableFilterSet @classmethod def setUpTestData(cls): @@ -2221,7 +2221,7 @@ class CableTestCase(TestCase): class PowerPanelTestCase(TestCase): queryset = PowerPanel.objects.all() - filterset = PowerPanelFilter + filterset = PowerPanelFilterSet @classmethod def setUpTestData(cls): @@ -2281,7 +2281,7 @@ class PowerPanelTestCase(TestCase): class PowerFeedTestCase(TestCase): queryset = PowerFeed.objects.all() - filterset = PowerFeedFilter + filterset = PowerFeedFilterSet @classmethod def setUpTestData(cls): diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 84bb116b0..ad267fb6a 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -148,7 +148,7 @@ class RegionListView(PermissionRequiredMixin, ObjectListView): 'site_count', cumulative=True ) - filter = filters.RegionFilter + filter = filters.RegionFilterSet filter_form = forms.RegionFilterForm table = tables.RegionTable template_name = 'dcim/region_list.html' @@ -175,7 +175,7 @@ class RegionBulkImportView(PermissionRequiredMixin, BulkImportView): class RegionBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_region' queryset = Region.objects.all() - filter = filters.RegionFilter + filter = filters.RegionFilterSet table = tables.RegionTable default_return_url = 'dcim:region_list' @@ -187,7 +187,7 @@ class RegionBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class SiteListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_site' queryset = Site.objects.prefetch_related('region', 'tenant') - filter = filters.SiteFilter + filter = filters.SiteFilterSet filter_form = forms.SiteFilterForm table = tables.SiteTable template_name = 'dcim/site_list.html' @@ -246,7 +246,7 @@ class SiteBulkImportView(PermissionRequiredMixin, BulkImportView): class SiteBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_site' queryset = Site.objects.prefetch_related('region', 'tenant') - filter = filters.SiteFilter + filter = filters.SiteFilterSet table = tables.SiteTable form = forms.SiteBulkEditForm default_return_url = 'dcim:site_list' @@ -255,7 +255,7 @@ class SiteBulkEditView(PermissionRequiredMixin, BulkEditView): class SiteBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_site' queryset = Site.objects.prefetch_related('region', 'tenant') - filter = filters.SiteFilter + filter = filters.SiteFilterSet table = tables.SiteTable default_return_url = 'dcim:site_list' @@ -267,7 +267,7 @@ class SiteBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class RackGroupListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_rackgroup' queryset = RackGroup.objects.prefetch_related('site').annotate(rack_count=Count('racks')) - filter = filters.RackGroupFilter + filter = filters.RackGroupFilterSet filter_form = forms.RackGroupFilterForm table = tables.RackGroupTable template_name = 'dcim/rackgroup_list.html' @@ -294,7 +294,7 @@ class RackGroupBulkImportView(PermissionRequiredMixin, BulkImportView): class RackGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_rackgroup' queryset = RackGroup.objects.prefetch_related('site').annotate(rack_count=Count('racks')) - filter = filters.RackGroupFilter + filter = filters.RackGroupFilterSet table = tables.RackGroupTable default_return_url = 'dcim:rackgroup_list' @@ -346,7 +346,7 @@ class RackListView(PermissionRequiredMixin, ObjectListView): ).annotate( device_count=Count('devices') ) - filter = filters.RackFilter + filter = filters.RackFilterSet filter_form = forms.RackFilterForm table = tables.RackDetailTable template_name = 'dcim/rack_list.html' @@ -361,7 +361,7 @@ class RackElevationListView(PermissionRequiredMixin, View): def get(self, request): racks = Rack.objects.prefetch_related('site', 'group', 'tenant', 'role', 'devices__device_type') - racks = filters.RackFilter(request.GET, racks).qs + racks = filters.RackFilterSet(request.GET, racks).qs total_count = racks.count() # Pagination @@ -450,7 +450,7 @@ class RackBulkImportView(PermissionRequiredMixin, BulkImportView): class RackBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_rack' queryset = Rack.objects.prefetch_related('site', 'group', 'tenant', 'role') - filter = filters.RackFilter + filter = filters.RackFilterSet table = tables.RackTable form = forms.RackBulkEditForm default_return_url = 'dcim:rack_list' @@ -459,7 +459,7 @@ class RackBulkEditView(PermissionRequiredMixin, BulkEditView): class RackBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_rack' queryset = Rack.objects.prefetch_related('site', 'group', 'tenant', 'role') - filter = filters.RackFilter + filter = filters.RackFilterSet table = tables.RackTable default_return_url = 'dcim:rack_list' @@ -471,7 +471,7 @@ class RackBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class RackReservationListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_rackreservation' queryset = RackReservation.objects.prefetch_related('rack__site') - filter = filters.RackReservationFilter + filter = filters.RackReservationFilterSet filter_form = forms.RackReservationFilterForm table = tables.RackReservationTable template_name = 'dcim/rackreservation_list.html' @@ -507,7 +507,7 @@ class RackReservationDeleteView(PermissionRequiredMixin, ObjectDeleteView): class RackReservationBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_rackreservation' queryset = RackReservation.objects.prefetch_related('rack', 'user') - filter = filters.RackReservationFilter + filter = filters.RackReservationFilterSet table = tables.RackReservationTable form = forms.RackReservationBulkEditForm default_return_url = 'dcim:rackreservation_list' @@ -516,7 +516,7 @@ class RackReservationBulkEditView(PermissionRequiredMixin, BulkEditView): class RackReservationBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_rackreservation' queryset = RackReservation.objects.prefetch_related('rack', 'user') - filter = filters.RackReservationFilter + filter = filters.RackReservationFilterSet table = tables.RackReservationTable default_return_url = 'dcim:rackreservation_list' @@ -568,7 +568,7 @@ class ManufacturerBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class DeviceTypeListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_devicetype' queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances')) - filter = filters.DeviceTypeFilter + filter = filters.DeviceTypeFilterSet filter_form = forms.DeviceTypeFilterForm table = tables.DeviceTypeTable template_name = 'dcim/devicetype_list.html' @@ -685,7 +685,7 @@ class DeviceTypeImportView(PermissionRequiredMixin, ObjectImportView): class DeviceTypeBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_devicetype' queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances')) - filter = filters.DeviceTypeFilter + filter = filters.DeviceTypeFilterSet table = tables.DeviceTypeTable form = forms.DeviceTypeBulkEditForm default_return_url = 'dcim:devicetype_list' @@ -694,7 +694,7 @@ class DeviceTypeBulkEditView(PermissionRequiredMixin, BulkEditView): class DeviceTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_devicetype' queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances')) - filter = filters.DeviceTypeFilter + filter = filters.DeviceTypeFilterSet table = tables.DeviceTypeTable default_return_url = 'dcim:devicetype_list' @@ -976,7 +976,7 @@ class DeviceListView(PermissionRequiredMixin, ObjectListView): queryset = Device.objects.prefetch_related( 'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack', 'primary_ip4', 'primary_ip6' ) - filter = filters.DeviceFilter + filter = filters.DeviceFilterSet filter_form = forms.DeviceFilterForm table = tables.DeviceDetailTable template_name = 'dcim/device_list.html' @@ -1176,7 +1176,7 @@ class ChildDeviceBulkImportView(PermissionRequiredMixin, BulkImportView): class DeviceBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_device' queryset = Device.objects.prefetch_related('tenant', 'site', 'rack', 'device_role', 'device_type__manufacturer') - filter = filters.DeviceFilter + filter = filters.DeviceFilterSet table = tables.DeviceTable form = forms.DeviceBulkEditForm default_return_url = 'dcim:device_list' @@ -1185,7 +1185,7 @@ class DeviceBulkEditView(PermissionRequiredMixin, BulkEditView): class DeviceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_device' queryset = Device.objects.prefetch_related('tenant', 'site', 'rack', 'device_role', 'device_type__manufacturer') - filter = filters.DeviceFilter + filter = filters.DeviceFilterSet table = tables.DeviceTable default_return_url = 'dcim:device_list' @@ -1197,7 +1197,7 @@ class DeviceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class ConsolePortListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_consoleport' queryset = ConsolePort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') - filter = filters.ConsolePortFilter + filter = filters.ConsolePortFilterSet filter_form = forms.ConsolePortFilterForm table = tables.ConsolePortDetailTable template_name = 'dcim/device_component_list.html' @@ -1245,7 +1245,7 @@ class ConsolePortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class ConsoleServerPortListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_consoleserverport' queryset = ConsoleServerPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') - filter = filters.ConsoleServerPortFilter + filter = filters.ConsoleServerPortFilterSet filter_form = forms.ConsoleServerPortFilterForm table = tables.ConsoleServerPortDetailTable template_name = 'dcim/device_component_list.html' @@ -1313,7 +1313,7 @@ class ConsoleServerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class PowerPortListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_powerport' queryset = PowerPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') - filter = filters.PowerPortFilter + filter = filters.PowerPortFilterSet filter_form = forms.PowerPortFilterForm table = tables.PowerPortDetailTable template_name = 'dcim/device_component_list.html' @@ -1361,7 +1361,7 @@ class PowerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class PowerOutletListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_poweroutlet' queryset = PowerOutlet.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') - filter = filters.PowerOutletFilter + filter = filters.PowerOutletFilterSet filter_form = forms.PowerOutletFilterForm table = tables.PowerOutletDetailTable template_name = 'dcim/device_component_list.html' @@ -1429,7 +1429,7 @@ class PowerOutletBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class InterfaceListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_interface' queryset = Interface.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') - filter = filters.InterfaceFilter + filter = filters.InterfaceFilterSet filter_form = forms.InterfaceFilterForm table = tables.InterfaceDetailTable template_name = 'dcim/device_component_list.html' @@ -1534,7 +1534,7 @@ class InterfaceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class FrontPortListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_frontport' queryset = FrontPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') - filter = filters.FrontPortFilter + filter = filters.FrontPortFilterSet filter_form = forms.FrontPortFilterForm table = tables.FrontPortDetailTable template_name = 'dcim/device_component_list.html' @@ -1602,7 +1602,7 @@ class FrontPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class RearPortListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_rearport' queryset = RearPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') - filter = filters.RearPortFilter + filter = filters.RearPortFilterSet filter_form = forms.RearPortFilterForm table = tables.RearPortDetailTable template_name = 'dcim/device_component_list.html' @@ -1672,7 +1672,7 @@ class DeviceBayListView(PermissionRequiredMixin, ObjectListView): queryset = DeviceBay.objects.prefetch_related( 'device', 'device__site', 'installed_device', 'installed_device__site' ) - filter = filters.DeviceBayFilter + filter = filters.DeviceBayFilterSet filter_form = forms.DeviceBayFilterForm table = tables.DeviceBayDetailTable template_name = 'dcim/device_component_list.html' @@ -1799,7 +1799,7 @@ class DeviceBulkAddConsolePortView(PermissionRequiredMixin, BulkComponentCreateV form = forms.DeviceBulkAddComponentForm model = ConsolePort model_form = forms.ConsolePortForm - filter = filters.DeviceFilter + filter = filters.DeviceFilterSet table = tables.DeviceTable default_return_url = 'dcim:device_list' @@ -1811,7 +1811,7 @@ class DeviceBulkAddConsoleServerPortView(PermissionRequiredMixin, BulkComponentC form = forms.DeviceBulkAddComponentForm model = ConsoleServerPort model_form = forms.ConsoleServerPortForm - filter = filters.DeviceFilter + filter = filters.DeviceFilterSet table = tables.DeviceTable default_return_url = 'dcim:device_list' @@ -1823,7 +1823,7 @@ class DeviceBulkAddPowerPortView(PermissionRequiredMixin, BulkComponentCreateVie form = forms.DeviceBulkAddComponentForm model = PowerPort model_form = forms.PowerPortForm - filter = filters.DeviceFilter + filter = filters.DeviceFilterSet table = tables.DeviceTable default_return_url = 'dcim:device_list' @@ -1835,7 +1835,7 @@ class DeviceBulkAddPowerOutletView(PermissionRequiredMixin, BulkComponentCreateV form = forms.DeviceBulkAddComponentForm model = PowerOutlet model_form = forms.PowerOutletForm - filter = filters.DeviceFilter + filter = filters.DeviceFilterSet table = tables.DeviceTable default_return_url = 'dcim:device_list' @@ -1847,7 +1847,7 @@ class DeviceBulkAddInterfaceView(PermissionRequiredMixin, BulkComponentCreateVie form = forms.DeviceBulkAddInterfaceForm model = Interface model_form = forms.InterfaceForm - filter = filters.DeviceFilter + filter = filters.DeviceFilterSet table = tables.DeviceTable default_return_url = 'dcim:device_list' @@ -1859,7 +1859,7 @@ class DeviceBulkAddDeviceBayView(PermissionRequiredMixin, BulkComponentCreateVie form = forms.DeviceBulkAddComponentForm model = DeviceBay model_form = forms.DeviceBayForm - filter = filters.DeviceFilter + filter = filters.DeviceFilterSet table = tables.DeviceTable default_return_url = 'dcim:device_list' @@ -1873,7 +1873,7 @@ class CableListView(PermissionRequiredMixin, ObjectListView): queryset = Cable.objects.prefetch_related( 'termination_a', 'termination_b' ) - filter = filters.CableFilter + filter = filters.CableFilterSet filter_form = forms.CableFilterForm table = tables.CableTable template_name = 'dcim/cable_list.html' @@ -2010,7 +2010,7 @@ class CableBulkImportView(PermissionRequiredMixin, BulkImportView): class CableBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_cable' queryset = Cable.objects.prefetch_related('termination_a', 'termination_b') - filter = filters.CableFilter + filter = filters.CableFilterSet table = tables.CableTable form = forms.CableBulkEditForm default_return_url = 'dcim:cable_list' @@ -2019,7 +2019,7 @@ class CableBulkEditView(PermissionRequiredMixin, BulkEditView): class CableBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_cable' queryset = Cable.objects.prefetch_related('termination_a', 'termination_b') - filter = filters.CableFilter + filter = filters.CableFilterSet table = tables.CableTable default_return_url = 'dcim:cable_list' @@ -2037,7 +2037,7 @@ class ConsoleConnectionsListView(PermissionRequiredMixin, ObjectListView): ).order_by( 'cable', 'connected_endpoint__device__name', 'connected_endpoint__name' ) - filter = filters.ConsoleConnectionFilter + filter = filters.ConsoleConnectionFilterSet filter_form = forms.ConsoleConnectionFilterForm table = tables.ConsoleConnectionTable template_name = 'dcim/console_connections_list.html' @@ -2068,7 +2068,7 @@ class PowerConnectionsListView(PermissionRequiredMixin, ObjectListView): ).order_by( 'cable', '_connected_poweroutlet__device__name', '_connected_poweroutlet__name' ) - filter = filters.PowerConnectionFilter + filter = filters.PowerConnectionFilterSet filter_form = forms.PowerConnectionFilterForm table = tables.PowerConnectionTable template_name = 'dcim/power_connections_list.html' @@ -2101,7 +2101,7 @@ class InterfaceConnectionsListView(PermissionRequiredMixin, ObjectListView): ).order_by( 'device' ) - filter = filters.InterfaceConnectionFilter + filter = filters.InterfaceConnectionFilterSet filter_form = forms.InterfaceConnectionFilterForm table = tables.InterfaceConnectionTable template_name = 'dcim/interface_connections_list.html' @@ -2136,7 +2136,7 @@ class InterfaceConnectionsListView(PermissionRequiredMixin, ObjectListView): class InventoryItemListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_inventoryitem' queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer') - filter = filters.InventoryItemFilter + filter = filters.InventoryItemFilterSet filter_form = forms.InventoryItemFilterForm table = tables.InventoryItemTable template_name = 'dcim/inventoryitem_list.html' @@ -2171,7 +2171,7 @@ class InventoryItemBulkImportView(PermissionRequiredMixin, BulkImportView): class InventoryItemBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_inventoryitem' queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer') - filter = filters.InventoryItemFilter + filter = filters.InventoryItemFilterSet table = tables.InventoryItemTable form = forms.InventoryItemBulkEditForm default_return_url = 'dcim:inventoryitem_list' @@ -2193,7 +2193,7 @@ class VirtualChassisListView(PermissionRequiredMixin, ObjectListView): permission_required = 'dcim.view_virtualchassis' queryset = VirtualChassis.objects.prefetch_related('master').annotate(member_count=Count('members')) table = tables.VirtualChassisTable - filter = filters.VirtualChassisFilter + filter = filters.VirtualChassisFilterSet filter_form = forms.VirtualChassisFilterForm template_name = 'dcim/virtualchassis_list.html' @@ -2436,7 +2436,7 @@ class PowerPanelListView(PermissionRequiredMixin, ObjectListView): ).annotate( powerfeed_count=Count('powerfeeds') ) - filter = filters.PowerPanelFilter + filter = filters.PowerPanelFilterSet filter_form = forms.PowerPanelFilterForm table = tables.PowerPanelTable template_name = 'dcim/powerpanel_list.html' @@ -2491,7 +2491,7 @@ class PowerPanelBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): ).annotate( rack_count=Count('powerfeeds') ) - filter = filters.PowerPanelFilter + filter = filters.PowerPanelFilterSet table = tables.PowerPanelTable default_return_url = 'dcim:powerpanel_list' @@ -2505,7 +2505,7 @@ class PowerFeedListView(PermissionRequiredMixin, ObjectListView): queryset = PowerFeed.objects.prefetch_related( 'power_panel', 'rack' ) - filter = filters.PowerFeedFilter + filter = filters.PowerFeedFilterSet filter_form = forms.PowerFeedFilterForm table = tables.PowerFeedTable template_name = 'dcim/powerfeed_list.html' @@ -2551,7 +2551,7 @@ class PowerFeedBulkImportView(PermissionRequiredMixin, BulkImportView): class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_powerfeed' queryset = PowerFeed.objects.prefetch_related('power_panel', 'rack') - filter = filters.PowerFeedFilter + filter = filters.PowerFeedFilterSet table = tables.PowerFeedTable form = forms.PowerFeedBulkEditForm default_return_url = 'dcim:powerfeed_list' @@ -2560,6 +2560,6 @@ class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): class PowerFeedBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_powerfeed' queryset = PowerFeed.objects.prefetch_related('power_panel', 'rack') - filter = filters.PowerFeedFilter + filter = filters.PowerFeedFilterSet table = tables.PowerFeedTable default_return_url = 'dcim:powerfeed_list' diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index 766bd2041..904f5bd6a 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -11,8 +11,8 @@ from circuits.filters import CircuitFilterSet, ProviderFilterSet from circuits.models import Circuit, CircuitTermination, Provider from circuits.tables import CircuitTable, ProviderTable from dcim.filters import ( - CableFilter, DeviceFilter, DeviceTypeFilter, PowerFeedFilter, RackFilter, RackGroupFilter, SiteFilter, - VirtualChassisFilter, + CableFilterSet, DeviceFilterSet, DeviceTypeFilterSet, PowerFeedFilterSet, RackFilterSet, RackGroupFilterSet, SiteFilterSet, + VirtualChassisFilterSet, ) from dcim.models import ( Cable, ConsolePort, Device, DeviceType, Interface, PowerPanel, PowerFeed, PowerPort, Rack, RackGroup, Site, VirtualChassis @@ -67,28 +67,28 @@ SEARCH_TYPES = OrderedDict(( ('site', { 'permission': 'dcim.view_site', 'queryset': Site.objects.prefetch_related('region', 'tenant'), - 'filter': SiteFilter, + 'filter': SiteFilterSet, 'table': SiteTable, 'url': 'dcim:site_list', }), ('rack', { 'permission': 'dcim.view_rack', 'queryset': Rack.objects.prefetch_related('site', 'group', 'tenant', 'role'), - 'filter': RackFilter, + 'filter': RackFilterSet, 'table': RackTable, 'url': 'dcim:rack_list', }), ('rackgroup', { 'permission': 'dcim.view_rackgroup', 'queryset': RackGroup.objects.prefetch_related('site').annotate(rack_count=Count('racks')), - 'filter': RackGroupFilter, + 'filter': RackGroupFilterSet, 'table': RackGroupTable, 'url': 'dcim:rackgroup_list', }), ('devicetype', { 'permission': 'dcim.view_devicetype', 'queryset': DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances')), - 'filter': DeviceTypeFilter, + 'filter': DeviceTypeFilterSet, 'table': DeviceTypeTable, 'url': 'dcim:devicetype_list', }), @@ -97,28 +97,28 @@ SEARCH_TYPES = OrderedDict(( 'queryset': Device.objects.prefetch_related( 'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack', 'primary_ip4', 'primary_ip6', ), - 'filter': DeviceFilter, + 'filter': DeviceFilterSet, 'table': DeviceDetailTable, 'url': 'dcim:device_list', }), ('virtualchassis', { 'permission': 'dcim.view_virtualchassis', 'queryset': VirtualChassis.objects.prefetch_related('master').annotate(member_count=Count('members')), - 'filter': VirtualChassisFilter, + 'filter': VirtualChassisFilterSet, 'table': VirtualChassisTable, 'url': 'dcim:virtualchassis_list', }), ('cable', { 'permission': 'dcim.view_cable', 'queryset': Cable.objects.all(), - 'filter': CableFilter, + 'filter': CableFilterSet, 'table': CableTable, 'url': 'dcim:cable_list', }), ('powerfeed', { 'permission': 'dcim.view_powerfeed', 'queryset': PowerFeed.objects.all(), - 'filter': PowerFeedFilter, + 'filter': PowerFeedFilterSet, 'table': PowerFeedTable, 'url': 'dcim:powerfeed_list', }),