From adcb6bebd2d5f35de33a698b4b765645aa0a0314 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Wed, 22 Jan 2025 14:14:56 -0600 Subject: [PATCH] Remove `mac_address` from tables. --- netbox/dcim/tables/devices.py | 12 ++++-------- netbox/virtualization/tables/virtualmachines.py | 14 +++++--------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 4949bec82..d4f2f74b3 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -697,10 +697,6 @@ class DeviceInterfaceTable(InterfaceTable): linkify=True, verbose_name=_('LAG') ) - mac_address = tables.Column( - verbose_name=_('MAC Address'), - orderable=False, - ) actions = columns.ActionsColumn( extra_buttons=INTERFACE_BUTTONS ) @@ -709,10 +705,10 @@ class DeviceInterfaceTable(InterfaceTable): model = models.Interface fields = ( 'pk', 'id', 'name', 'module_bay', 'module', 'label', 'enabled', 'type', 'parent', 'bridge', 'lag', - 'mgmt_only', 'mtu', 'mode', 'mac_address', 'primary_mac_address', 'wwn', 'rf_role', 'rf_channel', - 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'description', 'mark_connected', 'cable', - 'cable_color', 'wireless_link', 'wireless_lans', 'link_peer', 'connection', 'tags', 'vdcs', 'vrf', 'l2vpn', - 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'actions', + 'mgmt_only', 'mtu', 'mode', 'primary_mac_address', 'wwn', 'rf_role', 'rf_channel', 'rf_channel_frequency', + 'rf_channel_width', 'tx_power', 'description', 'mark_connected', 'cable', 'cable_color', 'wireless_link', + 'wireless_lans', 'link_peer', 'connection', 'tags', 'vdcs', 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', + 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'actions', ) default_columns = ( 'pk', 'name', 'label', 'enabled', 'type', 'parent', 'lag', 'mtu', 'mode', 'description', 'ip_addresses', diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index 87296ce0d..335d1de7d 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -113,10 +113,6 @@ class VMInterfaceTable(BaseInterfaceTable): verbose_name=_('VRF'), linkify=True ) - mac_address = tables.Column( - verbose_name=_('MAC Address'), - orderable=False, - ) tags = columns.TagColumn( url_name='virtualization:vminterface_list' ) @@ -125,8 +121,8 @@ class VMInterfaceTable(BaseInterfaceTable): model = VMInterface fields = ( 'pk', 'id', 'name', 'virtual_machine', 'enabled', 'mtu', 'mode', 'description', 'tags', 'vrf', - 'mac_address', 'primary_mac_address', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', - 'tagged_vlans', 'qinq_svlan', 'created', 'last_updated', + 'primary_mac_address', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', + 'qinq_svlan', 'created', 'last_updated', ) default_columns = ('pk', 'name', 'virtual_machine', 'enabled', 'description') @@ -148,9 +144,9 @@ class VirtualMachineVMInterfaceTable(VMInterfaceTable): class Meta(NetBoxTable.Meta): model = VMInterface fields = ( - 'pk', 'id', 'name', 'enabled', 'parent', 'bridge', 'mac_address', 'primary_mac_address', 'mtu', 'mode', - 'description', 'tags', 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', - 'tagged_vlans', 'qinq_svlan', 'actions', + 'pk', 'id', 'name', 'enabled', 'parent', 'bridge', 'primary_mac_address', 'mtu', 'mode', 'description', + 'tags', 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', + 'qinq_svlan', 'actions', ) default_columns = ('pk', 'name', 'enabled', 'primary_mac_address', 'mtu', 'mode', 'description', 'ip_addresses') row_attrs = {