NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-18 13:06:30 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge b95e0cf5dd into 7dab7d730d

Browse Source
This commit is contained in:
JCWasmx86 2025-06-19 19:35:32 +02:00 committed by GitHub
commit 90c6863788
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,7 @@ class FHRPGroupAssignmentViewSet(NetBoxModelViewSet):
class VLANGroupViewSet(NetBoxModelViewSet): class VLANGroupViewSet(NetBoxModelViewSet):
queryset = VLANGroup.objects.annotate_utilization() queryset = VLANGroup.objects.annotate_utilization().prefetch_related('scope')
serializer_class = serializers.VLANGroupSerializer serializer_class = serializers.VLANGroupSerializer
filterset_class = filtersets.VLANGroupFilterSet filterset_class = filtersets.VLANGroupFilterSet
@ -175,7 +175,7 @@ class ServiceTemplateViewSet(NetBoxModelViewSet):
class ServiceViewSet(NetBoxModelViewSet): class ServiceViewSet(NetBoxModelViewSet):
queryset = Service.objects.all() queryset = Service.objects.prefetch_related('parent')
serializer_class = serializers.ServiceSerializer serializer_class = serializers.ServiceSerializer
filterset_class = filtersets.ServiceFilterSet filterset_class = filtersets.ServiceFilterSet

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

@ -34,7 +34,7 @@ class ClusterGroupViewSet(NetBoxModelViewSet):
class ClusterViewSet(NetBoxModelViewSet): class ClusterViewSet(NetBoxModelViewSet):
queryset = Cluster.objects.prefetch_related('virtual_machines').annotate( queryset = Cluster.objects.prefetch_related('virtual_machines', 'scope').annotate(
allocated_vcpus=Sum('virtual_machines__vcpus'), allocated_vcpus=Sum('virtual_machines__vcpus'),
allocated_memory=Sum('virtual_machines__memory'), allocated_memory=Sum('virtual_machines__memory'),
allocated_disk=Sum('virtual_machines__disk'), allocated_disk=Sum('virtual_machines__disk'),