nautobot 2.4.2__py3-none-any.whl → 2.4.3__py3-none-any.whl

nautobot/core/testing/integration.py

@@ -86,6 +86,10 @@ class ObjectsListMixin:
         """
         self.click_button('#select_all_box button[name="_edit"]')
 
+    def click_table_link(self, row=1, column=2):
+        """By default, tries to click column next to checkbox to go to the details page."""
+        self.browser.find_by_xpath(f'//*[@id="object_list_form"]//tbody/tr[{row}]/td[{column}]/a').click()
+
     @property
     def objects_list_visible_items(self):
         """
@@ -108,6 +112,22 @@ class ObjectsListMixin:
         self.click_button('#default-filter button[type="submit"]')
 
 
+class ObjectDetailsMixin:
+    def assertPanelValue(self, panel_label, field_label, expected_value, exact_match=False):
+        """
+        Find the proper panel and asserts if given value match rendered field value.
+        By default, it's not using the exact match, because on the UI we're often adding
+        additional tags, relationships or units.
+        """
+        panel_xpath = f'//*[@id="main"]//div[@class="panel-heading"][contains(normalize-space(), "{panel_label}")]/following-sibling::table'
+        value = self.browser.find_by_xpath(f'{panel_xpath}//td[text()="{field_label}"]/following-sibling::td[1]').text
+
+        if exact_match:
+            self.assertEqual(value, str(expected_value))
+        else:
+            self.assertIn(str(expected_value), value)
+
+
 class BulkOperationsMixin:
     def confirm_bulk_delete_operation(self):
         """
@@ -196,6 +216,7 @@ class SeleniumTestCase(StaticLiveServerTestCase, testing.NautobotTestCaseMixin):
 
     host = "0.0.0.0"  # noqa: S104  # hardcoded-bind-all-interfaces -- false positive
     selenium_host = SELENIUM_HOST  # Docker: `nautobot`; else `host.docker.internal`
+    logged_in = False
 
     @classmethod
     def setUpClass(cls):
@@ -219,6 +240,10 @@ class SeleniumTestCase(StaticLiveServerTestCase, testing.NautobotTestCaseMixin):
     def live_server_url(cls):  # pylint: disable=no-self-argument
         return f"http://{cls.selenium_host}:{cls.server_thread.port}"
 
+    def tearDown(self):
+        if self.logged_in:
+            self.logout()
+
     @classmethod
     def tearDownClass(cls):
         """Close down the browser after tests are ran."""
@@ -291,19 +316,27 @@ class SeleniumTestCase(StaticLiveServerTestCase, testing.NautobotTestCaseMixin):
         self.browser.is_element_not_present_by_css(".loading-results", wait_time=5)
         return search_box
 
+    def _select_select2_result(self):
+        found_results = self.browser.find_by_css(".select2-results li.select2-results__option")
+        # click the first found item if it's not `None`: special value to nullify field
+        if found_results.first.text != "None":
+            found_results.first.click()
+        else:
+            found_results[1].click()
+
     def fill_select2_field(self, field_name, value):
         """
         Helper function to fill a Select2 single selection field on add/edit forms.
         """
-        search_box = self._fill_select2_field(field_name, value)
-        search_box.first.type(Keys.ENTER)
+        self._fill_select2_field(field_name, value)
+        self._select_select2_result()
 
     def fill_filters_select2_field(self, field_name, value):
         """
         Helper function to fill a Select2 single selection field on filters modals.
         """
         self._fill_select2_field(field_name, value, search_box_class="select2-search select2-search--inline")
-        self.browser.find_by_xpath(f"//li[contains(@class, 'select2-results__option') and text()='{value}']").click()
+        self._select_select2_result()
 
     def fill_select2_multiselect_field(self, field_name, value):
         """
@@ -327,6 +360,7 @@ class SeleniumTestCase(StaticLiveServerTestCase, testing.NautobotTestCaseMixin):
         self.user.is_superuser = True
         self.user.save()
         self.login(self.user.username, self.password)
+        self.logged_in = True
 
 
 class BulkOperationsTestCases:
@@ -367,10 +401,6 @@ class BulkOperationsTestCases:
             self.login_as_superuser()
             self.go_to_model_list_page()
 
-        def tearDown(self):
-            self.logout()
-            super().tearDown()
-
         def go_to_model_list_page(self):
             self.click_navbar_entry(*self.model_menu_path)
             self.assertEqual(self.browser.url, self.live_server_url + reverse(f"{self.model_base_viewname}_list"))

