NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-26 09:16:10 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

optimize queries

Browse Source
This commit is contained in:
Abhimanyu Saharan 2023-05-13 03:26:40 +05:30
parent d6fda266d4
commit ad7faa630b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/ipam/api/views.py
View File

@ -148,7 +148,7 @@ class FHRPGroupAssignmentViewSet(NetBoxModelViewSet):
class VLANGroupViewSet(NetBoxModelViewSet): class VLANGroupViewSet(NetBoxModelViewSet):
queryset = VLANGroup.objects.annotate( queryset = VLANGroup.objects.annotate(
vlan_count=count_related(VLAN, 'group'), vlan_count=count_related(VLAN, 'group'),
utilization=count_related(VLAN, 'group') / (F('max_vid') - F('min_vid') + 1.0) * 100 utilization=F('vlan_count') / (F('max_vid') - F('min_vid') + 1.0) * 100
).prefetch_related('tags') ).prefetch_related('tags')
serializer_class = serializers.VLANGroupSerializer serializer_class = serializers.VLANGroupSerializer
filterset_class = filtersets.VLANGroupFilterSet filterset_class = filtersets.VLANGroupFilterSet

6
netbox/ipam/views.py
View File

@ -878,7 +878,7 @@ class IPAddressBulkDeleteView(generic.BulkDeleteView):
class VLANGroupListView(generic.ObjectListView): class VLANGroupListView(generic.ObjectListView):
queryset = VLANGroup.objects.annotate( queryset = VLANGroup.objects.annotate(
vlan_count=count_related(VLAN, 'group'), vlan_count=count_related(VLAN, 'group'),
utilization=count_related(VLAN, 'group') / (F('max_vid') - F('min_vid') + 1.0) * 100 utilization=F('vlan_count') / (F('max_vid') - F('min_vid') + 1.0) * 100
).prefetch_related('tags') ).prefetch_related('tags')
filterset = filtersets.VLANGroupFilterSet filterset = filtersets.VLANGroupFilterSet
filterset_form = forms.VLANGroupFilterForm filterset_form = forms.VLANGroupFilterForm
@ -933,7 +933,7 @@ class VLANGroupBulkImportView(generic.BulkImportView):
class VLANGroupBulkEditView(generic.BulkEditView): class VLANGroupBulkEditView(generic.BulkEditView):
queryset = VLANGroup.objects.annotate( queryset = VLANGroup.objects.annotate(
vlan_count=count_related(VLAN, 'group'), vlan_count=count_related(VLAN, 'group'),
utilization=count_related(VLAN, 'group') / (F('max_vid') - F('min_vid') + 1.0) * 100 utilization=F('vlan_count') / (F('max_vid') - F('min_vid') + 1.0) * 100
).prefetch_related('tags') ).prefetch_related('tags')
filterset = filtersets.VLANGroupFilterSet filterset = filtersets.VLANGroupFilterSet
table = tables.VLANGroupTable table = tables.VLANGroupTable
@ -943,7 +943,7 @@ class VLANGroupBulkEditView(generic.BulkEditView):
class VLANGroupBulkDeleteView(generic.BulkDeleteView): class VLANGroupBulkDeleteView(generic.BulkDeleteView):
queryset = VLANGroup.objects.annotate( queryset = VLANGroup.objects.annotate(
vlan_count=count_related(VLAN, 'group'), vlan_count=count_related(VLAN, 'group'),
utilization=count_related(VLAN, 'group') / (F('max_vid') - F('min_vid') + 1.0) * 100 utilization=F('vlan_count') / (F('max_vid') - F('min_vid') + 1.0) * 100
).prefetch_related('tags') ).prefetch_related('tags')
filterset = filtersets.VLANGroupFilterSet filterset = filtersets.VLANGroupFilterSet
table = tables.VLANGroupTable table = tables.VLANGroupTable