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

8356 review changes

Browse Source
This commit is contained in:
Arthur 2023-11-08 07:54:56 -08:00
parent 0b15732a31
commit 031632162a
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/virtualization/api/serializers.py
View File

@ -85,7 +85,6 @@ class VirtualMachineSerializer(NetBoxModelSerializer):
# Counter fields # Counter fields
interface_count = serializers.IntegerField(read_only=True) interface_count = serializers.IntegerField(read_only=True)
virtual_disk_count = serializers.IntegerField(read_only=True) virtual_disk_count = serializers.IntegerField(read_only=True)
disk = serializers.SerializerMethodField(read_only=True)
class Meta: class Meta:
model = VirtualMachine model = VirtualMachine
@ -93,7 +92,7 @@ class VirtualMachineSerializer(NetBoxModelSerializer):
'id', 'url', 'display', 'name', 'status', 'site', 'cluster', 'device', 'role', 'tenant', 'platform', 'id', 'url', 'display', 'name', 'status', 'site', 'cluster', 'device', 'role', 'tenant', 'platform',
'primary_ip', 'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'description', 'comments', 'primary_ip', 'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'description', 'comments',
'config_template', 'local_context_data', 'tags', 'custom_fields', 'created', 'last_updated', 'config_template', 'local_context_data', 'tags', 'custom_fields', 'created', 'last_updated',
'interface_count', 'virtual_disk_count', 'interface_count', 'virtual_disk_count', 'disk_space',
] ]
validators = [] validators = []
@ -101,7 +100,7 @@ class VirtualMachineSerializer(NetBoxModelSerializer):
if obj.disk: if obj.disk:
return obj.disk return obj.disk
return obj.virtual_disk_space return obj.disk_space
class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer): class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):

2
netbox/virtualization/models/virtualmachines.py
View File

@ -243,7 +243,7 @@ class VirtualMachine(ContactsMixin, RenderConfigMixin, ConfigContextModel, Prima
return None return None
@property @property
def virtual_disk_space(self): def disk_space(self):
return sum([disk.size for disk in self.virtualdisks.all()]) return sum([disk.size for disk in self.virtualdisks.all()])

12
netbox/virtualization/tables/virtualmachines.py
View File

@ -93,7 +93,7 @@ class VirtualMachineTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable)
verbose_name=_('Config Template'), verbose_name=_('Config Template'),
linkify=True linkify=True
) )
disk = tables.Column( disk_space = tables.Column(
empty_values=(), empty_values=(),
verbose_name=_('Disk Size (GB)'), verbose_name=_('Disk Size (GB)'),
) )
@ -102,18 +102,18 @@ class VirtualMachineTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable)
model = VirtualMachine model = VirtualMachine
fields = ( fields = (
'pk', 'id', 'name', 'status', 'site', 'cluster', 'device', 'role', 'tenant', 'tenant_group', 'platform', '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', 'config_template', 'contacts', 'tags', 'created', 'last_updated',
) )
default_columns = ( 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: if record.disk:
return record.disk return record.disk
elif record.virtual_disk_space: elif record.disk_space:
return record.virtual_disk_space return record.disk_space
else: else:
return '—' return '—'