NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-30 04:16:24 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Remove mac_address filter fields and add table columns for device/vm

Browse Source
This commit is contained in:
Brian Tiemann 2024-10-30 20:44:15 -04:00
parent 03bc2f3a32
commit eec59cfd61
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/dcim/forms/filtersets.py
View File

@ -1344,7 +1344,7 @@ class InterfaceFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
fieldsets = ( fieldsets = (
FieldSet('q', 'filter_id', 'tag'), FieldSet('q', 'filter_id', 'tag'),
FieldSet('name', 'label', 'kind', 'type', 'speed', 'duplex', 'enabled', 'mgmt_only', name=_('Attributes')), FieldSet('name', 'label', 'kind', 'type', 'speed', 'duplex', 'enabled', 'mgmt_only', name=_('Attributes')),
FieldSet('vrf_id', 'l2vpn_id', 'mac_address', 'wwn', name=_('Addressing')), FieldSet('vrf_id', 'l2vpn_id', 'wwn', name=_('Addressing')),
FieldSet('poe_mode', 'poe_type', name=_('PoE')), FieldSet('poe_mode', 'poe_type', name=_('PoE')),
FieldSet('rf_role', 'rf_channel', 'rf_channel_width', 'tx_power', name=_('Wireless')), FieldSet('rf_role', 'rf_channel', 'rf_channel_width', 'tx_power', name=_('Wireless')),
FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')), FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
@ -1399,10 +1399,10 @@ class InterfaceFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
choices=BOOLEAN_WITH_BLANK_CHOICES choices=BOOLEAN_WITH_BLANK_CHOICES
) )
) )
mac_address = forms.CharField( # mac_address = forms.CharField(
required=False, # required=False,
label=_('MAC address') # label=_('MAC address')
) # )
wwn = forms.CharField( wwn = forms.CharField(
required=False, required=False,
label=_('WWN') label=_('WWN')

21
netbox/dcim/tables/devices.py
View File

@ -608,14 +608,16 @@ class MACAddressTable(NetBoxTable):
verbose_name=_('Primary MAC'), verbose_name=_('Primary MAC'),
false_mark=None false_mark=None
) )
# interface = tables.Column( assigned_device = tables.Column(
# verbose_name=_('Interface'), accessor='assigned_object__device',
# linkify=True verbose_name=_('Device'),
# ) linkify=True
# vm_interface = tables.Column( )
# verbose_name=_('VM Interface'), assigned_vm = tables.Column(
# linkify=True accessor='assigned_object__virtual_machine',
# ) verbose_name=_('Virtual Machine'),
linkify=True
)
tags = columns.TagColumn( tags = columns.TagColumn(
url_name='dcim:macaddress_list' url_name='dcim:macaddress_list'
) )
@ -623,7 +625,8 @@ class MACAddressTable(NetBoxTable):
class Meta(DeviceComponentTable.Meta): class Meta(DeviceComponentTable.Meta):
model = models.MACAddress model = models.MACAddress
fields = ( fields = (
'pk', 'id', 'mac_address', 'assigned_object', 'created', 'last_updated', 'is_primary' 'pk', 'id', 'mac_address', 'assigned_object', 'created', 'last_updated', 'is_primary',
'assigned_device', 'assigned_vm',
) )
default_columns = ('pk', 'mac_address', 'assigned_object', 'is_primary') default_columns = ('pk', 'mac_address', 'assigned_object', 'is_primary')

10
netbox/virtualization/forms/filtersets.py
View File

@ -195,7 +195,7 @@ class VMInterfaceFilterForm(NetBoxModelFilterSetForm):
fieldsets = ( fieldsets = (
FieldSet('q', 'filter_id', 'tag'), FieldSet('q', 'filter_id', 'tag'),
FieldSet('cluster_id', 'virtual_machine_id', name=_('Virtual Machine')), FieldSet('cluster_id', 'virtual_machine_id', name=_('Virtual Machine')),
FieldSet('enabled', 'mac_address', 'vrf_id', 'l2vpn_id', name=_('Attributes')), FieldSet('enabled', 'vrf_id', 'l2vpn_id', name=_('Attributes')),
) )
selector_fields = ('filter_id', 'q', 'virtual_machine_id') selector_fields = ('filter_id', 'q', 'virtual_machine_id')
cluster_id = DynamicModelMultipleChoiceField( cluster_id = DynamicModelMultipleChoiceField(
@ -218,10 +218,10 @@ class VMInterfaceFilterForm(NetBoxModelFilterSetForm):
choices=BOOLEAN_WITH_BLANK_CHOICES choices=BOOLEAN_WITH_BLANK_CHOICES
) )
) )
mac_address = forms.CharField( # mac_address = forms.CharField(
required=False, # required=False,
label=_('MAC address') # label=_('MAC address')
) # )
vrf_id = DynamicModelMultipleChoiceField( vrf_id = DynamicModelMultipleChoiceField(
queryset=VRF.objects.all(), queryset=VRF.objects.all(),
required=False, required=False,