NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-31 12:56:24 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

12596 review changes

Browse Source
This commit is contained in:
Arthur Hanson 2024-11-14 10:33:03 -08:00
parent 3398112786
commit 17f13f9a54
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/virtualization/api/serializers_/clusters.py
View File

@ -59,14 +59,14 @@ class ClusterSerializer(NetBoxModelSerializer):
) )
scope_id = serializers.IntegerField(allow_null=True, required=False, default=None) scope_id = serializers.IntegerField(allow_null=True, required=False, default=None)
scope = serializers.SerializerMethodField(read_only=True) scope = serializers.SerializerMethodField(read_only=True)
allocated_virtual_cpus = serializers.DecimalField( allocated_vcpus = serializers.DecimalField(
read_only=True, read_only=True,
max_digits=8, max_digits=8,
decimal_places=2, decimal_places=2,
) )
allocated_memory = serializers.IntegerField(read_only=True) allocated_memory = serializers.IntegerField(read_only=True)
allocated_disk_space = serializers.IntegerField(read_only=True) allocated_disk = serializers.IntegerField(read_only=True)
# Related object counts # Related object counts
device_count = RelatedObjectCountField('devices') device_count = RelatedObjectCountField('devices')
@ -77,7 +77,7 @@ class ClusterSerializer(NetBoxModelSerializer):
fields = [ fields = [
'id', 'url', 'display_url', 'display', 'name', 'type', 'group', 'status', 'tenant', 'scope_type', 'scope_id', 'scope', 'id', 'url', 'display_url', 'display', 'name', 'type', 'group', 'status', 'tenant', 'scope_type', 'scope_id', 'scope',
'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'device_count', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'device_count',
'virtualmachine_count', 'allocated_virtual_cpus', 'allocated_memory', 'allocated_disk_space' 'virtualmachine_count', 'allocated_vcpus', 'allocated_memory', 'allocated_disk'
] ]
brief_fields = ('id', 'url', 'display', 'name', 'description', 'virtualmachine_count') brief_fields = ('id', 'url', 'display', 'name', 'description', 'virtualmachine_count')

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

@ -34,10 +34,15 @@ class ClusterGroupViewSet(NetBoxModelViewSet):
class ClusterViewSet(NetBoxModelViewSet): class ClusterViewSet(NetBoxModelViewSet):
queryset = Cluster.objects.prefetch_related('virtual_machines').annotate(allocated_virtual_cpus=Sum('virtual_machines__vcpus'), allocated_memory=Sum('virtual_machines__memory'), allocated_disk_space=Sum('virtual_machines__disk')) queryset = Cluster.objects.prefetch_related('virtual_machines').annotate(
allocated_vcpus=Sum('virtual_machines__vcpus'),
allocated_memory=Sum('virtual_machines__memory'),
allocated_disk=Sum('virtual_machines__disk'),
)
serializer_class = serializers.ClusterSerializer serializer_class = serializers.ClusterSerializer
filterset_class = filtersets.ClusterFilterSet filterset_class = filtersets.ClusterFilterSet
# #
# Virtual machines # Virtual machines
# #