nautobot 2.4.0__py3-none-any.whl → 2.4.0b1__py3-none-any.whl

nautobot/dcim/models/__init__.py

@@ -63,12 +63,12 @@ __all__ = (
     "Device",
     "DeviceBay",
     "DeviceBayTemplate",
-    "DeviceFamily",
     "DeviceRedundancyGroup",
     "DeviceType",
     "DeviceTypeToSoftwareImageFile",
     "FrontPort",
     "FrontPortTemplate",
+    "DeviceFamily",
     "Interface",
     "InterfaceRedundancyGroup",
     "InterfaceRedundancyGroupAssociation",

nautobot/dcim/models/device_component_templates.py

@@ -100,7 +100,7 @@ class ComponentTemplateModel(
     def get_absolute_url(self, api=False):
         # TODO: in the new UI, this should be able to link directly to the object, instead of the device-type.
         if not api:
-            return self.device_type.get_absolute_url(api=api)  # pylint: disable=no-member
+            return self.device_type.get_absolute_url(api=api)
         return super().get_absolute_url(api=api)
 
     def instantiate_model(self, model, device, **kwargs):
@@ -460,7 +460,7 @@ class DeviceBayTemplate(ComponentTemplateModel):
         return self.instantiate_model(model=DeviceBay, device=device)
 
     def clean(self):
-        if self.device_type and self.device_type.subdevice_role != SubdeviceRoleChoices.ROLE_PARENT:  # pylint: disable=no-member
+        if self.device_type and self.device_type.subdevice_role != SubdeviceRoleChoices.ROLE_PARENT:
             raise ValidationError(
                 f'Subdevice role of device type ({self.device_type}) must be set to "parent" to allow device bays.'
             )

nautobot/dcim/models/device_components.py

@@ -138,7 +138,7 @@ class ModularComponentModel(ComponentModel):
     @property
     def parent(self):
         """Device that this component belongs to, walking up module inheritance if necessary."""
-        return self.module.device if self.module else self.device  # pylint: disable=no-member
+        return self.module.device if self.module else self.device
 
     def render_name_template(self, save=False):
         """
@@ -161,9 +161,9 @@ class ModularComponentModel(ComponentModel):
 
             The deeply nested interface would be named "A{module.parent}" after calling this method.
         """
-        if self.module and self.module.parent_module_bay and "{module" in self.name:  # pylint: disable=no-member
+        if self.module and self.module.parent_module_bay and "{module" in self.name:
             name = ""
-            module_bay = self.module.parent_module_bay  # pylint: disable=no-member
+            module_bay = self.module.parent_module_bay
             positions = []
             while module_bay is not None:
                 position = getattr(module_bay, "position", None)
@@ -291,11 +291,11 @@ class PathEndpoint(models.Model):
             return []
 
         # Construct the complete path
-        path = [self, *self._path.get_path()]  # pylint: disable=no-member
+        path = [self, *self._path.get_path()]
         while (len(path) + 1) % 3:
             # Pad to ensure we have complete three-tuples (e.g. for paths that end at a RearPort)
             path.append(None)
-        path.append(self._path.destination)  # pylint: disable=no-member
+        path.append(self._path.destination)
 
         # Return the path as a list of three-tuples (A termination, cable, B termination)
         return list(zip(*[iter(path)] * 3))
@@ -555,7 +555,7 @@ class BaseInterface(RelationshipModel):
 
     def clean(self):
         # Remove untagged VLAN assignment for non-802.1Q interfaces
-        if not self.mode and self.untagged_vlan is not None:  # pylint: disable=no-member  # Intf/VMIntf both have untagged_vlan
+        if not self.mode and self.untagged_vlan is not None:
             raise ValidationError({"untagged_vlan": "Mode must be set when specifying untagged_vlan"})
 
     def save(self, *args, **kwargs):
@@ -569,8 +569,8 @@ class BaseInterface(RelationshipModel):
             self.status = status
 
         # Only "tagged" interfaces may have tagged VLANs assigned. ("tagged all" implies all VLANs are assigned.)
-        if self.present_in_database and self.mode != InterfaceModeChoices.MODE_TAGGED:  # pylint: disable=no-member
-            self.tagged_vlans.clear()  # pylint: disable=no-member  # Intf/VMIntf both have tagged_vlans
+        if self.present_in_database and self.mode != InterfaceModeChoices.MODE_TAGGED:
+            self.tagged_vlans.clear()
 
         return super().save(*args, **kwargs)
 
@@ -710,19 +710,18 @@ class Interface(ModularComponentModel, CableTermination, PathEndpoint, BaseInter
                 )
 
             # An interface's parent must belong to the same device or virtual chassis
-            if self.parent and self.parent_interface.parent != self.parent:  # pylint: disable=no-member
+            if self.parent and self.parent_interface.parent != self.parent:
                 if getattr(self.parent, "virtual_chassis", None) is None:
                     raise ValidationError(
-                        {  # pylint: disable=no-member  # false positive on parent_interface.parent
-                            "parent_interface": f"The selected parent interface ({self.parent_interface}) belongs "
-                            f"to a different device ({self.parent_interface.parent})."
+                        {
+                            "parent_interface": f"The selected parent interface ({self.parent_interface}) belongs to a different device "
+                            f"({self.parent_interface.parent})."
                         }
                     )
-                elif self.parent_interface.parent.virtual_chassis != self.parent.virtual_chassis:  # pylint: disable=no-member
+                elif self.parent_interface.parent.virtual_chassis != self.parent.virtual_chassis:
                     raise ValidationError(
-                        {  # pylint: disable=no-member  # false positive on parent_interface.parent
-                            "parent_interface": f"The selected parent interface ({self.parent_interface}) belongs "
-                            f"to {self.parent_interface.parent}, which "
+                        {
+                            "parent_interface": f"The selected parent interface ({self.parent_interface}) belongs to {self.parent_interface.parent}, which "
                             f"is not part of virtual chassis {self.parent.virtual_chassis}."
                         }
                     )
@@ -755,22 +754,21 @@ class Interface(ModularComponentModel, CableTermination, PathEndpoint, BaseInter
                 raise ValidationError({"bridge": "An interface cannot be bridged to itself."})
 
             # A bridged interface belong to the same device or virtual chassis
-            if self.parent and self.bridge.parent != self.parent:  # pylint: disable=no-member
+            if self.parent and self.bridge.parent != self.parent:
                 if getattr(self.parent, "virtual_chassis", None) is None:
                     raise ValidationError(
                         {
                             "bridge": (
-                                # pylint: disable=no-member  # false positive on bridge.parent
                                 f"The selected bridge interface ({self.bridge}) belongs to a different device "
                                 f"({self.bridge.parent})."
                             )
                         }
                     )
-                elif self.bridge.parent.virtual_chassis_id != self.parent.virtual_chassis_id:  # pylint: disable=no-member
+                elif self.bridge.parent.virtual_chassis_id != self.parent.virtual_chassis_id:
                     raise ValidationError(
                         {
                             "bridge": (
-                                f"The selected bridge interface ({self.bridge}) belongs to {self.bridge.parent}, which "  # pylint: disable=no-member
+                                f"The selected bridge interface ({self.bridge}) belongs to {self.bridge.parent}, which "
                                 f"is not part of virtual chassis {self.parent.virtual_chassis}."
                             )
                         }
@@ -1086,8 +1084,8 @@ class DeviceBay(ComponentModel):
         super().clean()
 
         # Validate that the parent Device can have DeviceBays
-        if not self.device.device_type.is_parent_device:  # pylint: disable=no-member
-            raise ValidationError(f"This type of device ({self.device.device_type}) does not support device bays.")  # pylint: disable=no-member
+        if not self.device.device_type.is_parent_device:
+            raise ValidationError(f"This type of device ({self.device.device_type}) does not support device bays.")
 
         # Cannot install a device into itself, obviously
         if self.device == self.installed_device:

nautobot/dcim/models/devices.py

@@ -48,7 +48,6 @@ __all__ = (
     "Controller",
     "ControllerManagedDeviceGroup",
     "Device",
-    "DeviceFamily",
     "DeviceRedundancyGroup",
     "DeviceType",
     "InterfaceVDCAssignment",
@@ -824,7 +823,6 @@ class Device(PrimaryModel, ConfigContextModel):
 
         # If any software image file is specified, validate that
         # each of the software image files belongs to the device's device type or is a default image
-        # TODO: this is incorrect as we cannot validate a ManyToMany during clean() - nautobot/nautobot#6344
         for image_file in self.software_image_files.all():
             if not image_file.default_image and self.device_type not in image_file.device_types.all():
                 raise ValidationError(
@@ -1483,13 +1481,6 @@ class ControllerManagedDeviceGroup(TreeModel, PrimaryModel):
         null=True,
         help_text="List of capabilities supported by the controller device group, these capabilities are used to enhance views in Nautobot.",
     )
-    tenant = models.ForeignKey(
-        to="tenancy.Tenant",
-        on_delete=models.PROTECT,
-        related_name="controller_managed_device_groups",
-        blank=True,
-        null=True,
-    )
 
     class Meta:
         ordering = ("weight",)
@@ -1509,7 +1500,7 @@ class ControllerManagedDeviceGroup(TreeModel, PrimaryModel):
         if self.controller == self._original_controller and self.parent == self._original_parent:
             return
 
-        if self.parent and self.controller and self.controller != self.parent.controller:  # pylint: disable=no-member
+        if self.parent and self.controller and self.controller != self.parent.controller:
             raise ValidationError(
                 {"controller": "Controller device group must have the same controller as the parent group."}
             )

nautobot/dcim/models/locations.py

@@ -283,7 +283,7 @@ class Location(TreeModel, PrimaryModel):
             # We shouldn't have a parent, *unless* our own location type is permitted to be nested.
             if self.parent is not None:
                 if self.location_type.nestable:
-                    if self.parent.location_type != self.location_type:  # pylint: disable=no-member
+                    if self.parent.location_type != self.location_type:
                         raise ValidationError(
                             {
                                 "parent": f"A Location of type {self.location_type} may only have "
@@ -304,7 +304,7 @@ class Location(TreeModel, PrimaryModel):
 
             # Is the parent location of a correct type?
             if self.location_type.nestable:
-                if self.parent.location_type not in (self.location_type, self.location_type.parent):  # pylint: disable=no-member
+                if self.parent.location_type not in (self.location_type, self.location_type.parent):
                     raise ValidationError(
                         {
                             "parent": f"A Location of type {self.location_type} can only have a Location "
@@ -312,7 +312,7 @@ class Location(TreeModel, PrimaryModel):
                         }
                     )
             else:
-                if self.parent.location_type != self.location_type.parent:  # pylint: disable=no-member
+                if self.parent.location_type != self.location_type.parent:
                     raise ValidationError(
                         {
                             "parent": f"A Location of type {self.location_type} can only have a Location "

nautobot/dcim/models/power.py

@@ -73,11 +73,11 @@ class PowerPanel(PrimaryModel):
         if self.rack_group:
             if (
                 self.location is not None
-                and self.rack_group.location is not None  # pylint: disable=no-member
-                and self.rack_group.location not in self.location.ancestors(include_self=True)  # pylint: disable=no-member
+                and self.rack_group.location is not None
+                and self.rack_group.location not in self.location.ancestors(include_self=True)
             ):
                 raise ValidationError(
-                    {  # pylint: disable=no-member  # false positive on rack_group.location
+                    {
                         "rack_group": f'Rack group "{self.rack_group}" belongs to a location '
                         f'("{self.rack_group.location}") that does not contain "{self.location}".'
                     }
@@ -151,10 +151,9 @@ class PowerFeed(PrimaryModel, PathEndpoint, CableTermination):
         super().clean()
 
         # Rack must belong to same Location as PowerPanel
-        if self.rack and self.rack.location != self.power_panel.location:  # pylint: disable=no-member
+        if self.rack and self.rack.location != self.power_panel.location:
             raise ValidationError(
-                f"Rack {self.rack} ({self.rack.location}) and "  # pylint: disable=no-member
-                f"power panel {self.power_panel} ({self.power_panel.location}) are in different locations"
+                f"Rack {self.rack} ({self.rack.location}) and power panel {self.power_panel} ({self.power_panel.location}) are in different locations"
             )
 
         # AC voltage cannot be negative

nautobot/dcim/models/racks.py

@@ -77,11 +77,11 @@ class RackGroup(TreeModel, OrganizationalModel):
         # Parent RackGroup (if any) must belong to the same or ancestor Location
         if (
             self.parent is not None
-            and self.parent.location is not None  # pylint: disable=no-member
-            and self.parent.location not in self.location.ancestors(include_self=True)  # pylint: disable=no-member
+            and self.parent.location is not None
+            and self.parent.location not in self.location.ancestors(include_self=True)
         ):
             raise ValidationError(
-                {  # pylint: disable=no-member  # false positive on parent.location
+                {
                     "location": f'Location "{self.location}" is not descended from '
                     f'parent rack group "{self.parent}" location "{self.parent.location}".'
                 }
@@ -296,7 +296,7 @@ class Rack(PrimaryModel):
             # Determine which devices the user has permission to view
             permitted_device_ids = []
             if user is not None:
-                permitted_device_ids = self.devices.restrict(user, "view").values_list("pk", flat=True)  # pylint: disable=no-member
+                permitted_device_ids = self.devices.restrict(user, "view").values_list("pk", flat=True)
 
             for device in queryset:
                 if expand_devices:

nautobot/dcim/tables/__init__.py

@@ -145,7 +145,7 @@ class ConsoleConnectionTable(BaseTable):
         linkify=True,
         verbose_name="Port",
     )
-    device = tables.Column(linkify=True, accessor="parent", orderable=False)
+    device = tables.Column(linkify=True, accessor="parent")
     name = tables.Column(linkify=True, verbose_name="Console Port")
     reachable = BooleanColumn(accessor=Accessor("_path__is_active"), verbose_name="Reachable")
 
@@ -173,7 +173,7 @@ class PowerConnectionTable(BaseTable):
         linkify=True,
         verbose_name="Outlet",
     )
-    device = tables.Column(linkify=True, accessor="parent", orderable=False)
+    device = tables.Column(linkify=True, accessor="parent")
     name = tables.Column(linkify=True, verbose_name="Power Port")
     reachable = BooleanColumn(accessor=Accessor("_path__is_active"), verbose_name="Reachable")
 
@@ -183,7 +183,7 @@ class PowerConnectionTable(BaseTable):
 
 
 class InterfaceConnectionTable(BaseTable):
-    device_a = tables.Column(accessor=Accessor("parent"), linkify=True, verbose_name="Device A", orderable=False)
+    device_a = tables.Column(accessor=Accessor("parent"), linkify=True, verbose_name="Device A")
     interface_a = tables.Column(accessor=Accessor("name"), linkify=True, verbose_name="Interface A")
     device_b = tables.Column(
         accessor=Accessor("_path__destination__parent"),

nautobot/dcim/tables/devices.py

@@ -64,8 +64,8 @@ from .template_code import (
 __all__ = (
     "ConsolePortTable",
     "ConsoleServerPortTable",
-    "ControllerManagedDeviceGroupTable",
     "ControllerTable",
+    "ControllerManagedDeviceGroupTable",
     "DeviceBayTable",
     "DeviceDeviceBayTable",
     "DeviceImportTable",
@@ -75,19 +75,19 @@ __all__ = (
     "DeviceModuleConsoleServerPortTable",
     "DeviceModuleFrontPortTable",
     "DeviceModuleInterfaceTable",
-    "DeviceModulePowerOutletTable",
     "DeviceModulePowerPortTable",
+    "DeviceModulePowerOutletTable",
     "DeviceModuleRearPortTable",
     "DeviceRedundancyGroupTable",
     "DeviceTable",
     "FrontPortTable",
-    "InterfaceRedundancyGroupAssociationTable",
-    "InterfaceRedundancyGroupTable",
     "InterfaceTable",
+    "InterfaceRedundancyGroupTable",
+    "InterfaceRedundancyGroupAssociationTable",
     "InventoryItemTable",
+    "ModuleTable",
     "ModuleBayTable",
     "ModuleModuleBayTable",
-    "ModuleTable",
     "PlatformTable",
     "PowerOutletTable",
     "PowerPortTable",
@@ -1409,7 +1409,6 @@ class ControllerManagedDeviceGroupTable(BaseTable):
     name = tables.TemplateColumn(template_code=TREE_LINK, attrs={"td": {"class": "text-nowrap"}})
     weight = tables.Column()
     controller = tables.Column(linkify=True)
-    tenant = TenantColumn()
     capabilities = tables.Column()
     tags = TagColumn(url_name="dcim:controllermanageddevicegroup_list")
     actions = ButtonsColumn(ControllerManagedDeviceGroup)
@@ -1441,7 +1440,6 @@ class ControllerManagedDeviceGroupTable(BaseTable):
             "wireless_networks_count",
             "controller",
             "weight",
-            "tenant",
             "capabilities",
             "tags",
             "actions",

nautobot/dcim/tables/devicetypes.py

@@ -253,7 +253,7 @@ class PowerOutletTemplateTable(ComponentTemplateTable):
             "name",
             "label",
             "type",
-            "power_port_template",
+            "power_port",
             "feed_leg",
             "description",
             "actions",
@@ -290,7 +290,7 @@ class FrontPortTemplateTable(ComponentTemplateTable):
             "name",
             "label",
             "type",
-            "rear_port_template",
+            "rear_port",
             "rear_port_position",
             "description",
             "actions",

nautobot/dcim/tables/racks.py

@@ -15,10 +15,10 @@ from nautobot.tenancy.tables import TenantColumn
 from .template_code import RACKGROUP_ELEVATIONS, TREE_LINK, UTILIZATION_GRAPH
 
 __all__ = (
+    "RackTable",
     "RackDetailTable",
     "RackGroupTable",
     "RackReservationTable",
-    "RackTable",
 )
 
 

nautobot/dcim/templates/dcim/controller_create.html

@@ -34,7 +34,13 @@
         {% endwith %}
         </div>
     </div>
-    {% include 'inc/tenancy_form_panel.html' %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Tenancy</strong></div>
+        <div class="panel-body">
+            {% render_field form.tenant_group %}
+            {% render_field form.tenant %}
+        </div>
+    </div>
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock form %}
 

nautobot/dcim/templates/dcim/controller_retrieve.html

@@ -34,7 +34,15 @@
                             <td>Platform</td>
                             <td>{{ object.platform|hyperlinked_object }}</td>
                         </tr>
-                        {% include 'inc/tenant_table_row.html' %}
+                        <tr>
+                            <td>Tenant</td>
+                            <td>
+                                {% if object.tenant and object.tenant.tenant_group %}
+                                    {{ object.tenant.tenant_group|hyperlinked_object }} /
+                                {% endif %}
+                                {{ object.tenant|hyperlinked_object }}
+                            </td>
+                        </tr>
                         <tr>
                             <td>Description</td>
                             <td>{{ object.description|placeholder }}</td>

nautobot/dcim/templates/dcim/controllermanageddevicegroup_create.html

@@ -15,7 +15,6 @@
             {% render_field form.capabilities %}
             {% render_field form.weight %}
             {% render_field form.radio_profiles %}
-            {% render_field form.description %}
         </div>
     </div>
     <div class="panel panel-default">
@@ -70,7 +69,6 @@
             </table>
         </div>
     </div>
-    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock form %}
 

nautobot/dcim/templates/dcim/controllermanageddevicegroup_retrieve.html

@@ -70,11 +70,6 @@
                             <td>Weight</td>
                             <td>{{ object.weight }}</td>
                         </tr>
-                        {% include 'inc/tenant_table_row.html' %}
-                        <tr>
-                            <td>Description</td>
-                            <td>{{ object.description|placeholder }}</td>
-                        </tr>
                     </table>
                 </div>
             </div>

nautobot/dcim/templates/dcim/device.html

@@ -51,7 +51,15 @@
                                             {% endif %}
                                         </td>
                                     </tr>
-                                    {% include 'inc/tenant_table_row.html' %}
+                                    <tr>
+                                        <td>Tenant</td>
+                                        <td>
+                                            {% if object.tenant and object.tenant.tenant_group %}
+                                                {{ object.tenant.tenant_group|hyperlinked_object }} /
+                                            {% endif %}
+                                            {{ object.tenant|hyperlinked_object }}
+                                        </td>
+                                    </tr>
                                     <tr>
                                         <td>Device Family</td>
                                         <td>{{ object.device_type.device_family|hyperlinked_object }}</td>

nautobot/dcim/templates/dcim/device_edit.html

@@ -9,8 +9,34 @@
         <div class="panel-body">
             {% render_field form.name %}
             {% render_field form.role %}
-            {% render_field form.status %}
-            {% render_field form.secrets_group %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Hardware</strong></div>
+        <div class="panel-body">
+            {% render_field form.manufacturer %}
+            {% render_field form.device_type %}
+            {% render_field form.serial %}
+            {% render_field form.asset_tag %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Software</strong></div>
+        <div class="panel-body">
+            {% render_field form.platform %}
+            {% render_field form.software_version %}
+            <div class="form-group" id="software_version_image_container" style="display:none">
+                <div class="col-md-3"></div>
+                <div class="col-md-9">
+                    <span class="help-block">
+                        <span id="software_version_image_description"><img src="{% static 'img/ajax-loader.gif' %}"></span>
+                        <ul id="software_version_image_list">
+                            <li> Software images for the selected software version will appear here </li>
+                        </ul>
+                    </span>
+                </div>
+            </div>
+            {% render_field form.software_image_files %}
         </div>
     </div>
     <div class="panel panel-default">
@@ -47,34 +73,6 @@
             {% endif %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Hardware</strong></div>
-        <div class="panel-body">
-            {% render_field form.manufacturer %}
-            {% render_field form.device_type %}
-            {% render_field form.serial %}
-            {% render_field form.asset_tag %}
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Software</strong></div>
-        <div class="panel-body">
-            {% render_field form.platform %}
-            {% render_field form.software_version %}
-            <div class="form-group" id="software_version_image_container" style="display:none">
-                <div class="col-md-3"></div>
-                <div class="col-md-9">
-                    <span class="help-block">
-                        <span id="software_version_image_description"><img src="{% static 'img/ajax-loader.gif' %}"></span>
-                        <ul id="software_version_image_list">
-                            <li> Software images for the selected software version will appear here </li>
-                        </ul>
-                    </span>
-                </div>
-            </div>
-            {% render_field form.software_image_files %}
-        </div>
-    </div>
     <div class="panel panel-default">
         <div class="panel-heading"><strong>VRF Assignment</strong></div>
         <div class="panel-body">
@@ -84,15 +82,12 @@
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Management</strong></div>
         <div class="panel-body">
+            {% render_field form.status %}
             {% if editing %}
                 {% render_field form.primary_ip4 %}
                 {% render_field form.primary_ip6 %}
             {% endif %}
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Topology</strong></div>
-        <div class="panel-body">
+            {% render_field form.secrets_group %}
             {% render_field form.device_redundancy_group %}
             {% render_field form.device_redundancy_group_priority %}
             {% render_field form.controller_managed_device_group %}
@@ -105,7 +100,13 @@
             {% render_field form.cluster %}
         </div>
     </div>
-    {% include 'inc/tenancy_form_panel.html' %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Tenancy</strong></div>
+        <div class="panel-body">
+            {% render_field form.tenant_group %}
+            {% render_field form.tenant %}
+        </div>
+    </div>
     {% include 'inc/extras_features_edit_form_fields.html' %}
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Local Config Context Data</strong></div>

nautobot/dcim/templates/dcim/location.html

@@ -32,7 +32,15 @@
                     {% include 'dcim/inc/location_hierarchy.html' with location=object %}
                 </td>
             </tr>
-            {% include 'inc/tenant_table_row.html' %}
+            <tr>
+                <td>Tenant</td>
+                <td>
+                    {% if object.tenant and object.tenant.tenant_group %}
+                        {{ object.tenant.tenant_group|hyperlinked_object }} /
+                    {% endif %}
+                    {{ object.tenant|hyperlinked_object }}
+                </td>
+            </tr>
             <tr>
                 <td>Facility</td>
                 <td>{{ object.facility|placeholder }}</td>

nautobot/dcim/templates/dcim/location_edit.html

@@ -15,7 +15,13 @@
             {% render_field form.description %}
         </div>
     </div>
-    {% include 'inc/tenancy_form_panel.html' %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Tenancy</strong></div>
+        <div class="panel-body">
+            {% render_field form.tenant_group %}
+            {% render_field form.tenant %}
+        </div>
+    </div>
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Contact Info</strong></div>
         <div class="panel-body">

nautobot/dcim/templates/dcim/rack.html

@@ -57,7 +57,15 @@
                     <td>Facility ID</td>
                     <td>{{ object.facility_id|placeholder }}</td>
                 </tr>
-                {% include 'inc/tenant_table_row.html' %}
+                <tr>
+                    <td>Tenant</td>
+                    <td>
+                        {% if object.tenant and object.tenant.tenant_group %}
+                            {{ object.tenant.tenant_group|hyperlinked_object }} /
+                        {% endif %}
+                        {{ object.tenant|hyperlinked_object }}
+                    </td>
+                </tr>
                 <tr>
                     <td>Status</td>
                     <td>

nautobot/dcim/templates/dcim/rack_edit.html

@@ -15,7 +15,13 @@
             {% render_field form.asset_tag %}
         </div>
     </div>
-    {% include 'inc/tenancy_form_panel.html' %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Tenancy</strong></div>
+        <div class="panel-body">
+            {% render_field form.tenant_group %}
+            {% render_field form.tenant %}
+        </div>
+    </div>
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Dimensions</strong></div>
         <div class="panel-body">