Compare commits

...

6 Commits

Author SHA1 Message Date
Brian Tiemann
087a2adb3c Also include vminterface.html 2026-01-22 22:16:12 -05:00
Brian Tiemann
a145dbc44a Ensure "-" null placeholder still shows up on detail page 2026-01-22 22:13:12 -05:00
Brian Tiemann
9b1f033c73 Use mac_address_display in interface detail page 2026-01-22 22:08:30 -05:00
Brian Tiemann
60e37e868b Fix docstring 2026-01-22 22:02:40 -05:00
Brian Tiemann
c1287de970 Fix docstring 2026-01-22 22:00:42 -05:00
Brian Tiemann
3891b2a25f Richer display of MAC addresses in InterfaceTable when multiple MACs are present 2026-01-22 21:56:33 -05:00
4 changed files with 30 additions and 6 deletions

View File

@@ -732,6 +732,25 @@ class BaseInterface(models.Model):
if self.primary_mac_address:
return self.primary_mac_address.mac_address
@property
def mac_address_display(self):
"""
Rich representation of MAC addresses for use in table columns (e.g. InterfaceTable).
Handles various configurations of MAC addresses for an interface:
11:22:33:44:55:66 <-- Single MAC address on interface, assigned as primary
11:22:33:44:55:66 (2) <-- Multiple MAC addresses on interface, one assigned as primary
2 available <-- 1 or more MAC addresses on interface, none assigned as primary
- <-- No MAC addresses on interface
"""
available_mac_count = self.mac_addresses.count()
if self.primary_mac_address:
if available_mac_count > 1:
return f"{self.primary_mac_address} ({available_mac_count})"
return self.primary_mac_address
if available_mac_count:
return f"{available_mac_count} available"
return None
class Interface(
InterfaceValidationMixin,

View File

@@ -616,6 +616,7 @@ class BaseInterfaceTable(NetBoxTable):
)
primary_mac_address = tables.Column(
verbose_name=_('MAC Address'),
accessor=Accessor('mac_address_display'),
linkify=True
)

View File

@@ -143,9 +143,11 @@
<tr>
<th scope="row">{% trans "MAC Address" %}</th>
<td>
{% if object.mac_address_display %}
<span class="font-monospace">{{ object.mac_address_display|linkify }}</span>
{% if object.primary_mac_address %}
<span class="font-monospace">{{ object.primary_mac_address|linkify }}</span>
<span class="badge text-bg-primary">{% trans "Primary" %}</span>
{% endif %}
{% else %}
{{ ''|placeholder }}
{% endif %}

View File

@@ -78,9 +78,11 @@
<tr>
<th scope="row">{% trans "MAC Address" %}</th>
<td>
{% if object.mac_address %}
<span class="font-monospace">{{ object.mac_address }}</span>
{% if object.mac_address_display %}
<span class="font-monospace">{{ object.mac_address_display|linkify }}</span>
{% if object.primary_mac_address %}
<span class="badge text-bg-primary">{% trans "Primary" %}</span>
{% endif %}
{% else %}
{{ ''|placeholder }}
{% endif %}