Use FieldSet instances for all forms

netbox/virtualization/forms/bulk_edit.py

@@ -10,6 +10,7 @@ from netbox.forms import NetBoxModelBulkEditForm
 from tenancy.models import Tenant
 from utilities.forms import BulkRenameForm, add_blank_choice
 from utilities.forms.fields import CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField
+from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import BulkEditNullBooleanSelect
 from virtualization.choices import *
 from virtualization.models import *
@@ -35,7 +36,7 @@ class ClusterTypeBulkEditForm(NetBoxModelBulkEditForm):
 
     model = ClusterType
     fieldsets = (
-        (None, ('description',)),
+        FieldSet('description'),
     )
     nullable_fields = ('description',)
 
@@ -49,7 +50,7 @@ class ClusterGroupBulkEditForm(NetBoxModelBulkEditForm):
 
     model = ClusterGroup
     fieldsets = (
-        (None, ('description',)),
+        FieldSet('description'),
     )
     nullable_fields = ('description',)
 
@@ -104,8 +105,8 @@ class ClusterBulkEditForm(NetBoxModelBulkEditForm):
 
     model = Cluster
     fieldsets = (
-        (None, ('type', 'group', 'status', 'tenant', 'description')),
-        (_('Site'), ('region', 'site_group', 'site')),
+        FieldSet('type', 'group', 'status', 'tenant', 'description'),
+        FieldSet('region', 'site_group', 'site', name=_('Site')),
     )
     nullable_fields = (
         'group', 'site', 'tenant', 'description', 'comments',
@@ -185,9 +186,9 @@ class VirtualMachineBulkEditForm(NetBoxModelBulkEditForm):
 
     model = VirtualMachine
     fieldsets = (
-        (None, ('site', 'cluster', 'device', 'status', 'role', 'tenant', 'platform', 'description')),
-        (_('Resources'), ('vcpus', 'memory', 'disk')),
-        ('Configuration', ('config_template',)),
+        FieldSet('site', 'cluster', 'device', 'status', 'role', 'tenant', 'platform', 'description'),
+        FieldSet('vcpus', 'memory', 'disk', name=_('Resources')),
+        FieldSet('config_template', name=_('Configuration')),
     )
     nullable_fields = (
         'site', 'cluster', 'device', 'role', 'tenant', 'platform', 'vcpus', 'memory', 'disk', 'description', 'comments',
@@ -262,9 +263,9 @@ class VMInterfaceBulkEditForm(NetBoxModelBulkEditForm):
 
     model = VMInterface
     fieldsets = (
-        (None, ('mtu', 'enabled', 'vrf', 'description')),
-        (_('Related Interfaces'), ('parent', 'bridge')),
-        (_('802.1Q Switching'), ('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans')),
+        FieldSet('mtu', 'enabled', 'vrf', 'description'),
+        FieldSet('parent', 'bridge', name=_('Related Interfaces')),
+        FieldSet('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans', name=_('802.1Q Switching')),
     )
     nullable_fields = (
         'parent', 'bridge', 'mtu', 'vrf', 'description',
@@ -340,7 +341,7 @@ class VirtualDiskBulkEditForm(NetBoxModelBulkEditForm):
 
     model = VirtualDisk
     fieldsets = (
-        (None, ('size', 'description')),
+        FieldSet('size', 'description'),
     )
     nullable_fields = ('description',)
 

netbox/virtualization/forms/filtersets.py

@@ -9,6 +9,7 @@ from netbox.forms import NetBoxModelFilterSetForm
 from tenancy.forms import ContactModelFilterForm, TenancyFilterForm
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES
 from utilities.forms.fields import DynamicModelMultipleChoiceField, TagFilterField
+from utilities.forms.rendering import FieldSet
 from virtualization.choices import *
 from virtualization.models import *
 from vpn.models import L2VPN
@@ -32,19 +33,19 @@ class ClusterGroupFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
     model = ClusterGroup
     tag = TagFilterField(model)
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag')),
-        (_('Contacts'), ('contact', 'contact_role', 'contact_group')),
+        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
     )
 
 
 class ClusterFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilterSetForm):
     model = Cluster
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag')),
-        (_('Attributes'), ('group_id', 'type_id', 'status')),
-        (_('Location'), ('region_id', 'site_group_id', 'site_id')),
-        (_('Tenant'), ('tenant_group_id', 'tenant_id')),
-        (_('Contacts'), ('contact', 'contact_role', 'contact_group')),
+        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('group_id', 'type_id', 'status', name=_('Attributes')),
+        FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')),
+        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
+        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
     )
     selector_fields = ('filter_id', 'q', 'group_id')
     type_id = DynamicModelMultipleChoiceField(
@@ -94,12 +95,15 @@ class VirtualMachineFilterForm(
 ):
     model = VirtualMachine
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag')),
-        (_('Cluster'), ('cluster_group_id', 'cluster_type_id', 'cluster_id', 'device_id')),
-        (_('Location'), ('region_id', 'site_group_id', 'site_id')),
-        (_('Attributes'), ('status', 'role_id', 'platform_id', 'mac_address', 'has_primary_ip', 'config_template_id', 'local_context_data')),
-        (_('Tenant'), ('tenant_group_id', 'tenant_id')),
-        (_('Contacts'), ('contact', 'contact_role', 'contact_group')),
+        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('cluster_group_id', 'cluster_type_id', 'cluster_id', 'device_id', name=_('Cluster')),
+        FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')),
+        FieldSet(
+            'status', 'role_id', 'platform_id', 'mac_address', 'has_primary_ip', 'config_template_id',
+            'local_context_data', name=_('Attributes')
+        ),
+        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
+        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
     )
     cluster_group_id = DynamicModelMultipleChoiceField(
         queryset=ClusterGroup.objects.all(),
@@ -185,9 +189,9 @@ class VirtualMachineFilterForm(
 class VMInterfaceFilterForm(NetBoxModelFilterSetForm):
     model = VMInterface
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag')),
-        (_('Virtual Machine'), ('cluster_id', 'virtual_machine_id')),
-        (_('Attributes'), ('enabled', 'mac_address', 'vrf_id', 'l2vpn_id')),
+        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('cluster_id', 'virtual_machine_id', name=_('Virtual Machine')),
+        FieldSet('enabled', 'mac_address', 'vrf_id', 'l2vpn_id', name=_('Attributes')),
     )
     selector_fields = ('filter_id', 'q', 'virtual_machine_id')
     cluster_id = DynamicModelMultipleChoiceField(
@@ -230,9 +234,9 @@ class VMInterfaceFilterForm(NetBoxModelFilterSetForm):
 class VirtualDiskFilterForm(NetBoxModelFilterSetForm):
     model = VirtualDisk
     fieldsets = (
-        (None, ('q', 'filter_id', 'tag')),
-        (_('Virtual Machine'), ('virtual_machine_id',)),
-        (_('Attributes'), ('size',)),
+        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('virtual_machine_id', name=_('Virtual Machine')),
+        FieldSet('size', name=_('Attributes')),
     )
     virtual_machine_id = DynamicModelMultipleChoiceField(
         queryset=VirtualMachine.objects.all(),

netbox/virtualization/forms/model_forms.py

@@ -13,6 +13,7 @@ from utilities.forms import ConfirmationForm
 from utilities.forms.fields import (
     CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField, SlugField,
 )
+from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import HTMXSelect
 from virtualization.models import *
 
@@ -32,9 +33,7 @@ class ClusterTypeForm(NetBoxModelForm):
     slug = SlugField()
 
     fieldsets = (
-        (_('Cluster Type'), (
-            'name', 'slug', 'description', 'tags',
-        )),
+        FieldSet('name', 'slug', 'description', 'tags', name=_('Cluster Type')),
     )
 
     class Meta:
@@ -48,9 +47,7 @@ class ClusterGroupForm(NetBoxModelForm):
     slug = SlugField()
 
     fieldsets = (
-        (_('Cluster Group'), (
-            'name', 'slug', 'description', 'tags',
-        )),
+        FieldSet('name', 'slug', 'description', 'tags', name=_('Cluster Group')),
     )
 
     class Meta:
@@ -79,8 +76,8 @@ class ClusterForm(TenancyForm, NetBoxModelForm):
     comments = CommentField()
 
     fieldsets = (
-        (_('Cluster'), ('name', 'type', 'group', 'site', 'status', 'description', 'tags')),
-        (_('Tenancy'), ('tenant_group', 'tenant')),
+        FieldSet('name', 'type', 'group', 'site', 'status', 'description', 'tags', name=_('Cluster')),
+        FieldSet('tenant_group', 'tenant', name=_('Tenancy')),
     )
 
     class Meta:
@@ -220,12 +217,12 @@ class VirtualMachineForm(TenancyForm, NetBoxModelForm):
     comments = CommentField()
 
     fieldsets = (
-        (_('Virtual Machine'), ('name', 'role', 'status', 'description', 'tags')),
-        (_('Site/Cluster'), ('site', 'cluster', 'device')),
-        (_('Tenancy'), ('tenant_group', 'tenant')),
-        (_('Management'), ('platform', 'primary_ip4', 'primary_ip6', 'config_template')),
-        (_('Resources'), ('vcpus', 'memory', 'disk')),
-        (_('Config Context'), ('local_context_data',)),
+        FieldSet('name', 'role', 'status', 'description', 'tags', name=_('Virtual Machine')),
+        FieldSet('site', 'cluster', 'device', name=_('Site/Cluster')),
+        FieldSet('tenant_group', 'tenant', name=_('Tenancy')),
+        FieldSet('platform', 'primary_ip4', 'primary_ip6', 'config_template', name=_('Management')),
+        FieldSet('vcpus', 'memory', 'disk', name=_('Resources')),
+        FieldSet('local_context_data', name=_('Config Context')),
     )
 
     class Meta:
@@ -348,11 +345,11 @@ class VMInterfaceForm(InterfaceCommonForm, VMComponentForm):
     )
 
     fieldsets = (
-        (_('Interface'), ('virtual_machine', 'name', 'description', 'tags')),
-        (_('Addressing'), ('vrf', 'mac_address')),
-        (_('Operation'), ('mtu', 'enabled')),
-        (_('Related Interfaces'), ('parent', 'bridge')),
-        (_('802.1Q Switching'), ('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans')),
+        FieldSet('virtual_machine', 'name', 'description', 'tags', name=_('Interface')),
+        FieldSet('vrf', 'mac_address', name=_('Addressing')),
+        FieldSet('mtu', 'enabled', name=_('Operation')),
+        FieldSet('parent', 'bridge', name=_('Related Interfaces')),
+        FieldSet('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans', name=_('802.1Q Switching')),
     )
 
     class Meta:
@@ -372,7 +369,7 @@ class VMInterfaceForm(InterfaceCommonForm, VMComponentForm):
 class VirtualDiskForm(VMComponentForm):
 
     fieldsets = (
-        (_('Disk'), ('virtual_machine', 'name', 'size', 'description', 'tags')),
+        FieldSet('virtual_machine', 'name', 'size', 'description', 'tags', name=_('Disk')),
     )
 
     class Meta: