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

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/serializers.py

@@ -1,6 +1,7 @@
 import contextlib
 
 from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import ValidationError
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator, UniqueValidator
@@ -560,11 +561,46 @@ class DeviceSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
             )
             validator(attrs, self)
 
+        # Validate parent bay
+        if parent_bay := attrs.get("parent_bay", None):
+            if parent_bay.installed_device and parent_bay.installed_device != self.instance:
+                raise ValidationError(
+                    {
+                        "installed_device": f"Cannot install device; parent bay is already taken ({parent_bay.installed_device})"
+                    }
+                )
+
+            if self.instance:
+                parent_bay.installed_device = self.instance
+                parent_bay.full_clean()
+
         # Enforce model validation
         super().validate(attrs)
 
         return attrs
 
+    def create(self, validated_data):
+        instance = super().create(validated_data)
+        self.update_parent_bay(validated_data, instance)
+        return instance
+
+    def update(self, instance, validated_data):
+        instance = super().update(instance, validated_data)
+        self.update_parent_bay(validated_data, instance)
+        return instance
+
+    def update_parent_bay(self, validated_data, instance):
+        update_parent_bay = "parent_bay" in validated_data.keys()
+        parent_bay = validated_data.get("parent_bay")
+        if update_parent_bay:
+            if parent_bay:
+                parent_bay.installed_device = instance
+                parent_bay.save()
+            elif hasattr(instance, "parent_bay"):
+                parent_bay = instance.parent_bay
+                parent_bay.installed_device = None
+                parent_bay.validated_save()
+
 
 class DeviceNAPALMSerializer(serializers.Serializer):
     method = serializers.DictField()

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
@@ -182,7 +183,7 @@ class RackGroupViewSet(NautobotModelViewSet):
 
 
 class RackViewSet(NautobotModelViewSet):
-    queryset = Rack.objects.select_related("rack_group__location").annotate(
+    queryset = Rack.objects.select_related("role", "status", "rack_group__location").annotate(
         device_count=count_related(Device, "rack"),
         power_feed_count=count_related(PowerFeed, "rack"),
     )
@@ -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/elevations.py

@@ -96,17 +96,30 @@ class RackElevationSVG:
         device_fullname = str(device) + device_bay_details
         device_shortname = settings.UI_RACK_VIEW_TRUNCATE_FUNCTION(str(device)) + device_bay_details
 
-        color = device.role.color
-        reverse_url = reverse("dcim:device", kwargs={"pk": device.pk})
+        role_color = device.role.color
+        status_color = device.status.color
+        device_reverse_url = reverse("dcim:device", kwargs={"pk": device.pk})
+        status_reverse_url = reverse("extras:status", kwargs={"pk": device.status.pk})
         link = drawing.add(
             drawing.a(
-                href=f"{self.base_url}{reverse_url}",
+                href=f"{self.base_url}{device_reverse_url}",
                 target="_top",
                 fill="black",
             )
         )
         link.set_desc(self._get_device_description(device))
-        link.add(drawing.rect(start, end, style=f"fill: #{color}", class_="slot"))
+        link.add(drawing.rect(start, end, style=f"fill: #{role_color}", class_="slot"))
+
+        status_rect = drawing.add(
+            drawing.a(
+                href=f"{self.base_url}{status_reverse_url}",
+                target="_top",
+                fill="black",
+            )
+        )
+        status_rect.set_desc(device.status.name)
+        status_end = (end[0] / 20, end[1])  # width, y
+        status_rect.add(drawing.rect(start, status_end, style=f"fill: #{status_color}"))
 
         # Embed front device type image if one exists
         if self.include_images and device.device_type.front_image:

nautobot/dcim/factory.py

@@ -64,7 +64,7 @@ from nautobot.dcim.models import (
 )
 from nautobot.extras.models import ExternalIntegration, Role, Status
 from nautobot.extras.utils import FeatureQuery
-from nautobot.ipam.models import Prefix, VLAN, VLANGroup
+from nautobot.ipam.models import Prefix, VLAN, VLANGroup, VRF
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import Cluster
 
@@ -1008,3 +1008,11 @@ class VirtualDeviceContextFactory(PrimaryModelFactory):
                 self.interfaces.set(extracted)
             else:
                 self.interfaces.set(get_random_instances(Interface.objects.filter(device=self.device)))
+
+    @factory.post_generation
+    def vrfs(self, create, extracted, **kwargs):
+        if create:
+            if extracted:
+                self.vrfs.set(extracted)
+            else:
+                self.vrfs.set(get_random_instances(VRF.objects.all()))

nautobot/dcim/filters/__init__.py

@@ -101,7 +101,7 @@ from nautobot.extras.filters import (
 from nautobot.extras.models import ExternalIntegration, SecretsGroup
 from nautobot.extras.utils import FeatureQuery
 from nautobot.ipam.models import IPAddress, VLAN, VLANGroup
-from nautobot.tenancy.filters import TenancyModelFilterSetMixin
+from nautobot.tenancy.filters.mixins import TenancyModelFilterSetMixin
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import Cluster, VirtualMachine
 from nautobot.wireless.models import RadioProfile, WirelessNetwork
@@ -362,6 +362,12 @@ class RackGroupFilterSet(LocatableModelFilterSetMixin, NautobotFilterSet, NameSe
         to_field_name="name",
         label="Parent (name or ID)",
     )
+    ancestors = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Location.objects.all(),
+        to_field_name="name",
+        label="Location(s) and ancestors thereof (name or ID)",
+        method="_ancestors",
+    )
     children = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=RackGroup.objects.all(),
         to_field_name="name",
@@ -392,6 +398,26 @@ class RackGroupFilterSet(LocatableModelFilterSetMixin, NautobotFilterSet, NameSe
         model = RackGroup
         fields = ["id", "name", "description", "racks"]
 
+    def generate_query__ancestors(self, value):
+        """Helper method used by _ancestors() method."""
+        if value:
+            locations = Location.objects.filter(pk__in=[v.pk for v in value])
+            pk_list = []
+            for location in locations:
+                parent_locations = location.ancestors(include_self=True)
+                pk_list.extend([v.pk for v in parent_locations])
+            params = Q(location__pk__in=pk_list)
+            return params
+        return Q()
+
+    @extend_schema_field({"type": "string"})
+    def _ancestors(self, queryset, name, value):
+        """FilterSet method for, given a location, getting RackGroups that exist with in the parent Location(s) and the location itself."""
+        if value:
+            params = self.generate_query__ancestors(value)
+            return queryset.filter(params)
+        return queryset
+
 
 class RackFilterSet(
     NautobotFilterSet,

nautobot/dcim/forms.py

@@ -17,6 +17,7 @@ from nautobot.core.forms import (
     AutoPositionPatternField,
     BootstrapMixin,
     BulkEditNullBooleanSelect,
+    ClearableFileInput,
     ColorSelect,
     CommentField,
     DatePicker,
@@ -509,7 +510,7 @@ class RackForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm):
     rack_group = DynamicModelChoiceField(
         queryset=RackGroup.objects.all(),
         required=False,
-        query_params={"location": "$location"},
+        query_params={"ancestors": "$location"},
     )
     comments = CommentField()
 
@@ -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"}),
         }
 
 
@@ -5301,6 +5298,11 @@ class VirtualDeviceContextForm(NautobotModelForm):
         required=True,
         query_params={"content_types": VirtualDeviceContext._meta.label_lower},
     )
+    vrfs = DynamicModelMultipleChoiceField(
+        queryset=VRF.objects.all(),
+        required=False,
+        label="VRFs",
+    )
 
     class Meta:
         model = VirtualDeviceContext
@@ -5311,6 +5313,7 @@ class VirtualDeviceContextForm(NautobotModelForm):
             "status",
             "identifier",
             "interfaces",
+            "vrfs",
             "primary_ip4",
             "primary_ip6",
             "tenant",
@@ -5326,11 +5329,15 @@ class VirtualDeviceContextForm(NautobotModelForm):
             self.fields["device"].disabled = True
             self.fields["device"].required = False
 
+        self.initial["vrfs"] = self.instance.vrfs.values_list("id", flat=True)
+
     def save(self, commit=True):
         instance = super().save(commit)
         if commit:
             interfaces = self.cleaned_data["interfaces"]
             instance.interfaces.set(interfaces)
+            vrfs = self.cleaned_data["vrfs"]
+            instance.vrfs.set(vrfs)
         return instance
 
 
@@ -5348,6 +5355,8 @@ class VirtualDeviceContextBulkEditForm(
     remove_interfaces = DynamicModelMultipleChoiceField(
         queryset=Interface.objects.all(), required=False, query_params={"device": "$device"}
     )
+    add_vrfs = DynamicModelMultipleChoiceField(queryset=VRF.objects.all(), required=False)
+    remove_vrfs = DynamicModelMultipleChoiceField(queryset=VRF.objects.all(), required=False)
 
     class Meta:
         model = VirtualDeviceContext

nautobot/dcim/models/devices.py

@@ -670,11 +670,17 @@ class Device(PrimaryModel, ConfigContextModel):
 
         # Validate location
         if self.location is not None:
-            # TODO: after Location model replaced Site, which was not a hierarchical model, should we allow users to assign a Rack belongs to
-            # the parent Location or the child location of `self.location`?
-
-            if self.rack is not None and self.rack.location != self.location:
-                raise ValidationError({"rack": f'Rack "{self.rack}" does not belong to location "{self.location}".'})
+            if self.rack is not None:
+                device_location = self.location
+                # Rack's location must be a child location or the same location as that of the parent device.
+                # Location is a required field on rack.
+                rack_location = self.rack.location
+                if device_location not in rack_location.ancestors(include_self=True):
+                    raise ValidationError(
+                        {
+                            "rack": f'Rack "{self.rack}" does not belong to location "{self.location}" and its descendants.'
+                        }
+                    )
 
             # self.cluster is validated somewhat later, see below
 
@@ -1419,11 +1425,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/signals.py

@@ -16,6 +16,7 @@ from .models import (
     DeviceRedundancyGroup,
     Interface,
     InterfaceVDCAssignment,
+    LocationType,
     PathEndpoint,
     PowerPanel,
     Rack,
@@ -355,3 +356,28 @@ def handle_controller_managed_device_group_controller_change(instance, raw=False
             group.controller = instance.controller
             group.save()
             logger.debug("Updated controller from parent %s for child %s", instance, group)
+
+
+@receiver(m2m_changed, sender=LocationType.content_types.through)
+def content_type_changed(instance, action, **kwargs):
+    """
+    Prevents removal of a ContentType from LocationType if it's in use by any models
+    associated with the locations.
+    """
+
+    if action != "pre_remove":
+        return
+
+    removed_content_types = ContentType.objects.filter(pk__in=kwargs.get("pk_set", []))
+
+    for content_type in removed_content_types:
+        model_class = content_type.model_class()
+
+        if model_class.objects.filter(location__location_type=instance).exists():
+            raise ValidationError(
+                {
+                    "content_types": (
+                        f"Cannot remove the content type {content_type} as currently at least one {model_class._meta.verbose_name} is associated to a location of this location type. "
+                    )
+                }
+            )

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>