nautobot 2.1.7__py3-none-any.whl → 2.1.9__py3-none-any.whl

nautobot/core/tests/test_views.py

@@ -214,6 +214,7 @@ class FilterFormsTestCase(TestCase):
         )
         url = reverse("dcim:location_list") + query_param
         response = self.client.get(url)
+        self.assertHttpStatus(response, 200)
         response_content = response.content.decode(response.charset).replace("\n", "")
         self.assertInHTML(locations[0].name, response_content)
         self.assertInHTML(locations[1].name, response_content)
@@ -314,25 +315,31 @@ class LoginUI(TestCase):
         sso_login_search_result = self.make_request()
         self.assertIsNotNone(sso_login_search_result)
 
-    @override_settings(BANNER_TOP="Hello, Banner Top", BANNER_BOTTOM="Hello, Banner Bottom")
-    def test_routes_redirect_back_to_login_unauthenticated(self):
-        """Assert that api docs and graphql redirects to login page if user is unauthenticated."""
+    def test_graphql_redirects_back_to_login_unauthenticated(self):
+        """Assert that graphql redirects to login page if user is unauthenticated."""
         self.client.logout()
         headers = {"HTTP_ACCEPT": "text/html"}
-        urls = [reverse("api_docs"), reverse("graphql")]
+        url = reverse("graphql")
+        response = self.client.get(url, follow=True, **headers)
+        self.assertHttpStatus(response, 200)
+        self.assertRedirects(response, f"/login/?next={url}")
+        response_content = response.content.decode(response.charset).replace("\n", "")
+        for footer_text in self.footer_elements:
+            self.assertNotIn(footer_text, response_content)
+
+    def test_api_docs_403_unauthenticated(self):
+        """Assert that api docs return a 403 Forbidden if user is unauthenticated."""
+        self.client.logout()
+        urls = [
+            reverse("api_docs"),
+            reverse("api_redocs"),
+            reverse("schema"),
+            reverse("schema_json"),
+            reverse("schema_yaml"),
+        ]
         for url in urls:
-            response = self.client.get(url, follow=True, **headers)
-            self.assertHttpStatus(response, 200)
-            redirect_chain = [(f"/login/?next={url}", 302)]
-            self.assertEqual(response.redirect_chain, redirect_chain)
-            response_content = response.content.decode(response.charset).replace("\n", "")
-            # Assert Footer items(`self.footer_elements`), Banner and Banner Top is hidden
-            for footer_text in self.footer_elements:
-                self.assertNotIn(footer_text, response_content)
-            # Only API Docs implements BANNERS
-            if url == urls[0]:
-                self.assertNotIn("Hello, Banner Top", response_content)
-                self.assertNotIn("Hello, Banner Bottom", response_content)
+            response = self.client.get(url)
+            self.assertHttpStatus(response, 403)
 
 
 class MetricsViewTestCase(TestCase):

nautobot/core/utils/lookup.py

@@ -1,12 +1,14 @@
 """Utilities for looking up related classes and information."""
 
 import inspect
+import re
 
 from django.apps import apps
 from django.conf import settings
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Model
+from django.urls import get_resolver, URLPattern, URLResolver
 from django.utils.module_loading import import_string
 
 
@@ -218,3 +220,125 @@ def get_created_and_last_updated_usernames_for_model(instance):
         last_updated_by = last_updated_by_record.user_name
 
     return created_by, last_updated_by
+
+
+def get_url_patterns(urlconf=None, patterns_list=None, base_path="/"):
+    """
+    Recursively yield a list of registered URL patterns.
+
+    Args:
+        urlconf (URLConf): Python module such as `nautobot.core.urls`.
+            Default if unspecified is the value of `settings.ROOT_URLCONF`, i.e. the `nautobot.core.urls` module.
+        patterns_list (list): Used in recursion. Generally can be omitted on initial call.
+            Default if unspecified is the `url_patterns` attribute of the given `urlconf` module.
+        base_path (str): String to prepend to all URL patterns yielded.
+            Default if unspecified is the string `"/"`.
+
+    Yields:
+        (str): Each URL pattern defined in the given urlconf and its descendants
+
+    Examples:
+        >>> generator = get_url_patterns()
+        >>> next(generator)
+        '/'
+        >>> next(generator)
+        '/search/'
+        >>> next(generator)
+        '/login/'
+        >>> next(generator)
+        '/logout/'
+        >>> next(generator)
+        '/circuits/circuits/<uuid:pk>/terminations/swap/'
+
+        >>> import example_plugin.urls as example_urls
+        >>> for url_pattern in get_url_patterns(example_urls, base_path="/plugins/example-plugin/"):
+        ...     print(url_pattern)
+        ...
+        /plugins/example-plugin/
+        /plugins/example-plugin/config/
+        /plugins/example-plugin/models/<uuid:pk>/dynamic-groups/
+        /plugins/example-plugin/other-models/<uuid:pk>/dynamic-groups/
+        /plugins/example-plugin/docs/
+        /plugins/example-plugin/circuits/<uuid:pk>/example-plugin-tab/
+        /plugins/example-plugin/devices/<uuid:pk>/example-plugin-tab-1/
+        /plugins/example-plugin/devices/<uuid:pk>/example-plugin-tab-2/
+        /plugins/example-plugin/override-target/
+        /plugins/example-plugin/^models/$
+        /plugins/example-plugin/^models/add/$
+        /plugins/example-plugin/^models/import/$
+        /plugins/example-plugin/^models/edit/$
+        /plugins/example-plugin/^models/delete/$
+        /plugins/example-plugin/^models/all-names/$
+        /plugins/example-plugin/^models/(?P<pk>[^/.]+)/$
+        /plugins/example-plugin/^models/(?P<pk>[^/.]+)/delete/$
+        /plugins/example-plugin/^models/(?P<pk>[^/.]+)/edit/$
+        /plugins/example-plugin/^models/(?P<pk>[^/.]+)/changelog/$
+        /plugins/example-plugin/^models/(?P<pk>[^/.]+)/notes/$
+        /plugins/example-plugin/^other-models/$
+        /plugins/example-plugin/^other-models/add/$
+        /plugins/example-plugin/^other-models/edit/$
+        /plugins/example-plugin/^other-models/delete/$
+        /plugins/example-plugin/^other-models/(?P<pk>[^/.]+)/$
+        /plugins/example-plugin/^other-models/(?P<pk>[^/.]+)/delete/$
+        /plugins/example-plugin/^other-models/(?P<pk>[^/.]+)/edit/$
+        /plugins/example-plugin/^other-models/(?P<pk>[^/.]+)/changelog/$
+        /plugins/example-plugin/^other-models/(?P<pk>[^/.]+)/notes/$
+    """
+    if urlconf is None:
+        urlconf = settings.ROOT_URLCONF
+    if patterns_list is None:
+        patterns_list = get_resolver(urlconf).url_patterns
+
+    for item in patterns_list:
+        if isinstance(item, URLPattern):
+            yield base_path + str(item.pattern)
+        elif isinstance(item, URLResolver):
+            # Recurse!
+            yield from get_url_patterns(urlconf, item.url_patterns, base_path + str(item.pattern))
+
+
+def get_url_for_url_pattern(url_pattern):
+    """
+    Given a URL pattern, construct a URL string that would match that pattern.
+
+    Examples:
+        >>> get_url_for_url_pattern("/plugins/example-plugin/^models/(?P<pk>[^/.]+)/$")
+        '/plugins/example-plugin/models/00000000-0000-0000-0000-000000000000/'
+        >>> get_url_for_url_pattern("/circuits/circuit-terminations/<uuid:termination_a_id>/connect/<str:termination_b_type>/")
+        '/circuits/circuit-terminations/00000000-0000-0000-0000-000000000000/connect/string/'
+    """
+    url = url_pattern
+    # Fixup tokens in path-style "classic" view URLs:
+    # "/admin/users/user/<id>/password/"
+    url = re.sub(r"<id>", "00000000-0000-0000-0000-000000000000", url)
+    # "/silk/request/<uuid:request_id>/profile/<int:profile_id>/"
+    url = re.sub(r"<int:\w+>", "1", url)
+    # "/admin/admin/logentry/<path:object_id>/"
+    url = re.sub(r"<path:\w+>", "1", url)
+    # "/dcim/sites/<slug:slug>/"
+    url = re.sub(r"<slug:\w+>", "slug", url)
+    # "/apps/installed-apps/<str:app>/"
+    url = re.sub(r"<str:\w+>", "string", url)
+    # "/dcim/locations/<uuid:pk>/"
+    url = re.sub(r"<uuid:\w+>", "00000000-0000-0000-0000-000000000000", url)
+    # tokens in regexp-style router urls, including REST and NautobotUIViewSet:
+    # "/extras/^external-integrations/(?P<pk>[^/.]+)/$"
+    # "/api/virtualization/^interfaces/(?P<pk>[^/.]+)/$"
+    # "/api/virtualization/^interfaces/(?P<pk>[^/.]+)\\.(?P<format>[a-z0-9]+)/?$"
+    url = re.sub(r"[$^]", "", url)
+    url = re.sub(r"/\?", "/", url)
+    url = re.sub(r"\(\?P<app_label>[^)]+\)", "users", url)
+    url = re.sub(r"\(\?P<class_path>[^)]+\)", "foo/bar/baz", url)
+    url = re.sub(r"\(\?P<format>[^)]+\)", "json", url)
+    url = re.sub(r"\(\?P<name>[^)]+\)", "string", url)
+    url = re.sub(r"\(\?P<pk>[^)]+\)", "00000000-0000-0000-0000-000000000000", url)
+    url = re.sub(r"\(\?P<slug>[^)]+\)", "string", url)
+    url = re.sub(r"\(\?P<url>[^)]+\)", "any", url)
+    # Fallthru for generic URL parameters
+    url = re.sub(r"\(\?P<\w+>[^)]+\)\??", "unknown", url)
+    url = re.sub(r"\\", "", url)
+
+    if any(char in url for char in "<>[]()?+^$"):
+        raise RuntimeError(f"Unhandled token in URL {url} derived from {url_pattern}")
+
+    return url

nautobot/core/views/__init__.py

@@ -11,7 +11,7 @@ from django.contrib.auth.decorators import permission_required
 from django.contrib.auth.mixins import AccessMixin, LoginRequiredMixin
 from django.contrib.contenttypes.models import ContentType
 from django.http import HttpResponseForbidden, HttpResponseServerError, JsonResponse
-from django.shortcuts import get_object_or_404, redirect, render
+from django.shortcuts import get_object_or_404, render
 from django.template import loader, RequestContext, Template
 from django.template.exceptions import TemplateDoesNotExist
 from django.urls import resolve, reverse
@@ -210,7 +210,7 @@ class SearchView(AccessMixin, View):
         )
 
 
-class StaticMediaFailureView(View):
+class StaticMediaFailureView(View):  # NOT using LoginRequiredMixin here as this may happen even on the login page
     """
     Display a user-friendly error message with troubleshooting tips when a static media file fails to load.
     """
@@ -265,12 +265,8 @@ def csrf_failure(request, reason="", template_name="403_csrf_failure.html"):
     return HttpResponseForbidden(t.render(context), content_type="text/html")
 
 
-class CustomGraphQLView(GraphQLView):
+class CustomGraphQLView(LoginRequiredMixin, GraphQLView):
     def render_graphiql(self, request, **data):
-        if not request.user.is_authenticated:
-            graphql_url = reverse("graphql")
-            login_url = reverse(settings.LOGIN_URL)
-            return redirect(f"{login_url}?next={graphql_url}")
         query_name = request.GET.get("name")
         if query_name:
             data["obj"] = GraphQLQuery.objects.get(name=query_name)

