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

8356 review changes

Browse Source
This commit is contained in:
Arthur 2023-10-24 07:46:15 -07:00
parent 013a3ed71e
commit 4d4acff1c4
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/virtualization/api/nested_serializers.py
View File

@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema_serializer
from rest_framework import serializers from rest_framework import serializers
from netbox.api.serializers import WritableNestedSerializer from netbox.api.serializers import WritableNestedSerializer
from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualDisk, VirtualMachine, VMInterface from virtualization.models import *
__all__ = [ __all__ = [
'NestedClusterGroupSerializer', 'NestedClusterGroupSerializer',

2
netbox/virtualization/filtersets.py
View File

@ -10,7 +10,7 @@ from netbox.filtersets import OrganizationalModelFilterSet, NetBoxModelFilterSet
from tenancy.filtersets import TenancyFilterSet, ContactModelFilterSet from tenancy.filtersets import TenancyFilterSet, ContactModelFilterSet
from utilities.filters import MultiValueCharFilter, MultiValueMACAddressFilter, TreeNodeMultipleChoiceFilter from utilities.filters import MultiValueCharFilter, MultiValueMACAddressFilter, TreeNodeMultipleChoiceFilter
from .choices import * from .choices import *
from .models import Cluster, ClusterGroup, ClusterType, VirtualDisk, VirtualMachine, VMInterface from .models import *
__all__ = ( __all__ = (
'ClusterFilterSet', 'ClusterFilterSet',

2
netbox/virtualization/migrations/0037_virtualmachine_virtual_disk_count_virtualdisk_and_more.py
View File

@ -55,7 +55,7 @@ class Migration(migrations.Migration):
options={ options={
'verbose_name': 'virtual disk', 'verbose_name': 'virtual disk',
'verbose_name_plural': 'virtual disks', 'verbose_name_plural': 'virtual disks',
'ordering': ('_name', 'pk'), 'ordering': ('virtual_machine', '_name'),
}, },
bases=(models.Model, utilities.tracking.TrackingModelMixin), bases=(models.Model, utilities.tracking.TrackingModelMixin),
), ),

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

@ -400,7 +400,7 @@ class VirtualDisk(NetBoxModel, TrackingModelMixin):
) )
class Meta: class Meta:
ordering = ('_name', 'pk') # Name may be non-unique ordering = ('virtual_machine', '_name')
constraints = ( constraints = (
models.UniqueConstraint( models.UniqueConstraint(
Lower('name'), 'virtual_machine', Lower('name'), 'virtual_machine',

3
netbox/virtualization/views.py
View File

@ -342,7 +342,8 @@ class ClusterContactsView(ObjectContactsView):
class VirtualMachineListView(generic.ObjectListView): class VirtualMachineListView(generic.ObjectListView):
queryset = VirtualMachine.objects.annotate( queryset = VirtualMachine.objects.annotate(
disk_size=Sum('virtualdisks__size')).prefetch_related('primary_ip4', 'primary_ip6') disk_size=Sum('virtualdisks__size')
).prefetch_related('primary_ip4', 'primary_ip6')
filterset = filtersets.VirtualMachineFilterSet filterset = filtersets.VirtualMachineFilterSet
filterset_form = forms.VirtualMachineFilterForm filterset_form = forms.VirtualMachineFilterForm
table = tables.VirtualMachineTable table = tables.VirtualMachineTable