nautobot/core/tests/test_commands.py

@@ -0,0 +1,31 @@
+from io import StringIO
+
+from django.core.management import call_command
+import yaml
+
+from nautobot.core.testing import TestCase
+
+
+class ManagementCommandTestCase(TestCase):
+    """Test case for core management commands."""
+
+    def setUp(self):
+        """Initialize user and client."""
+        super().setUpNautobot()
+        self.user.is_superuser = True
+        self.user.is_staff = True
+        self.user.save()
+        self.client.force_login(self.user)
+
+    def test_generate_performance_test_endpoints(self):
+        """Test the generate_performance_test_endpoints management command."""
+        out = StringIO()
+        call_command("generate_performance_test_endpoints", stdout=out)
+        endpoints_dict = yaml.safe_load(out.getvalue())["endpoints"]
+        # status_code_to_endpoints = collections.defaultdict(list)
+        for view_name, value in endpoints_dict.items():
+            for endpoint in value:
+                response = self.client.get(endpoint, follow=True)
+                self.assertHttpStatus(
+                    response, 200, f"{view_name}: {endpoint} returns status Code {response.status_code} instead of 200"
+                )

nautobot/core/tests/test_utils.py

@@ -273,10 +273,25 @@ class GetFooForModelTest(TestCase):
         """
         Test that `get_model_for_view_name` returns the appropriate Model, if the colon separated view name provided.
         """
-        with self.subTest("Test core view."):
+        with self.subTest("Test core UI view."):
             self.assertEqual(lookup.get_model_for_view_name("dcim:device_list"), dcim_models.Device)
-        with self.subTest("Test app view."):
+            self.assertEqual(lookup.get_model_for_view_name("dcim:device"), dcim_models.Device)
+        with self.subTest("Test app UI view."):
             self.assertEqual(lookup.get_model_for_view_name("plugins:example_app:examplemodel_list"), ExampleModel)
+            self.assertEqual(lookup.get_model_for_view_name("plugins:example_app:examplemodel"), ExampleModel)
+        with self.subTest("Test core API view."):
+            self.assertEqual(lookup.get_model_for_view_name("dcim-api:device-list"), dcim_models.Device)
+            self.assertEqual(lookup.get_model_for_view_name("dcim-api:device-detail"), dcim_models.Device)
+        with self.subTest("Test app API view."):
+            self.assertEqual(
+                lookup.get_model_for_view_name("plugins-api:example_app-api:examplemodel-detail"), ExampleModel
+            )
+            self.assertEqual(
+                lookup.get_model_for_view_name("plugins-api:example_app-api:examplemodel-list"), ExampleModel
+            )
+        with self.subTest("Test unconventional model views."):
+            self.assertEqual(lookup.get_model_for_view_name("extras-api:contenttype-detail"), ContentType)
+            self.assertEqual(lookup.get_model_for_view_name("users-api:group-detail"), Group)
         with self.subTest("Test unexpected view."):
             with self.assertRaises(ValueError) as err:
                 lookup.get_model_for_view_name("unknown:plugins:example_app:examplemodel_list")

nautobot/core/utils/lookup.py

