From 96878cfca6b6cc9aa4fd96a3979720e591bf3f66 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Tue, 19 Dec 2023 10:31:18 -0500
Subject: [PATCH] Closes #14551: Show assigned tunnel (if any) under interface
 view

---
 netbox/templates/dcim/interface.html             | 12 ++++++++----
 netbox/templates/virtualization/vminterface.html |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index f4cba49ee..6b15a766d 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -86,6 +86,14 @@
               <th scope="row">{% trans "Transmit power (dBm)" %}</th>
               <td>{{ object.tx_power|placeholder }}</td>
             </tr>
+            <tr>
+              <th scope="row">{% trans "Tunnel" %}</th>
+              <td>{{ object.tunnel_termination.tunnel|linkify|placeholder }}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "L2VPN" %}</th>
+              <td>{{ object.l2vpn_termination.l2vpn|linkify|placeholder }}</td>
+            </tr>
           </table>
         </div>
       </div>
@@ -105,10 +113,6 @@
               <th scope="row">{% trans "LAG" %}</th>
               <td>{{ object.lag|linkify|placeholder }}</td>
             </tr>
-            <tr>
-              <th scope="row">{% trans "L2VPN" %}</th>
-              <td>{{ object.l2vpn_termination.l2vpn|linkify|placeholder }}</td>
-            </tr>
           </table>
         </div>
       </div>
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index b7cfb9b98..cf22ddf89 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -66,6 +66,10 @@
                         <th scope="row">{% trans "802.1Q Mode" %}</th>
                         <td>{{ object.get_mode_display|placeholder }}</td>
                     </tr>
+                    <tr>
+                        <th scope="row">{% trans "Tunnel" %}</th>
+                        <td>{{ object.tunnel_termination.tunnel|linkify|placeholder }}</td>
+                    </tr>
                 </table>
             </div>
         </div>