From 6791ff6192cee6b2f9a32d8aacc7fcdfa7d1c7a9 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 2 May 2017 15:01:27 -0400 Subject: [PATCH] Fixes #1125: Include MAC addresses on a device's interface list --- netbox/templates/dcim/inc/consoleport.html | 1 + netbox/templates/dcim/inc/consoleserverport.html | 1 + netbox/templates/dcim/inc/interface.html | 1 + netbox/templates/dcim/inc/poweroutlet.html | 1 + netbox/templates/dcim/inc/powerport.html | 1 + 5 files changed, 5 insertions(+) diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index 5352c949c..e5e13a08f 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -7,6 +7,7 @@ {{ cp.name }} + {% if cp.cs_port %} {{ cp.cs_port.device }} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index d317cf5a4..62563b8dc 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -7,6 +7,7 @@ {{ csp.name }} + {% if csp.connected_console %} {{ csp.connected_console.device }} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 39f2947c5..9732e2641 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -16,6 +16,7 @@
{{ iface.member_interfaces.all|join:", "|default:"No members" }} {% endif %} + {{ iface.mac_address|default:"" }} {% if iface.is_lag %} LAG interface {% elif iface.is_virtual %} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 652ac8e47..1eb609037 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -7,6 +7,7 @@ {{ po.name }} + {% if po.connected_port %} {{ po.connected_port.device }} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index 785186670..202affa22 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -7,6 +7,7 @@ {{ pp.name }} + {% if pp.power_outlet %} {{ pp.power_outlet.device }}