Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion netbox/templates/virtualization/virtualmachine.html
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ <h5 class="card-header">{% trans "Resources" %}</h5>
</th>
<td>
{% if object.disk %}
{{ object.disk }} {% trans "GB" context "Abbreviation for gigabyte" %}
{{ object.disk|humanize_megabytes }}
{% else %}
{{ ''|placeholder }}
{% endif %}
Expand Down
23 changes: 23 additions & 0 deletions netbox/virtualization/migrations/0039_convert_disk_size.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 5.0.6 on 2024-06-06 17:46

from django.db import migrations
from django.db.models import F


def convert_disk_size(apps, schema_editor):
VirtualMachine = apps.get_model('virtualization', 'VirtualMachine')
VirtualMachine.objects.filter(disk__isnull=False).update(disk=F('disk') * 1000)


class Migration(migrations.Migration):

dependencies = [
('virtualization', '0038_virtualdisk'),
]

operations = [
migrations.RunPython(
code=convert_disk_size,
reverse_code=migrations.RunPython.noop
),
]
2 changes: 1 addition & 1 deletion netbox/virtualization/models/virtualmachines.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class VirtualMachine(ContactsMixin, ImageAttachmentsMixin, RenderConfigMixin, Co
disk = models.PositiveIntegerField(
blank=True,
null=True,
verbose_name=_('disk (GB)')
verbose_name=_('disk (MB)')
)

# Counter fields
Expand Down
7 changes: 7 additions & 0 deletions netbox/virtualization/tables/virtualmachines.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from dcim.tables.devices import BaseInterfaceTable
from netbox.tables import NetBoxTable, columns
from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
from utilities.templatetags.helpers import humanize_megabytes
from virtualization.models import VirtualDisk, VirtualMachine, VMInterface

__all__ = (
Expand Down Expand Up @@ -106,6 +107,9 @@ class VirtualMachineTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable)
verbose_name=_('Config Template'),
linkify=True
)
disk = tables.Column(
verbose_name=_('Disk'),
)

class Meta(NetBoxTable.Meta):
model = VirtualMachine
Expand All @@ -118,6 +122,9 @@ class Meta(NetBoxTable.Meta):
'pk', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'vcpus', 'memory', 'disk', 'primary_ip',
)

def render_disk(self, value):
return humanize_megabytes(value)


#
# VM components
Expand Down