nautobot/core/views/generic.py

@@ -4,6 +4,7 @@ import re
 
 from django.conf import settings
 from django.contrib import messages
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import (
     FieldDoesNotExist,
@@ -57,6 +58,14 @@ from nautobot.extras.models import ExportTemplate
 from nautobot.extras.utils import remove_prefix_from_cf_key
 
 
+class GenericView(LoginRequiredMixin, View):
+    """
+    Base class for non-object-related views.
+
+    Enforces authentication, which Django's base View does not by default.
+    """
+
+
 class ObjectView(ObjectPermissionRequiredMixin, View):
     """
     Retrieve a single object for display.

nautobot/dcim/api/urls.py

@@ -2,8 +2,7 @@ from nautobot.core.api.routers import OrderedDefaultRouter
 
 from . import views
 
-router = OrderedDefaultRouter()
-router.APIRootView = views.DCIMRootView
+router = OrderedDefaultRouter(view_name="DCIM")
 
 # Locations
 router.register("location-types", views.LocationTypeViewSet)

nautobot/dcim/api/views.py

@@ -13,7 +13,6 @@ from rest_framework.decorators import action
 from rest_framework.mixins import ListModelMixin
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
-from rest_framework.routers import APIRootView
 from rest_framework.viewsets import GenericViewSet, ViewSet
 
 from nautobot.circuits.models import Circuit
@@ -69,16 +68,6 @@ from nautobot.virtualization.models import VirtualMachine
 from . import serializers
 from .exceptions import MissingFilterException
 
-
-class DCIMRootView(APIRootView):
-    """
-    DCIM API root view
-    """
-
-    def get_view_name(self):
-        return "DCIM"
-
-
 # Mixins
 
 
@@ -762,7 +751,7 @@ class ConnectedDeviceViewSet(ViewSet):
 
         # Determine local interface from peer interface's connection
         peer_interface = get_object_or_404(
-            Interface.objects.all(),
+            Interface.objects.restrict(request.user, "view"),
             device__name=peer_device_name,
             name=peer_interface_name,
         )

nautobot/dcim/choices.py

@@ -222,6 +222,10 @@ class PowerPortTypeChoices(ChoiceSet):
     TYPE_IEC_3PNE4H = "iec-60309-3p-n-e-4h"
     TYPE_IEC_3PNE6H = "iec-60309-3p-n-e-6h"
     TYPE_IEC_3PNE9H = "iec-60309-3p-n-e-9h"
+    # IEC 60906-1
+    TYPE_IEC_60906_1 = "iec-60906-1"
+    TYPE_NBR_14136_10A = "nbr-14136-10a"
+    TYPE_NBR_14136_20A = "nbr-14136-20a"
     # NEMA non-locking
     TYPE_NEMA_115P = "nema-1-15p"
     TYPE_NEMA_515P = "nema-5-15p"
@@ -339,6 +343,14 @@ class PowerPortTypeChoices(ChoiceSet):
                 (TYPE_IEC_3PNE9H, "3P+N+E 9H"),
             ),
         ),
+        (
+            "IEC 60906-1",
+            (
+                (TYPE_IEC_60906_1, "IEC 60906-1"),
+                (TYPE_NBR_14136_10A, "2P+T 10A (NBR 14136)"),
+                (TYPE_NBR_14136_20A, "2P+T 20A (NBR 14136)"),
+            ),
+        ),
         (
             "NEMA (Non-locking)",
             (
@@ -482,6 +494,10 @@ class PowerOutletTypeChoices(ChoiceSet):
     TYPE_IEC_3PNE4H = "iec-60309-3p-n-e-4h"
     TYPE_IEC_3PNE6H = "iec-60309-3p-n-e-6h"
     TYPE_IEC_3PNE9H = "iec-60309-3p-n-e-9h"
+    # IEC 60906-1
+    TYPE_IEC_60906_1 = "iec-60906-1"
+    TYPE_NBR_14136_10A = "nbr-14136-10a"
+    TYPE_NBR_14136_20A = "nbr-14136-20a"
     # NEMA non-locking
     TYPE_NEMA_115R = "nema-1-15r"
     TYPE_NEMA_515R = "nema-5-15r"
@@ -592,6 +608,14 @@ class PowerOutletTypeChoices(ChoiceSet):
                 (TYPE_IEC_3PNE9H, "3P+N+E 9H"),
             ),
         ),
+        (
+            "IEC 60906-1",
+            (
+                (TYPE_IEC_60906_1, "IEC 60906-1"),
+                (TYPE_NBR_14136_10A, "2P+T 10A (NBR 14136)"),
+                (TYPE_NBR_14136_20A, "2P+T 20A (NBR 14136)"),
+            ),
+        ),
         (
             "NEMA (Non-locking)",
             (
@@ -750,11 +774,20 @@ class InterfaceTypeChoices(ChoiceSet):
     TYPE_100GE_CFP4 = "100gbase-x-cfp4"
     TYPE_100GE_CPAK = "100gbase-x-cpak"
     TYPE_100GE_QSFP28 = "100gbase-x-qsfp28"
+    TYPE_100GE_CXP = "100gbase-x-cxp"
+    TYPE_100GE_DSFP = "100gbase-x-dsfp"
+    TYPE_100GE_SFP_DD = "100gbase-x-sfpdd"
+    TYPE_100GE_QSFP_DD = "100gbase-x-qsfpdd"
     TYPE_200GE_CFP2 = "200gbase-x-cfp2"
     TYPE_200GE_QSFP56 = "200gbase-x-qsfp56"
+    TYPE_200GE_QSFP_DD = "200gbase-x-qsfpdd"
     TYPE_400GE_QSFP112 = "400gbase-x-qsfp112"
     TYPE_400GE_QSFP_DD = "400gbase-x-qsfpdd"
     TYPE_400GE_OSFP = "400gbase-x-osfp"
+    TYPE_400GE_CFP2 = "400gbase-x-cfp2"
+    TYPE_400GE_OSFP_RHS = "400gbase-x-osfp-rhs"
+    TYPE_400GE_CDFP = "400gbase-x-cdfp"
+    TYPE_400GE_CFP8 = "400gbase-x-cfp8"
     TYPE_800GE_QSFP_DD = "800gbase-x-qsfpdd"
     TYPE_800GE_OSFP = "800gbase-x-osfp"
 
@@ -801,7 +834,10 @@ class InterfaceTypeChoices(ChoiceSet):
     TYPE_8GFC_SFP_PLUS = "8gfc-sfpp"
     TYPE_16GFC_SFP_PLUS = "16gfc-sfpp"
     TYPE_32GFC_SFP28 = "32gfc-sfp28"
+    TYPE_32GFC_SFP_PLUS = "32gfc-sfpp"
     TYPE_64GFC_QSFP_PLUS = "64gfc-qsfpp"
+    TYPE_64GFC_SFP_DD = "64gfc-sfpdd"
+    TYPE_64GFC_SFP_PLUS = "64gfc-sfpp"
     TYPE_128GFC_QSFP28 = "128gfc-sfp28"
 
     # InfiniBand
@@ -909,13 +945,22 @@ class InterfaceTypeChoices(ChoiceSet):
                 (TYPE_100GE_CFP, "CFP (100GE)"),
                 (TYPE_100GE_CFP2, "CFP2 (100GE)"),
                 (TYPE_200GE_CFP2, "CFP2 (200GE)"),
+                (TYPE_400GE_CFP2, "CFP2 (400GE)"),
                 (TYPE_100GE_CFP4, "CFP4 (100GE)"),
                 (TYPE_100GE_CPAK, "Cisco CPAK (100GE)"),
                 (TYPE_100GE_QSFP28, "QSFP28 (100GE)"),
+                (TYPE_100GE_CXP, "CXP (100GE)"),
+                (TYPE_100GE_QSFP_DD, "QSFP-DD (100GE)"),
+                (TYPE_100GE_DSFP, "DSFP (100GE)"),
+                (TYPE_100GE_SFP_DD, "SFP-DD (100GE)"),
                 (TYPE_200GE_QSFP56, "QSFP56 (200GE)"),
+                (TYPE_200GE_QSFP_DD, "QSFP-DD (200GE)"),
                 (TYPE_400GE_QSFP112, "QSFP112 (400GE)"),
                 (TYPE_400GE_QSFP_DD, "QSFP-DD (400GE)"),
                 (TYPE_400GE_OSFP, "OSFP (400GE)"),
+                (TYPE_400GE_OSFP_RHS, "OSFP-RHS (400GE)"),
+                (TYPE_400GE_CDFP, "CDFP (400GE)"),
+                (TYPE_400GE_CFP8, "CPF8 (400GE)"),
                 (TYPE_800GE_QSFP_DD, "QSFP-DD (800GE)"),
                 (TYPE_800GE_OSFP, "OSFP (800GE)"),
             ),
@@ -977,7 +1022,10 @@ class InterfaceTypeChoices(ChoiceSet):
                 (TYPE_8GFC_SFP_PLUS, "SFP+ (8GFC)"),
                 (TYPE_16GFC_SFP_PLUS, "SFP+ (16GFC)"),
                 (TYPE_32GFC_SFP28, "SFP28 (32GFC)"),
+                (TYPE_32GFC_SFP_PLUS, "SFP+ (32GFC)"),
                 (TYPE_64GFC_QSFP_PLUS, "QSFP+ (64GFC)"),
+                (TYPE_64GFC_SFP_DD, "SFP-DD (64GFC)"),
+                (TYPE_64GFC_SFP_PLUS, "SFP+ (64GFC)"),
                 (TYPE_128GFC_QSFP28, "QSFP28 (128GFC)"),
             ),
         ),
@@ -1124,6 +1172,10 @@ class PortTypeChoices(ChoiceSet):
     TYPE_LSH_PC = "lsh-pc"
     TYPE_LSH_UPC = "lsh-upc"
     TYPE_LSH_APC = "lsh-apc"
+    TYPE_LX5 = "lx5"
+    TYPE_LX5_PC = "lx5-pc"
+    TYPE_LX5_UPC = "lx5-upc"
+    TYPE_LX5_APC = "lx5-apc"
     TYPE_SPLICE = "splice"
     TYPE_CS = "cs"
     TYPE_SN = "sn"
@@ -1170,6 +1222,10 @@ class PortTypeChoices(ChoiceSet):
                 (TYPE_LSH_PC, "LSH/PC"),
                 (TYPE_LSH_UPC, "LSH/UPC"),
                 (TYPE_LSH_APC, "LSH/APC"),
+                (TYPE_LX5, "LX.5"),
+                (TYPE_LX5_PC, "LX.5/PC"),
+                (TYPE_LX5_UPC, "LX.5/UPC"),
+                (TYPE_LX5_APC, "LX.5/APC"),
                 (TYPE_MPO, "MPO"),
                 (TYPE_MTRJ, "MTRJ"),
                 (TYPE_SC, "SC"),

nautobot/dcim/models/racks.py

@@ -1,5 +1,3 @@
-from collections import OrderedDict
-
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericRelation
 from django.contrib.contenttypes.models import ContentType
@@ -274,7 +272,7 @@ class Rack(PrimaryModel):
             contains a height attribute for the device
         """
 
-        elevation = OrderedDict()
+        elevation = {}
         for u in self.units:
             elevation[u] = {
                 "id": u,

nautobot/dcim/navigation.py

@@ -89,7 +89,7 @@ menu_items = (
                     ),
                     NavMenuItem(
                         link="dcim:rackreservation_list",
-                        name="Reservations",
+                        name="Rack Reservations",
                         weight=400,
                         permissions=[
                             "dcim.view_rackreservation",

nautobot/dcim/templates/dcim/device/lldp_neighbors.html

@@ -15,6 +15,7 @@
                     <th>Interface</th>
                     <th>Configured Device</th>
                     <th>Configured Interface</th>
+                    <th>Configured MAC Address</th>
                     <th>LLDP Device</th>
                     <th>LLDP Interface</th>
                 </tr>
@@ -27,18 +28,21 @@
                             <td class="configured_device" data="{{ iface.connected_endpoint.device }}" data-chassis="{{ iface.connected_endpoint.device.virtual_chassis.name }}">
                                 {{ iface.connected_endpoint.device|hyperlinked_object }}
                             </td>
-                            <td class="configured_interface" data="{{ iface.connected_endpoint }}">
+                            <td class="configured_interface" data-interface-name="{{ iface.connected_endpoint }}">
                                 <span title="{{ iface.connected_endpoint.get_type_display }}">{{ iface.connected_endpoint }}</span>
                             </td>
+                            <td class="configured_mac" data-mac-address="{{ iface.connected_endpoint.mac_address }}">
+                                <span>{{ iface.connected_endpoint.mac_address }}</span>
+                            </td>
                         {% elif iface.connected_endpoint.circuit %}
                             {% with circuit=iface.connected_endpoint.circuit %}
-                                <td colspan="2">
+                                <td colspan="3">
                                     <i class="mdi mdi-lightning-bolt" title="Circuit"></i>
                                     <a href="{{ circuit.get_absolute_url }}">{{ circuit.provider }} {{ circuit }}</a>
                                 </td>
                             {% endwith %}
                         {% else %}
-                            <td colspan="2">None</td>
+                            <td colspan="3">None</td>
                         {% endif %}
                         <td class="device"></td>
                         <td class="interface"></td>
@@ -52,51 +56,71 @@
 {% block javascript %}
 {{ block.super }}
 <script type="text/javascript">
-$(document).ready(function() {
-    $.ajax({
-        url: "{% url 'dcim-api:device-napalm' pk=object.pk %}?method=get_lldp_neighbors_detail",
-        dataType: 'json',
-        success: function(json) {
-            $.each(json['get_lldp_neighbors_detail'], function(iface, neighbors) {
-                var neighbor = neighbors[0];
-                var row = $('*[data-interface-name="' + iface.split(".")[0].replace(/([\/:])/g, "\\$1") + '"]');
+var ready = (callback) => {
+    if (document.readyState != "loading") {
+        callback();
+    } else {
+        document.addEventListener("DOMContentLoaded", callback);
+    }
+};
+
+ready(() => {
+    fetch("{% url 'dcim-api:device-napalm' pk=object.pk %}?method=get_lldp_neighbors_detail")
+    .then((response) => {
+        if (!response.ok) {
+            throw Error(response.statusText);
+        }
+        return response.json();
+    })
+    .then((data) => {
+        const interfaces = data["get_lldp_neighbors_detail"];
+        for (var iface of Object.keys(interfaces)) {
+            const neighbor = interfaces[iface][0];
+            const row = document.querySelector('*[data-interface-name="'+ iface.split(".")[0].replace(/([\/:])/g, "\\$1") + '"]');
+            // var row = $('*[data-interface-name="' + iface.split(".")[0].replace(/([\/:])/g, "\\$1") + '"]');
 
-                // Glean configured hostnames/interfaces from the DOM
-                var configured_device = row.children('td.configured_device').attr('data');
-                var configured_chassis = row.children('td.configured_device').attr('data-chassis');
-                var configured_interface = row.children('td.configured_interface').attr('data');
-                var configured_interface_short = null;
-                if (configured_interface) {
-                    // Match long-form IOS names against short ones (e.g. Gi0/1 == GigabitEthernet0/1).
-                    configured_interface_short = configured_interface.replace(/^([A-Z][a-z])[^0-9]*([0-9\/]+)$/, "$1$2");
-                }
+            // Glean configured hostnames/interfaces from the DOM
+            const configured_device = row.querySelector('td.configured_device').getAttribute('data');
+            const configured_chassis = row.querySelector('td.configured_device').getAttribute('data-chassis');
+            const configured_interface = row.querySelector('td.configured_interface').getAttribute('data-interface-name').toLowerCase();
+            const configured_mac_address = row.querySelector('td.configured_mac').getAttribute('data-mac-address').toLowerCase();
+            let configured_interface_short = null;
+            if (configured_interface) {
+                // Match long-form IOS names against short ones (e.g. Gi0/1 == GigabitEthernet0/1).
+                configured_interface_short = configured_interface.replace(/^([A-Z][a-z])[^0-9]*([0-9\/]+)$/, "$1$2");
+            }
 
-                // Clean up hostnames/interfaces learned via LLDP
-                var neighbor_host = neighbor['remote_system_name'] || ""; // sanitize hostname if it's null to avoid breaking the split func
-                var neighbor_port = neighbor['remote_port'] || ""; // sanitize port if it's null to avoid breaking the split func
-                var lldp_device = neighbor_host.split(".")[0];  // Strip off any trailing domain name
-                var lldp_interface = neighbor_port.split(".")[0];   // Strip off any trailing subinterface ID
+            // Clean up hostnames/interfaces learned via LLDP
+            const neighbor_host = neighbor['remote_system_name'] || ""; // sanitize hostname if it's null to avoid breaking the split func
+            const neighbor_port = neighbor['remote_port'] || ""; // sanitize port if it's null to avoid breaking the split func
+            const lldp_device = neighbor_host.split(".")[0];  // Strip off any trailing domain name
+            const lldp_interface = neighbor_port.split(".")[0].toLowerCase();   // Strip off any trailing subinterface ID
 
-                // Add LLDP neighbors to table
-                row.children('td.device').html(lldp_device);
-                row.children('td.interface').html(lldp_interface);
+            // Add LLDP neighbors to table
+            row.querySelector('td.device').textContent = lldp_device;
+            row.querySelector('td.interface').textContent = lldp_interface;
 
-                // Apply colors to rows
-                if (!configured_device && lldp_device) {
-                    row.addClass('info');
-                } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface == lldp_interface) {
-                    row.addClass('success');
-                } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface_short == lldp_interface) {
-                    row.addClass('success');
-                } else {
-                    row.addClass('danger');
-                }
-            });
-        },
-        error: function(xhr) {
-            alert(xhr.responseText);
+            // Apply colors to rows
+            if (!configured_device && lldp_device) {
+                row.classList.add('info');
+            } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface == lldp_interface) {
+                row.classList.add('success');
+            } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface_short == lldp_interface) {
+                row.classList.add('success');
+            } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_mac_address == lldp_interface) {
+                row.classList.add('success');
+            } else {
+                row.classList.add('danger');
+            }
+        }
+    })
+    .catch((error) => {
+        if (error.responseText) {
+            alert(error.responseText);
+        } else {
+            throw error;
         }
     });
 });
 </script>
-{% endblock %}
+{% endblock %}

nautobot/dcim/tests/test_api.py

@@ -2092,7 +2092,10 @@ class ConnectedDeviceTest(APITestCase):
     def test_get_connected_device(self):
         url = reverse("dcim-api:connected-device-list")
         response = self.client.get(url + "?peer_device=TestDevice2&peer_interface=eth0", **self.header)
+        self.assertHttpStatus(response, status.HTTP_404_NOT_FOUND)
 
+        self.add_permissions("dcim.view_interface")
+        response = self.client.get(url + "?peer_device=TestDevice2&peer_interface=eth0", **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.data["name"], self.device1.name)