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

nautobot/dcim/forms.py

@@ -588,7 +588,7 @@ class RackBulkEditForm(
         required=False,
         widget=StaticSelect2(),
     )
-    u_height = forms.IntegerField(required=False, label="Height (U)")
+    u_height = forms.IntegerField(required=False, label="Height (U)", min_value=1, max_value=100)
     desc_units = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect, label="Descending units")
     outer_width = forms.IntegerField(required=False, min_value=1)
     outer_depth = forms.IntegerField(required=False, min_value=1)
@@ -796,7 +796,7 @@ class DeviceFamilyFilterForm(NautobotFilterForm):
     tags = TagFilterField(model)
 
 
-class DeviceFamilyBulkEditForm(NautobotBulkEditForm, TagsBulkEditFormMixin):
+class DeviceFamilyBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=DeviceFamily.objects.all(), widget=forms.MultipleHiddenInput())
     description = forms.CharField(required=False)
 
@@ -878,7 +878,7 @@ class DeviceTypeBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     manufacturer = DynamicModelChoiceField(queryset=Manufacturer.objects.all(), required=False)
     device_family = DynamicModelChoiceField(queryset=DeviceFamily.objects.all(), required=False)
     software_image_files = DynamicModelMultipleChoiceField(queryset=SoftwareImageFile.objects.all(), required=False)
-    u_height = forms.IntegerField(required=False)
+    u_height = forms.IntegerField(required=False, min_value=0)
     is_full_depth = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect(), label="Is full depth")
     comments = CommentField(label="Comments", required=False)
 
