NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-24 04:22:41 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

17686 config option for disk divider (#18011)

Browse Source
This commit is contained in:
Mika Busch
2025-03-07 19:47:27 +01:00
committed by GitHub
parent 6d69c76b83
commit 29c25e39fc
9 changed files with 59 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/virtualization/migrations/0040_convert_disk_size.py
View File

@@ -1,13 +1,14 @@
from django.db import migrations
from django.db.models import F, Sum
from netbox.settings import DISK_BASE_UNIT
def convert_disk_size(apps, schema_editor):
VirtualMachine = apps.get_model('virtualization', 'VirtualMachine')
VirtualMachine.objects.filter(disk__isnull=False).update(disk=F('disk') * 1000)
VirtualMachine.objects.filter(disk__isnull=False).update(disk=F('disk') * DISK_BASE_UNIT)
VirtualDisk = apps.get_model('virtualization', 'VirtualDisk')
VirtualDisk.objects.filter(size__isnull=False).update(size=F('size') * 1000)
VirtualDisk.objects.filter(size__isnull=False).update(size=F('size') * DISK_BASE_UNIT)
# Recalculate disk size on all VMs with virtual disks
id_list = VirtualDisk.objects.values_list('virtual_machine_id').distinct()

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

@@ -4,7 +4,7 @@ from django.utils.translation import gettext_lazy as _
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 utilities.templatetags.helpers import humanize_disk_megabytes
from virtualization.models import VirtualDisk, VirtualMachine, VMInterface
from .template_code import *
@@ -93,7 +93,7 @@ class VirtualMachineTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable)
)
def render_disk(self, value):
return humanize_megabytes(value)
return humanize_disk_megabytes(value)
#
@@ -183,7 +183,7 @@ class VirtualDiskTable(NetBoxTable):
}
def render_size(self, value):
return humanize_megabytes(value)
return humanize_disk_megabytes(value)
class VirtualMachineVirtualDiskTable(VirtualDiskTable):