diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py index fd40a78c0..7e2453ad2 100644 --- a/netbox/virtualization/api/serializers.py +++ b/netbox/virtualization/api/serializers.py @@ -85,7 +85,6 @@ class VirtualMachineSerializer(NetBoxModelSerializer): # Counter fields interface_count = serializers.IntegerField(read_only=True) virtual_disk_count = serializers.IntegerField(read_only=True) - disk = serializers.SerializerMethodField(read_only=True) class Meta: model = VirtualMachine @@ -93,7 +92,7 @@ class VirtualMachineSerializer(NetBoxModelSerializer): 'id', 'url', 'display', 'name', 'status', 'site', 'cluster', 'device', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'description', 'comments', 'config_template', 'local_context_data', 'tags', 'custom_fields', 'created', 'last_updated', - 'interface_count', 'virtual_disk_count', + 'interface_count', 'virtual_disk_count', 'disk_space', ] validators = [] @@ -101,7 +100,7 @@ class VirtualMachineSerializer(NetBoxModelSerializer): if obj.disk: return obj.disk - return obj.virtual_disk_space + return obj.disk_space class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer): diff --git a/netbox/virtualization/models/virtualmachines.py b/netbox/virtualization/models/virtualmachines.py index dae1f9b7b..6a5e369a2 100644 --- a/netbox/virtualization/models/virtualmachines.py +++ b/netbox/virtualization/models/virtualmachines.py @@ -243,7 +243,7 @@ class VirtualMachine(ContactsMixin, RenderConfigMixin, ConfigContextModel, Prima return None @property - def virtual_disk_space(self): + def disk_space(self): return sum([disk.size for disk in self.virtualdisks.all()]) diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index 30d4bc174..70f84907d 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -93,7 +93,7 @@ class VirtualMachineTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable) verbose_name=_('Config Template'), linkify=True ) - disk = tables.Column( + disk_space = tables.Column( empty_values=(), verbose_name=_('Disk Size (GB)'), ) @@ -102,18 +102,18 @@ class VirtualMachineTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable) model = VirtualMachine fields = ( 'pk', 'id', 'name', 'status', 'site', 'cluster', 'device', 'role', 'tenant', 'tenant_group', 'platform', - 'vcpus', 'memory', 'disk', 'primary_ip4', 'primary_ip6', 'primary_ip', 'description', 'comments', + 'vcpus', 'memory', 'disk_space', 'primary_ip4', 'primary_ip6', 'primary_ip', 'description', 'comments', 'config_template', 'contacts', 'tags', 'created', 'last_updated', ) default_columns = ( - 'pk', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'vcpus', 'memory', 'disk', 'primary_ip', + 'pk', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'vcpus', 'memory', 'disk_space', 'primary_ip', ) - def render_disk(self, value, record): + def render_disk_space(self, value, record): if record.disk: return record.disk - elif record.virtual_disk_space: - return record.virtual_disk_space + elif record.disk_space: + return record.disk_space else: return '—'