@@ -1655,6 +1655,8 @@ class ComponentTemplateImportForm(BootstrapMixin, CustomFieldModelCSVForm):
     netbox-community/devicetype-library repository.
     """
 
+    Meta: type  # to be defined by concrete subclasses
+
     def __init__(self, data=None, *args, **kwargs):
         super().__init__(data, *args, **kwargs)
 
@@ -2127,6 +2129,8 @@ class DeviceBulkEditForm(
     rack_group = DynamicModelChoiceField(
         queryset=RackGroup.objects.all(), required=False, query_params={"location": "$location"}
     )
+    cluster = DynamicModelChoiceField(queryset=Cluster.objects.all(), required=False)
+    comments = CommentField(widget=SmallTextarea, label="Comments")
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
     platform = DynamicModelChoiceField(queryset=Platform.objects.all(), required=False)
     serial = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False, label="Serial Number")
@@ -2150,6 +2154,8 @@ class DeviceBulkEditForm(
             "position",
             "face",
             "rack_group",
+            "cluster",
+            "comments",
             "secrets_group",
             "device_redundancy_group",
             "device_redundancy_group_priority",
@@ -3214,9 +3220,6 @@ class InterfaceBulkEditForm(
     untagged_vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
-        query_params={
-            "locations": "null",
-        },
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
@@ -3266,8 +3269,12 @@ class InterfaceBulkEditForm(
             # Limit VLAN choices by Location
             if locations.count() == 1:
                 location = locations.first()
-                self.fields["untagged_vlan"].widget.add_query_param("locations", location.pk)
+                # In the case of a single location, use the available_on_device query param to limit untagged VLAN choices
+                # to those available on the devices in that location and in the ancestors of the location.
+                self.fields["untagged_vlan"].widget.add_query_param("available_on_device", device.pk)
                 self.fields["tagged_vlans"].widget.add_query_param("locations", location.pk)
+            else:
+                self.fields["tagged_vlans"].widget.add_query_param("locations", "null")
 
         # Restrict parent/bridge/LAG interface assignment by device (or VC master)
         if device_count == 1:
@@ -4982,10 +4989,6 @@ class ControllerForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm):
         queryset=Platform.objects.all(),
         required=False,
     )
-    tenant = DynamicModelChoiceField(
-        queryset=Tenant.objects.all(),
-        required=False,
-    )
     external_integration = DynamicModelChoiceField(
         queryset=ExternalIntegration.objects.all(),
         required=False,
@@ -5007,6 +5010,7 @@ class ControllerForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm):
             "role",
             "description",
             "platform",
+            "tenant_group",
             "tenant",
             "location",
             "capabilities",
@@ -5059,6 +5063,7 @@ class ControllerFilterForm(
         "description",
         "location",
         "platform",
+        "tenant_group",
         "tenant",
         "external_integration",
         "controller_device",
@@ -5085,7 +5090,7 @@ class ControllerBulkEditForm(
         required=False,
     )
     capabilities = JSONArrayFormField(
-        choices=add_blank_choice(ControllerCapabilitiesChoices),
+        choices=ControllerCapabilitiesChoices,
         base_field=forms.CharField(),
         required=False,
     )
@@ -5114,15 +5119,18 @@ class ControllerBulkEditForm(
             "description",
             "location",
             "platform",
-            "tenant",
             "external_integration",
             "controller_device",
             "controller_device_redundancy_group",
             "tags",
         )
+        nullable_fields = (
+            "tenant",
+            "capabilities",
+        )
 
 
-class ControllerManagedDeviceGroupForm(NautobotModelForm):
+class ControllerManagedDeviceGroupForm(NautobotModelForm, TenancyForm):
     """ControllerManagedDeviceGroup create/edit form."""
 
     controller = DynamicModelChoiceField(queryset=Controller.objects.all(), required=True)
@@ -5139,12 +5147,15 @@ class ControllerManagedDeviceGroupForm(NautobotModelForm):
         fields = (
             "controller",
             "name",
+            "description",
             "devices",
             "parent",
             "capabilities",
             "weight",
             "radio_profiles",
             "tags",
+            "tenant_group",
+            "tenant",
         )
 
     def __init__(self, *args, **kwargs):
@@ -5159,12 +5170,13 @@ class ControllerManagedDeviceGroupForm(NautobotModelForm):
         return instance
 
 
-class ControllerManagedDeviceGroupFilterForm(NautobotFilterForm):
+class ControllerManagedDeviceGroupFilterForm(NautobotFilterForm, TenancyFilterForm):
     """ControllerManagedDeviceGroup basic filter form."""
 
     model = ControllerManagedDeviceGroup
     q = forms.CharField(required=False, label="Search")
     name = forms.CharField(required=False, label="Name")
+    description = forms.CharField(required=False, label="Description")
     controller = DynamicModelChoiceField(
         queryset=Controller.objects.all(),
         required=False,
@@ -5185,11 +5197,14 @@ class ControllerManagedDeviceGroupFilterForm(NautobotFilterForm):
     field_order = (
         "q",
         "name",
+        "description",
         "controller",
         "parent",
         "weight",
         "subtree",
         "tags",
+        "tenant",
+        "tenant_group",
     )
 
 
@@ -5214,10 +5229,11 @@ class ControllerManagedDeviceGroupBulkEditForm(TagsBulkEditFormMixin, NautobotBu
         label="Remove Radio Profiles",
     )
     capabilities = JSONArrayFormField(
-        choices=add_blank_choice(ControllerCapabilitiesChoices),
+        choices=ControllerCapabilitiesChoices,
         base_field=forms.CharField(),
         required=False,
     )
+    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
 
     class Meta:
         model = ControllerManagedDeviceGroup
@@ -5225,9 +5241,12 @@ class ControllerManagedDeviceGroupBulkEditForm(TagsBulkEditFormMixin, NautobotBu
             "controller",
             "parent",
             "weight",
-            "capabilities",
             "tags",
         )
+        nullable_fields = (
+            "tenant",
+            "capabilities",
+        )
 
 
 #

nautobot/dcim/graphql/types.py

@@ -98,13 +98,13 @@ class CableType(OptimizedNautobotObjectType):
 
     def resolve_termination_a_type(self, args):
         if self.termination_a_type:
-            model = self.termination_a_type.model_class()
+            model = self.termination_a_type.model_class()  # pylint: disable=no-member
             return f"{model._meta.app_label}.{model._meta.model_name}"
         return None
 
     def resolve_termination_b_type(self, args):
         if self.termination_b_type:
-            model = self.termination_b_type.model_class()
+            model = self.termination_b_type.model_class()  # pylint: disable=no-member
             return f"{model._meta.app_label}.{model._meta.model_name}"
         return None
 

nautobot/dcim/migrations/0067_controllermanageddevicegroup_tenant.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.16 on 2024-11-21 12:35
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tenancy", "0009_update_all_charfields_max_length_to_255"),
+        ("dcim", "0066_controllermanageddevicegroup_radio_profiles_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="controllermanageddevicegroup",
+            name="tenant",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="controller_managed_device_groups",
+                to="tenancy.tenant",
+            ),
+        ),
+    ]

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)
+            return self.device_type.get_absolute_url(api=api)  # pylint: disable=no-member
         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:
+        if self.device_type and self.device_type.subdevice_role != SubdeviceRoleChoices.ROLE_PARENT:  # pylint: disable=no-member
             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
+        return self.module.device if self.module else self.device  # pylint: disable=no-member
 
     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:
+        if self.module and self.module.parent_module_bay and "{module" in self.name:  # pylint: disable=no-member
             name = ""
-            module_bay = self.module.parent_module_bay
+            module_bay = self.module.parent_module_bay  # pylint: disable=no-member
             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()]
+        path = [self, *self._path.get_path()]  # pylint: disable=no-member
         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)
+        path.append(self._path.destination)  # pylint: disable=no-member
 
         # 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:
+        if not self.mode and self.untagged_vlan is not None:  # pylint: disable=no-member  # Intf/VMIntf both have untagged_vlan
             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:
-            self.tagged_vlans.clear()
+        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
 
         return super().save(*args, **kwargs)
 
@@ -710,18 +710,19 @@ 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:
+            if self.parent and self.parent_interface.parent != self.parent:  # pylint: disable=no-member
                 if getattr(self.parent, "virtual_chassis", None) is None:
                     raise ValidationError(
-                        {
-                            "parent_interface": f"The selected parent interface ({self.parent_interface}) belongs to a different device "
-                            f"({self.parent_interface.parent})."
+                        {  # 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})."
                         }
                     )
-                elif self.parent_interface.parent.virtual_chassis != self.parent.virtual_chassis:
+                elif self.parent_interface.parent.virtual_chassis != self.parent.virtual_chassis:  # pylint: disable=no-member
                     raise ValidationError(
-                        {
-                            "parent_interface": f"The selected parent interface ({self.parent_interface}) belongs to {self.parent_interface.parent}, which "
+                        {  # 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 "
                             f"is not part of virtual chassis {self.parent.virtual_chassis}."
                         }
                     )
@@ -754,21 +755,22 @@ 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:
+            if self.parent and self.bridge.parent != self.parent:  # pylint: disable=no-member
                 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:
+                elif self.bridge.parent.virtual_chassis_id != self.parent.virtual_chassis_id:  # pylint: disable=no-member
                     raise ValidationError(
                         {
                             "bridge": (
-                                f"The selected bridge interface ({self.bridge}) belongs to {self.bridge.parent}, which "
+                                f"The selected bridge interface ({self.bridge}) belongs to {self.bridge.parent}, which "  # pylint: disable=no-member
                                 f"is not part of virtual chassis {self.parent.virtual_chassis}."
                             )
                         }
@@ -1084,8 +1086,8 @@ class DeviceBay(ComponentModel):
         super().clean()
 
         # Validate that the parent Device can have DeviceBays
-        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.")
+        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
 
         # Cannot install a device into itself, obviously
         if self.device == self.installed_device:

nautobot/dcim/models/devices.py

@@ -48,6 +48,7 @@ __all__ = (
     "Controller",
     "ControllerManagedDeviceGroup",
     "Device",
+    "DeviceFamily",
     "DeviceRedundancyGroup",
     "DeviceType",
     "InterfaceVDCAssignment",
@@ -823,6 +824,7 @@ 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(
@@ -1481,6 +1483,13 @@ 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",)
@@ -1500,7 +1509,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:
+        if self.parent and self.controller and self.controller != self.parent.controller:  # pylint: disable=no-member
             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:
+                    if self.parent.location_type != self.location_type:  # pylint: disable=no-member
                         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):
+                if self.parent.location_type not in (self.location_type, self.location_type.parent):  # pylint: disable=no-member
                     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:
+                if self.parent.location_type != self.location_type.parent:  # pylint: disable=no-member
                     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
-                and self.rack_group.location not in self.location.ancestors(include_self=True)
+                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
             ):
                 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,9 +151,10 @@ 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:
+        if self.rack and self.rack.location != self.power_panel.location:  # pylint: disable=no-member
             raise ValidationError(
-                f"Rack {self.rack} ({self.rack.location}) and power panel {self.power_panel} ({self.power_panel.location}) are in different locations"
+                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"
             )
 
         # 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
-            and self.parent.location not in self.location.ancestors(include_self=True)
+            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
         ):
             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)
+                permitted_device_ids = self.devices.restrict(user, "view").values_list("pk", flat=True)  # pylint: disable=no-member
 
             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")
+    device = tables.Column(linkify=True, accessor="parent", orderable=False)
     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")
+    device = tables.Column(linkify=True, accessor="parent", orderable=False)
     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")
+    device_a = tables.Column(accessor=Accessor("parent"), linkify=True, verbose_name="Device A", orderable=False)
     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",
-    "ControllerTable",
     "ControllerManagedDeviceGroupTable",
+    "ControllerTable",
     "DeviceBayTable",
     "DeviceDeviceBayTable",
     "DeviceImportTable",
@@ -75,19 +75,19 @@ __all__ = (
     "DeviceModuleConsoleServerPortTable",
     "DeviceModuleFrontPortTable",
     "DeviceModuleInterfaceTable",
-    "DeviceModulePowerPortTable",
     "DeviceModulePowerOutletTable",
+    "DeviceModulePowerPortTable",
     "DeviceModuleRearPortTable",
     "DeviceRedundancyGroupTable",
     "DeviceTable",
     "FrontPortTable",
-    "InterfaceTable",
-    "InterfaceRedundancyGroupTable",
     "InterfaceRedundancyGroupAssociationTable",
+    "InterfaceRedundancyGroupTable",
+    "InterfaceTable",
     "InventoryItemTable",
-    "ModuleTable",
     "ModuleBayTable",
     "ModuleModuleBayTable",
+    "ModuleTable",
     "PlatformTable",
     "PowerOutletTable",
     "PowerPortTable",
@@ -1409,6 +1409,7 @@ 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)
@@ -1440,6 +1441,7 @@ 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",
+            "power_port_template",
             "feed_leg",
             "description",
             "actions",
@@ -290,7 +290,7 @@ class FrontPortTemplateTable(ComponentTemplateTable):
             "name",
             "label",
             "type",
-            "rear_port",
+            "rear_port_template",
             "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,13 +34,7 @@
         {% endwith %}
         </div>
     </div>
-    <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/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock form %}
 

nautobot/dcim/templates/dcim/controller_retrieve.html

@@ -34,15 +34,7 @@
                             <td>Platform</td>
                             <td>{{ object.platform|hyperlinked_object }}</td>
                         </tr>
-                        <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>
+                        {% include 'inc/tenant_table_row.html' %}
                         <tr>
                             <td>Description</td>
                             <td>{{ object.description|placeholder }}</td>