From 2b0e2fa923d6a572bd9cacc64394fedf3766cfda Mon Sep 17 00:00:00 2001 From: Arthur Date: Tue, 24 Oct 2023 10:45:33 -0700 Subject: [PATCH] 8356 revert property --- netbox/virtualization/models/virtualmachines.py | 4 ---- netbox/virtualization/views.py | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/netbox/virtualization/models/virtualmachines.py b/netbox/virtualization/models/virtualmachines.py index aa913cc9e..970167bf3 100644 --- a/netbox/virtualization/models/virtualmachines.py +++ b/netbox/virtualization/models/virtualmachines.py @@ -242,10 +242,6 @@ class VirtualMachine(ContactsMixin, RenderConfigMixin, ConfigContextModel, Prima else: return None - @property - def disk_size(self): - return sum(self.virtualdisks.all().values_list('size', flat=True)) - class VMInterface(NetBoxModel, BaseInterface, TrackingModelMixin): virtual_machine = models.ForeignKey( diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 313df3ee8..486d69057 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -352,7 +352,8 @@ class VirtualMachineListView(generic.ObjectListView): @register_model_view(VirtualMachine) class VirtualMachineView(generic.ObjectView): - queryset = VirtualMachine.objects.all() + queryset = VirtualMachine.objects.all().annotate( + disk_size=Sum('virtualdisks__size')) @register_model_view(VirtualMachine, 'interfaces')