@@ -250,6 +250,11 @@ def get_model_for_view_name(view_name):
     Return the model class associated with the given view_name e.g. "circuits:circuit_detail", "dcim:device_list" and etc.
     If the app_label or model_name contained by the given view_name is invalid, this will return `None`.
     """
+    if view_name == "users-api:group-detail":
+        return Group
+    if view_name == "extras-api:contenttype-detail":
+        return ContentType
+
     split_view_name = view_name.split(":")
     if len(split_view_name) == 2:
         app_label, model_name = split_view_name  # dcim, device_list
@@ -257,7 +262,13 @@ def get_model_for_view_name(view_name):
         _, app_label, model_name = split_view_name  # plugins, app_name, model_list
     else:
         raise ValueError(f"Unexpected View Name: {view_name}")
-    model_name = model_name.split("_")[0]  # device
+
+    delimiter = "_"
+    if app_label.endswith("-api"):
+        app_label = app_label.replace("-api", "")
+        delimiter = "-"
+
+    model_name = model_name.split(delimiter)[0]  # device
 
     try:
         model = apps.get_model(app_label=app_label, model_name=model_name)

nautobot/core/views/generic.py

@@ -214,8 +214,16 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
         resolved_path = resolve(request.path)
         list_url = f"{resolved_path.app_name}:{resolved_path.url_name}"
 
+        skip_user_and_global_default_saved_view = False
+        if self.filterset is not None:
+            skip_user_and_global_default_saved_view = get_filterable_params_from_filter_params(
+                request.GET.copy(),
+                self.non_filter_params,
+                self.filterset(),
+            )
+
         # If the user clicks on the clear view button, we do not check for global or user defaults
-        if not clear_view and not request.GET.get("saved_view"):
+        if not skip_user_and_global_default_saved_view and not clear_view and not request.GET.get("saved_view"):
             # Check if there is a default for this view for this specific user
             if not isinstance(user, AnonymousUser):
                 try:

nautobot/core/views/mixins.py

@@ -723,8 +723,16 @@ class ObjectListViewMixin(NautobotViewSetMixin, mixins.ListModelMixin):
             if response is not None:
                 return response
 
+        skip_user_and_global_default_saved_view = False
+        if self.filterset_class is not None:
+            skip_user_and_global_default_saved_view = get_filterable_params_from_filter_params(
+                request.GET.copy(),
+                self.non_filter_params,
+                self.filterset_class(),
+            )
+
         # If the user clicks on the clear view button, we do not check for global or user defaults
-        if not clear_view and not request.GET.get("saved_view"):
+        if not skip_user_and_global_default_saved_view and not clear_view and not request.GET.get("saved_view"):
             # Check if there is a default for this view for this specific user
             app_label, model_name = queryset.model._meta.label.split(".")
             view_name = f"{app_label}:{model_name.lower()}_list"

nautobot/dcim/api/views.py

@@ -74,6 +74,7 @@ from nautobot.dcim.models import (
 )
 from nautobot.extras.api.views import (
     ConfigContextQuerySetMixin,
+    CustomFieldModelViewSet,
     NautobotModelViewSet,
 )
 from nautobot.extras.choices import SecretsGroupAccessTypeChoices, SecretsGroupSecretTypeChoices
@@ -300,13 +301,13 @@ class DeviceTypeViewSet(NautobotModelViewSet):
 #
 
 
-class ConsolePortTemplateViewSet(NautobotModelViewSet):
+class ConsolePortTemplateViewSet(CustomFieldModelViewSet):
     queryset = ConsolePortTemplate.objects.select_related("device_type__manufacturer", "module_type__manufacturer")
     serializer_class = serializers.ConsolePortTemplateSerializer
     filterset_class = filters.ConsolePortTemplateFilterSet
 
 
-class ConsoleServerPortTemplateViewSet(NautobotModelViewSet):
+class ConsoleServerPortTemplateViewSet(CustomFieldModelViewSet):
     queryset = ConsoleServerPortTemplate.objects.select_related(
         "device_type__manufacturer", "module_type__manufacturer"
     )
@@ -314,43 +315,43 @@ class ConsoleServerPortTemplateViewSet(NautobotModelViewSet):
     filterset_class = filters.ConsoleServerPortTemplateFilterSet
 
 
-class PowerPortTemplateViewSet(NautobotModelViewSet):
+class PowerPortTemplateViewSet(CustomFieldModelViewSet):
     queryset = PowerPortTemplate.objects.select_related("device_type__manufacturer", "module_type__manufacturer")
     serializer_class = serializers.PowerPortTemplateSerializer
     filterset_class = filters.PowerPortTemplateFilterSet
 
 
-class PowerOutletTemplateViewSet(NautobotModelViewSet):
+class PowerOutletTemplateViewSet(CustomFieldModelViewSet):
     queryset = PowerOutletTemplate.objects.select_related("device_type__manufacturer", "module_type__manufacturer")
     serializer_class = serializers.PowerOutletTemplateSerializer
     filterset_class = filters.PowerOutletTemplateFilterSet
 
 
-class InterfaceTemplateViewSet(NautobotModelViewSet):
+class InterfaceTemplateViewSet(CustomFieldModelViewSet):
     queryset = InterfaceTemplate.objects.select_related("device_type__manufacturer", "module_type__manufacturer")
     serializer_class = serializers.InterfaceTemplateSerializer
     filterset_class = filters.InterfaceTemplateFilterSet
 
 
-class FrontPortTemplateViewSet(NautobotModelViewSet):
+class FrontPortTemplateViewSet(CustomFieldModelViewSet):
     queryset = FrontPortTemplate.objects.select_related("device_type__manufacturer", "module_type__manufacturer")
     serializer_class = serializers.FrontPortTemplateSerializer
     filterset_class = filters.FrontPortTemplateFilterSet
 
 
-class RearPortTemplateViewSet(NautobotModelViewSet):
+class RearPortTemplateViewSet(CustomFieldModelViewSet):
     queryset = RearPortTemplate.objects.select_related("device_type__manufacturer", "module_type__manufacturer")
     serializer_class = serializers.RearPortTemplateSerializer
     filterset_class = filters.RearPortTemplateFilterSet
 
 
-class DeviceBayTemplateViewSet(NautobotModelViewSet):
+class DeviceBayTemplateViewSet(CustomFieldModelViewSet):
     queryset = DeviceBayTemplate.objects.select_related("device_type__manufacturer")
     serializer_class = serializers.DeviceBayTemplateSerializer
     filterset_class = filters.DeviceBayTemplateFilterSet
 
 
-class ModuleBayTemplateViewSet(NautobotModelViewSet):
+class ModuleBayTemplateViewSet(CustomFieldModelViewSet):
     queryset = ModuleBayTemplate.objects.select_related("device_type__manufacturer", "module_type__manufacturer")
     serializer_class = serializers.ModuleBayTemplateSerializer
     filterset_class = filters.ModuleBayTemplateFilterSet
@@ -831,7 +832,7 @@ class VirtualDeviceContextViewSet(NautobotModelViewSet):
     filterset_class = filters.VirtualDeviceContextFilterSet
 
 
-class InterfaceVDCAssignmentViewSet(NautobotModelViewSet):
+class InterfaceVDCAssignmentViewSet(ModelViewSet):
     queryset = InterfaceVDCAssignment.objects.all()
     serializer_class = serializers.InterfaceVDCAssignmentSerializer
     filterset_class = filters.InterfaceVDCAssignmentFilterSet

nautobot/dcim/forms.py

@@ -17,6 +17,7 @@ from nautobot.core.forms import (
     AutoPositionPatternField,
     BootstrapMixin,
     BulkEditNullBooleanSelect,
+    ClearableFileInput,
     ColorSelect,
     CommentField,
     DatePicker,
@@ -850,12 +851,8 @@ class DeviceTypeForm(NautobotModelForm):
         widgets = {
             "subdevice_role": StaticSelect2(),
             # Exclude SVG images (unsupported by PIL)
-            "front_image": forms.ClearableFileInput(
-                attrs={"accept": "image/bmp,image/gif,image/jpeg,image/png,image/tiff"}
-            ),
-            "rear_image": forms.ClearableFileInput(
-                attrs={"accept": "image/bmp,image/gif,image/jpeg,image/png,image/tiff"}
-            ),
+            "front_image": ClearableFileInput(attrs={"accept": "image/bmp,image/gif,image/jpeg,image/png,image/tiff"}),
+            "rear_image": ClearableFileInput(attrs={"accept": "image/bmp,image/gif,image/jpeg,image/png,image/tiff"}),
         }
 
 

nautobot/dcim/models/devices.py

@@ -1419,11 +1419,10 @@ class Controller(PrimaryModel):
                     "controller_device": ("Cannot assign both a device and a device redundancy group to a controller."),
                 },
             )
-
         if self.location:
             if ContentType.objects.get_for_model(self) not in self.location.location_type.content_types.all():
                 raise ValidationError(
-                    {"location": f'Devices may not associate to locations of type "{self.location.location_type}".'}
+                    {"location": f'Controllers may not associate to locations of type "{self.location.location_type}".'}
                 )
 
     def get_capabilities_display(self):

nautobot/dcim/templates/dcim/cable_trace.html

@@ -13,8 +13,8 @@
                     {% for near_end, cable, far_end in traced_path %}
 
                         {# Near end #}
-                        {% if near_end.device %}
-                            {% include 'dcim/trace/device.html' with device=near_end.device %}
+                        {% if near_end.device or near_end.module %}
+                            {% include 'dcim/trace/device.html' with device=near_end.parent %}
                             {% include 'dcim/trace/termination.html' with termination=near_end %}
                         {% elif near_end.power_panel %}
                             {% include 'dcim/trace/powerpanel.html' with powerpanel=near_end.power_panel %}
@@ -30,10 +30,10 @@
                         {% endif %}
 
                         {# Far end #}
-                        {% if far_end.device %}
+                        {% if far_end.device or far_end.module %}
                             {% include 'dcim/trace/termination.html' with termination=far_end %}
                             {% if forloop.last %}
-                                {% include 'dcim/trace/device.html' with device=far_end.device %}
+                                {% include 'dcim/trace/device.html' with device=far_end.parent %}
                             {% endif %}
                         {% elif far_end.power_panel %}
                             {% include 'dcim/trace/termination.html' with termination=far_end %}

nautobot/dcim/templates/dcim/consoleport.html

@@ -8,8 +8,13 @@
                 </div>
                 <table class="table table-hover panel-body attr-table">
                     <tr>
-                        <td>Device</td>
-                        <td>{{ object.device|hyperlinked_object }}</td>
+                        {% if object.device %}
+                            <td>Device</td>
+                            <td>{{ object.device|hyperlinked_object }}</td>
+                        {% else %}
+                            <td>Module</td>
+                            <td>{{ object.module|hyperlinked_object }}</td>
+                        {% endif %}
                     </tr>
                     <tr>
                         <td>Name</td>
@@ -49,8 +54,13 @@
                         </tr>
                         {% if object.connected_endpoint %}
                             <tr>
-                                <td>Device</td>
-                                <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% if object.connected_endpoint.device %}
+                                    <td>Device</td>
+                                    <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% else %}
+                                    <td>Module</td>
+                                    <td>{{ object.connected_endpoint.module|hyperlinked_object }}</td>
+                                {% endif %}
                             </tr>
                             <tr>
                                 <td>Console Server Port</td>

nautobot/dcim/templates/dcim/consoleserverport.html

@@ -8,8 +8,13 @@
                 </div>
                 <table class="table table-hover panel-body attr-table">
                     <tr>
-                        <td>Device</td>
-                        <td>{{ object.device|hyperlinked_object }}</td>
+                        {% if object.device %}
+                            <td>Device</td>
+                            <td>{{ object.device|hyperlinked_object }}</td>
+                        {% else %}
+                            <td>Module</td>
+                            <td>{{ object.module|hyperlinked_object }}</td>
+                        {% endif %}
                     </tr>
                     <tr>
                         <td>Name</td>
@@ -49,8 +54,13 @@
                         </tr>
                         {% if object.connected_endpoint %}
                             <tr>
-                                <td>Device</td>
-                                <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% if object.connected_endpoint.device %}
+                                    <td>Device</td>
+                                    <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% else %}
+                                    <td>Module</td>
+                                    <td>{{ object.connected_endpoint.module|hyperlinked_object }}</td>
+                                {% endif %}
                             </tr>
                             <tr>
                                 <td>Console Port</td>

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

@@ -24,9 +24,9 @@
                 {% for iface in interfaces %}
                     <tr data-interface-name="{{ iface.name }}">
                         <td>{{ iface }}</td>
-                        {% if iface.connected_endpoint.device %}
-                            <td class="configured_device" data="{{ iface.connected_endpoint.device }}" data-chassis="{{ iface.connected_endpoint.device.virtual_chassis.name }}">
-                                {{ iface.connected_endpoint.device|hyperlinked_object }}
+                        {% if iface.connected_endpoint.device or iface.connected_endpoint.module %}
+                            <td class="configured_device" data="{{ iface.connected_endpoint.parent }}" data-chassis="{{ iface.connected_endpoint.parent.virtual_chassis.name }}">
+                                {{ iface.connected_endpoint.parent|hyperlinked_object }}
                             </td>
                             <td class="configured_interface" data-interface-name="{{ iface.connected_endpoint }}">
                                 <span title="{{ iface.connected_endpoint.get_type_display }}">{{ iface.connected_endpoint }}</span>

nautobot/dcim/templates/dcim/frontport.html

@@ -8,8 +8,13 @@
                 </div>
                 <table class="table table-hover panel-body attr-table">
                     <tr>
-                        <td>Device</td>
-                        <td>{{ object.device|hyperlinked_object }}</td>
+                        {% if object.device %}
+                            <td>Device</td>
+                            <td>{{ object.device|hyperlinked_object }}</td>
+                        {% else %}
+                            <td>Module</td>
+                            <td>{{ object.module|hyperlinked_object }}</td>
+                        {% endif %}
                     </tr>
                     <tr>
                         <td>Name</td>

nautobot/dcim/templates/dcim/interface.html

@@ -101,11 +101,16 @@
                                     </a>
                                 </td>
                             </tr>
-                            {% if object.connected_endpoint.device %}
+                            {% if object.connected_endpoint.device or object.connected_endpoint.module %}
                                 {% with iface=object.connected_endpoint %}
                                     <tr>
-                                        <td>Device</td>
-                                        <td>{{ iface.device|hyperlinked_object }}</td>
+                                        {% if iface.device %}
+                                            <td>Device</td>
+                                            <td>{{ iface.device|hyperlinked_object }}</td>
+                                        {% else %}
+                                            <td>Module</td>
+                                            <td>{{ iface.module|hyperlinked_object }}</td>
+                                        {% endif %}
                                     </tr>
                                     <tr>
                                         <td>Interface</td>
@@ -201,7 +206,7 @@
                         <tbody>
                             {% for member in object.member_interfaces.all %}
                                 <tr>
-                                    <td>{{ member.device|hyperlinked_object }}</td>
+                                    <td>{{ member.parent|hyperlinked_object }}</td>
                                     <td>{{ member|hyperlinked_object }}</td>
                                     <td>
                                         {{ member.get_type_display }}

nautobot/dcim/templates/dcim/powerfeed.html

@@ -39,7 +39,7 @@
                     <td>Connected Device</td>
                     <td>
                         {% if object.connected_endpoint %}
-                            {{ object.connected_endpoint.device|hyperlinked_object }}
+                            {{ object.connected_endpoint.parent|hyperlinked_object }}
                             ({{ object.connected_endpoint }})
                         {% else %}
                             <span class="text-muted">None</span>
@@ -110,8 +110,13 @@
                     </tr>
                     {% if object.connected_endpoint %}
                         <tr>
-                            <td>Device</td>
-                            <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                            {% if object.connected_endpoint.device %}
+                                <td>Device</td>
+                                <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                            {% else %}
+                                <td>Module</td>
+                                <td>{{ object.connected_endpoint.module|hyperlinked_object }}</td>
+                            {% endif %}
                         </tr>
                         <tr>
                             <td>Power Port</td>

nautobot/dcim/templates/dcim/poweroutlet.html

@@ -8,8 +8,13 @@
                 </div>
                 <table class="table table-hover panel-body attr-table">
                     <tr>
-                        <td>Device</td>
-                        <td>{{ object.device|hyperlinked_object }}</td>
+                        {% if object.device %}
+                            <td>Device</td>
+                            <td>{{ object.device|hyperlinked_object }}</td>
+                        {% else %}
+                            <td>Module</td>
+                            <td>{{ object.module|hyperlinked_object }}</td>
+                        {% endif %}
                     </tr>
                     <tr>
                         <td>Name</td>
@@ -57,8 +62,13 @@
                         </tr>
                         {% if object.connected_endpoint %}
                             <tr>
-                                <td>Device</td>
-                                <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% if object.connected_endpoint.device %}
+                                    <td>Device</td>
+                                    <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% else %}
+                                    <td>Module</td>
+                                    <td>{{ object.connected_endpoint.module|hyperlinked_object }}</td>
+                                {% endif %}
                             </tr>
                             <tr>
                                 <td>Power Port</td>

nautobot/dcim/templates/dcim/powerport.html

@@ -8,8 +8,13 @@
                 </div>
                 <table class="table table-hover panel-body attr-table">
                     <tr>
-                        <td>Device</td>
-                        <td>{{ object.device|hyperlinked_object }}</td>
+                        {% if object.device %}
+                            <td>Device</td>
+                            <td>{{ object.device|hyperlinked_object }}</td>
+                        {% else %}
+                            <td>Module</td>
+                            <td>{{ object.module|hyperlinked_object }}</td>
+                        {% endif %}
                     </tr>
                     <tr>
                         <td>Name</td>
@@ -57,8 +62,13 @@
                         </tr>
                         {% if object.connected_endpoint %}
                             <tr>
-                                <td>Device</td>
-                                <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% if object.connected_endpoint.device %}
+                                    <td>Device</td>
+                                    <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% else %}
+                                    <td>Module</td>
+                                    <td>{{ object.connected_endpoint.module|hyperlinked_object }}</td>
+                                {% endif %}
                             </tr>
                             <tr>
                                 <td>Power Outlet / Feed</td>

nautobot/dcim/templates/dcim/rearport.html

@@ -8,8 +8,13 @@
                 </div>
                 <table class="table table-hover panel-body attr-table">
                     <tr>
-                        <td>Device</td>
-                        <td>{{ object.device|hyperlinked_object }}</td>
+                        {% if object.device %}
+                            <td>Device</td>
+                            <td>{{ object.device|hyperlinked_object }}</td>
+                        {% else %}
+                            <td>Module</td>
+                            <td>{{ object.module|hyperlinked_object }}</td>
+                        {% endif %}
                     </tr>
                     <tr>
                         <td>Name</td>