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

nautobot/dcim/api/views.py

@@ -11,7 +11,6 @@ from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema, OpenApiParameter
 from rest_framework.decorators import action
 from rest_framework.mixins import ListModelMixin
-from rest_framework.parsers import JSONParser, MultiPartParser
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet, ViewSet
@@ -19,7 +18,6 @@ from rest_framework.viewsets import GenericViewSet, ViewSet
 from nautobot.circuits.models import Circuit
 from nautobot.cloud.models import CloudAccount
 from nautobot.core.api.exceptions import ServiceUnavailable
-from nautobot.core.api.parsers import NautobotCSVParser
 from nautobot.core.api.utils import get_serializer_for_model
 from nautobot.core.api.views import ModelViewSet
 from nautobot.core.models.querysets import count_related
@@ -78,7 +76,7 @@ from nautobot.extras.api.views import (
 )
 from nautobot.extras.choices import SecretsGroupAccessTypeChoices, SecretsGroupSecretTypeChoices
 from nautobot.extras.secrets.exceptions import SecretError
-from nautobot.ipam.models import IPAddress, Prefix, VLAN
+from nautobot.ipam.models import Prefix, VLAN
 from nautobot.virtualization.models import VirtualMachine
 
 from . import serializers
@@ -142,7 +140,7 @@ class PassThroughPortMixin:
 
 
 class LocationTypeViewSet(NautobotModelViewSet):
-    queryset = LocationType.objects.all()
+    queryset = LocationType.objects.select_related("parent").prefetch_related("content_types")
     serializer_class = serializers.LocationTypeSerializer
     filterset_class = filters.LocationTypeFilterSet
 
@@ -153,13 +151,17 @@ class LocationTypeViewSet(NautobotModelViewSet):
 
 
 class LocationViewSet(NautobotModelViewSet):
-    queryset = Location.objects.annotate(
-        device_count=count_related(Device, "location"),
-        rack_count=count_related(Rack, "location"),
-        prefix_count=count_related(Prefix, "locations"),
-        vlan_count=count_related(VLAN, "locations"),
-        circuit_count=count_related(Circuit, "circuit_terminations__location"),
-        virtual_machine_count=count_related(VirtualMachine, "cluster__location"),
+    queryset = (
+        Location.objects.select_related("location_type", "parent", "status", "tenant")
+        .prefetch_related("tags")
+        .annotate(
+            device_count=count_related(Device, "location"),
+            rack_count=count_related(Rack, "location"),
+            prefix_count=count_related(Prefix, "locations"),
+            vlan_count=count_related(VLAN, "locations"),
+            circuit_count=count_related(Circuit, "circuit_terminations__location"),
+            virtual_machine_count=count_related(VirtualMachine, "cluster__location"),
+        )
     )
     serializer_class = serializers.LocationSerializer
     filterset_class = filters.LocationFilterSet
@@ -171,7 +173,7 @@ class LocationViewSet(NautobotModelViewSet):
 
 
 class RackGroupViewSet(NautobotModelViewSet):
-    queryset = RackGroup.objects.annotate(rack_count=count_related(Rack, "rack_group"))
+    queryset = RackGroup.objects.annotate(rack_count=count_related(Rack, "rack_group")).select_related("location")
     serializer_class = serializers.RackGroupSerializer
     filterset_class = filters.RackGroupFilterSet
 
@@ -182,9 +184,13 @@ class RackGroupViewSet(NautobotModelViewSet):
 
 
 class RackViewSet(NautobotModelViewSet):
-    queryset = Rack.objects.select_related("rack_group__location").annotate(
-        device_count=count_related(Device, "rack"),
-        power_feed_count=count_related(PowerFeed, "rack"),
+    queryset = (
+        Rack.objects.select_related("location", "rack_group__location", "status", "role", "tenant")
+        .prefetch_related("tags")
+        .annotate(
+            device_count=count_related(Device, "rack"),
+            power_feed_count=count_related(PowerFeed, "rack"),
+        )
     )
     serializer_class = serializers.RackSerializer
     filterset_class = filters.RackFilterSet
@@ -249,7 +255,7 @@ class RackViewSet(NautobotModelViewSet):
 
 
 class RackReservationViewSet(NautobotModelViewSet):
-    queryset = RackReservation.objects.all()
+    queryset = RackReservation.objects.select_related("rack", "user", "tenant")
     serializer_class = serializers.RackReservationSerializer
     filterset_class = filters.RackReservationFilterSet
 
@@ -289,10 +295,13 @@ class DeviceFamilyViewSet(NautobotModelViewSet):
 
 
 class DeviceTypeViewSet(NautobotModelViewSet):
-    queryset = DeviceType.objects.annotate(device_count=count_related(Device, "device_type"))
+    queryset = (
+        DeviceType.objects.select_related("manufacturer")
+        .prefetch_related("software_image_files", "tags")
+        .annotate(device_count=count_related(Device, "device_type"))
+    )
     serializer_class = serializers.DeviceTypeSerializer
     filterset_class = filters.DeviceTypeFilterSet
-    parser_classes = [JSONParser, NautobotCSVParser, MultiPartParser]
 
 
 #
@@ -378,8 +387,21 @@ class PlatformViewSet(NautobotModelViewSet):
 class DeviceViewSet(ConfigContextQuerySetMixin, NautobotModelViewSet):
     queryset = Device.objects.select_related(
         "device_type__manufacturer",
+        "role",
+        "tenant",
+        "platform",
+        "rack",
+        "location",
+        "parent_bay",
+        "primary_ip4",
+        "primary_ip6",
+        "software_version",
         "virtual_chassis__master",
-    ).prefetch_related("primary_ip4__nat_outside_list", "primary_ip6__nat_outside_list")
+        "device_redundancy_group",
+        "controller_managed_device_group",
+        "secrets_group",
+        "status",
+    ).prefetch_related("tags", "primary_ip4__nat_outside_list", "primary_ip6__nat_outside_list", "software_image_files")
     serializer_class = serializers.DeviceSerializer
     filterset_class = filters.DeviceFilterSet
 
@@ -542,65 +564,85 @@ class DeviceViewSet(ConfigContextQuerySetMixin, NautobotModelViewSet):
 
 
 class ConsolePortViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = ConsolePort.objects.prefetch_related("_path__destination", "_cable_peer")
+    queryset = ConsolePort.objects.select_related("device", "cable").prefetch_related(
+        "_path__destination", "_cable_peer", "tags"
+    )
     serializer_class = serializers.ConsolePortSerializer
     filterset_class = filters.ConsolePortFilterSet
 
 
 class ConsoleServerPortViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = ConsoleServerPort.objects.prefetch_related("_path__destination", "_cable_peer")
+    queryset = ConsoleServerPort.objects.select_related("device", "cable").prefetch_related(
+        "_path__destination", "_cable_peer", "tags"
+    )
     serializer_class = serializers.ConsoleServerPortSerializer
     filterset_class = filters.ConsoleServerPortFilterSet
 
 
 class PowerPortViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = PowerPort.objects.prefetch_related("_path__destination", "_cable_peer")
+    queryset = PowerPort.objects.select_related("device", "cable").prefetch_related(
+        "_path__destination", "_cable_peer", "tags"
+    )
     serializer_class = serializers.PowerPortSerializer
     filterset_class = filters.PowerPortFilterSet
 
 
 class PowerOutletViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = PowerOutlet.objects.prefetch_related("_path__destination", "_cable_peer")
+    queryset = PowerOutlet.objects.select_related("device", "cable").prefetch_related(
+        "_path__destination", "_cable_peer", "tags"
+    )
     serializer_class = serializers.PowerOutletSerializer
     filterset_class = filters.PowerOutletFilterSet
 
 
 class InterfaceViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = Interface.objects.prefetch_related("_path__destination", "_cable_peer").annotate(
-        _ip_address_count=count_related(IPAddress, "interfaces")  # avoid conflict with Interface.ip_address_count()
+    queryset = Interface.objects.select_related(
+        "device",
+        "parent_interface",
+        "bridge",
+        "lag",
+        "status",
+        "cable",
+        "untagged_vlan",
+    ).prefetch_related(
+        "tags", "_path__destination", "_cable_peer", "ip_addresses", "tagged_vlans", "virtual_device_contexts"
     )
     serializer_class = serializers.InterfaceSerializer
     filterset_class = filters.InterfaceFilterSet
 
 
 class FrontPortViewSet(PassThroughPortMixin, NautobotModelViewSet):
-    queryset = FrontPort.objects.select_related("device__device_type__manufacturer")
+    queryset = FrontPort.objects.select_related(
+        "device__device_type__manufacturer", "rear_port", "cable"
+    ).prefetch_related("tags")
     serializer_class = serializers.FrontPortSerializer
     filterset_class = filters.FrontPortFilterSet
 
 
 class RearPortViewSet(PassThroughPortMixin, NautobotModelViewSet):
-    queryset = RearPort.objects.select_related("device__device_type__manufacturer")
+    queryset = RearPort.objects.select_related("device__device_type__manufacturer", "cable").prefetch_related("tags")
     serializer_class = serializers.RearPortSerializer
     filterset_class = filters.RearPortFilterSet
 
 
 class DeviceBayViewSet(NautobotModelViewSet):
-    queryset = DeviceBay.objects.all()
+    queryset = DeviceBay.objects.select_related("installed_device").prefetch_related("tags")
     serializer_class = serializers.DeviceBaySerializer
     filterset_class = filters.DeviceBayFilterSet
 
 
 class InventoryItemViewSet(NautobotModelViewSet):
-    queryset = InventoryItem.objects.all()
+    queryset = InventoryItem.objects.select_related("device", "manufacturer", "software_version").prefetch_related(
+        "tags"
+    )
     serializer_class = serializers.InventoryItemSerializer
     filterset_class = filters.InventoryItemFilterSet
 
 
 class ModuleBayViewSet(NautobotModelViewSet):
-    queryset = ModuleBay.objects.select_related("parent_device__tenant", "parent_device__location").prefetch_related(
-        "installed_module"
-    )
+    queryset = ModuleBay.objects.select_related(
+        "parent_device__tenant", "parent_device__location", "parent_module"
+    ).prefetch_related("installed_module", "tags")
     serializer_class = serializers.ModuleBaySerializer
     filterset_class = filters.ModuleBayFilterSet
 
@@ -639,7 +681,7 @@ class InterfaceConnectionViewSet(ListModelMixin, GenericViewSet):
 
 
 class CableViewSet(NautobotModelViewSet):
-    queryset = Cable.objects.prefetch_related("termination_a", "termination_b")
+    queryset = Cable.objects.select_related("status").prefetch_related("termination_a", "termination_b")
     serializer_class = serializers.CableSerializer
     filterset_class = filters.CableFilterSet
 
@@ -650,7 +692,9 @@ class CableViewSet(NautobotModelViewSet):
 
 
 class VirtualChassisViewSet(NautobotModelViewSet):
-    queryset = VirtualChassis.objects.annotate(member_count=count_related(Device, "virtual_chassis"))
+    queryset = VirtualChassis.objects.prefetch_related("tags").annotate(
+        member_count=count_related(Device, "virtual_chassis")
+    )
     serializer_class = serializers.VirtualChassisSerializer
     filterset_class = filters.VirtualChassisFilterSet
 
@@ -661,7 +705,9 @@ class VirtualChassisViewSet(NautobotModelViewSet):
 
 
 class PowerPanelViewSet(NautobotModelViewSet):
-    queryset = PowerPanel.objects.annotate(power_feed_count=count_related(PowerFeed, "power_panel"))
+    queryset = PowerPanel.objects.select_related("location", "rack_group").annotate(
+        power_feed_count=count_related(PowerFeed, "power_panel")
+    )
     serializer_class = serializers.PowerPanelSerializer
     filterset_class = filters.PowerPanelFilterSet
 
@@ -672,7 +718,12 @@ class PowerPanelViewSet(NautobotModelViewSet):
 
 
 class PowerFeedViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = PowerFeed.objects.prefetch_related("_cable_peer", "_path__destination")
+    queryset = PowerFeed.objects.select_related(
+        "power_panel",
+        "rack",
+        "cable",
+        "status",
+    ).prefetch_related("tags", "_cable_peer", "_path__destination")
     serializer_class = serializers.PowerFeedSerializer
     filterset_class = filters.PowerFeedFilterSet
 
@@ -683,7 +734,7 @@ class PowerFeedViewSet(PathEndpointMixin, NautobotModelViewSet):
 
 
 class DeviceRedundancyGroupViewSet(NautobotModelViewSet):
-    queryset = DeviceRedundancyGroup.objects.all()
+    queryset = DeviceRedundancyGroup.objects.select_related("status").prefetch_related("devices")
     serializer_class = serializers.DeviceRedundancyGroupSerializer
     filterset_class = filters.DeviceRedundancyGroupFilterSet
 
@@ -694,7 +745,7 @@ class DeviceRedundancyGroupViewSet(NautobotModelViewSet):
 
 
 class InterfaceRedundancyGroupViewSet(NautobotModelViewSet):
-    queryset = InterfaceRedundancyGroup.objects.all()
+    queryset = InterfaceRedundancyGroup.objects.select_related("status").prefetch_related("interfaces")
     serializer_class = serializers.InterfaceRedundancyGroupSerializer
     filterset_class = filters.InterfaceRedundancyGroupFilterSet
 
@@ -770,19 +821,21 @@ class ConnectedDeviceViewSet(ViewSet):
 
 
 class SoftwareImageFileViewSet(NautobotModelViewSet):
-    queryset = SoftwareImageFile.objects.all()
+    queryset = SoftwareImageFile.objects.select_related("software_version").prefetch_related("device_types")
     serializer_class = serializers.SoftwareImageFileSerializer
     filterset_class = filters.SoftwareImageFileFilterSet
 
 
 class SoftwareVersionViewSet(NautobotModelViewSet):
-    queryset = SoftwareVersion.objects.all()
+    queryset = SoftwareVersion.objects.select_related("platform").prefetch_related(
+        "devices", "software_image_files", "inventory_items", "virtual_machines"
+    )
     serializer_class = serializers.SoftwareVersionSerializer
     filterset_class = filters.SoftwareVersionFilterSet
 
 
 class DeviceTypeToSoftwareImageFileViewSet(ModelViewSet):
-    queryset = DeviceTypeToSoftwareImageFile.objects.all()
+    queryset = DeviceTypeToSoftwareImageFile.objects.select_related("device_type", "software_image_file")
     serializer_class = serializers.DeviceTypeToSoftwareImageFileSerializer
     filterset_class = filters.DeviceTypeToSoftwareImageFileFilterSet
 
@@ -793,13 +846,23 @@ class DeviceTypeToSoftwareImageFileViewSet(ModelViewSet):
 
 
 class ControllerViewSet(NautobotModelViewSet):
-    queryset = Controller.objects.all()
+    queryset = Controller.objects.select_related(
+        "location",
+        "platform",
+        "role",
+        "tenant",
+        "status",
+    ).prefetch_related("tags")
     serializer_class = serializers.ControllerSerializer
     filterset_class = filters.ControllerFilterSet
 
 
 class ControllerManagedDeviceGroupViewSet(NautobotModelViewSet):
-    queryset = ControllerManagedDeviceGroup.objects.all()
+    queryset = ControllerManagedDeviceGroup.objects.select_related(
+        "controller",
+        "parent",
+    ).prefetch_related("tags")
+
     serializer_class = serializers.ControllerManagedDeviceGroupSerializer
     filterset_class = filters.ControllerManagedDeviceGroupFilterSet
 
@@ -814,24 +877,27 @@ class ModuleViewSet(NautobotModelViewSet):
         "parent_module_bay__parent_device__location",
         "parent_module_bay__parent_device__tenant",
         "module_type__manufacturer",
-    )
+        "tenant",
+        "role",
+        "location",
+    ).prefetch_related("module_bays", "tags")
     serializer_class = serializers.ModuleSerializer
     filterset_class = filters.ModuleFilterSet
 
 
 class ModuleTypeViewSet(NautobotModelViewSet):
-    queryset = ModuleType.objects.all()
+    queryset = ModuleType.objects.select_related("manufacturer").prefetch_related("tags", "modules")
     serializer_class = serializers.ModuleTypeSerializer
     filterset_class = filters.ModuleTypeFilterSet
 
 
 class VirtualDeviceContextViewSet(NautobotModelViewSet):
-    queryset = VirtualDeviceContext.objects.all()
+    queryset = VirtualDeviceContext.objects.select_related("device", "tenant", "primary_ip4", "primary_ip6", "role")
     serializer_class = serializers.VirtualDeviceContextSerializer
     filterset_class = filters.VirtualDeviceContextFilterSet
 
 
 class InterfaceVDCAssignmentViewSet(NautobotModelViewSet):
-    queryset = InterfaceVDCAssignment.objects.all()
+    queryset = InterfaceVDCAssignment.objects.select_related("virtual_device_context", "interface")
     serializer_class = serializers.InterfaceVDCAssignmentSerializer
     filterset_class = filters.InterfaceVDCAssignmentFilterSet

nautobot/dcim/filters/__init__.py

@@ -128,8 +128,8 @@ __all__ = (
     "FrontPortTemplateFilterSet",
     "InterfaceConnectionFilterSet",
     "InterfaceFilterSet",
-    "InterfaceRedundancyGroupAssociationFilterSet",
     "InterfaceRedundancyGroupFilterSet",
+    "InterfaceRedundancyGroupAssociationFilterSet",
     "InterfaceTemplateFilterSet",
     "InventoryItemFilterSet",
     "LocationFilterSet",
@@ -907,12 +907,6 @@ class DeviceFilterSet(
         to_field_name="version",
         label="Software version (version or ID)",
     )
-    ip_addresses = MultiValueCharFilter(
-        method="filter_ip_addresses",
-        label="IP addresses (address or ID)",
-        distinct=True,
-    )
-    has_ip_addresses = RelatedMembershipBooleanFilter(field_name="interfaces__ip_addresses", label="Has IP addresses")
     radio_profiles = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="controller_managed_device_group__radio_profiles",
         queryset=RadioProfile.objects.all(),
@@ -934,13 +928,6 @@ class DeviceFilterSet(
         label="Has wireless networks",
     )
 
-    def filter_ip_addresses(self, queryset, name, value):
-        pk_values = set(item for item in value if is_uuid(item))
-        addresses = set(item for item in value if item not in pk_values)
-
-        ip_queryset = IPAddress.objects.filter_address_or_pk_in(addresses, pk_values)
-        return queryset.filter(interfaces__ip_addresses__in=ip_queryset).distinct()
-
     class Meta:
         model = Device
         fields = [
@@ -1167,12 +1154,6 @@ class InterfaceFilterSet(
         queryset=InterfaceRedundancyGroup.objects.all(),
         to_field_name="name",
     )
-    ip_addresses = MultiValueCharFilter(
-        method="filter_ip_addresses",
-        label="IP addresses (address or ID)",
-        distinct=True,
-    )
-    has_ip_addresses = RelatedMembershipBooleanFilter(field_name="ip_addresses", label="Has IP addresses")
     virtual_device_contexts = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=VirtualDeviceContext.objects.all(),
         to_field_name="name",
@@ -1183,13 +1164,6 @@ class InterfaceFilterSet(
         label="Has Virtual Device Context",
     )
 
-    def filter_ip_addresses(self, queryset, name, value):
-        pk_values = set(item for item in value if is_uuid(item))
-        addresses = set(item for item in value if item not in pk_values)
-
-        ip_queryset = IPAddress.objects.filter_address_or_pk_in(addresses, pk_values)
-        return queryset.filter(ip_addresses__in=ip_queryset).distinct()
-
     class Meta:
         model = Interface
         fields = [
@@ -1910,10 +1884,7 @@ class ControllerFilterSet(
         fields = "__all__"
 
 
-class ControllerManagedDeviceGroupFilterSet(
-    NautobotFilterSet,
-    TenancyModelFilterSetMixin,
-):
+class ControllerManagedDeviceGroupFilterSet(NautobotFilterSet):
     """Filters for ControllerManagedDeviceGroup model."""
 
     q = SearchFilter(

nautobot/dcim/forms.py

@@ -588,7 +588,7 @@ class RackBulkEditForm(
         required=False,
         widget=StaticSelect2(),
     )
-    u_height = forms.IntegerField(required=False, label="Height (U)", min_value=1, max_value=100)
+    u_height = forms.IntegerField(required=False, label="Height (U)")
     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(TagsBulkEditFormMixin, NautobotBulkEditForm):
+class DeviceFamilyBulkEditForm(NautobotBulkEditForm, TagsBulkEditFormMixin):
     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, min_value=0)
+    u_height = forms.IntegerField(required=False)
     is_full_depth = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect(), label="Is full depth")
     comments = CommentField(label="Comments", required=False)
 
@@ -1655,8 +1655,6 @@ 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)
 
@@ -2129,8 +2127,6 @@ 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")
@@ -2154,8 +2150,6 @@ class DeviceBulkEditForm(
             "position",
             "face",
             "rack_group",
-            "cluster",
-            "comments",
             "secrets_group",
             "device_redundancy_group",
             "device_redundancy_group_priority",
@@ -3220,6 +3214,9 @@ class InterfaceBulkEditForm(
     untagged_vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
+        query_params={
+            "locations": "null",
+        },
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
@@ -3269,12 +3266,8 @@ class InterfaceBulkEditForm(
             # Limit VLAN choices by Location
             if locations.count() == 1:
                 location = locations.first()
-                # 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["untagged_vlan"].widget.add_query_param("locations", location.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:
@@ -4989,6 +4982,10 @@ 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,
@@ -5010,7 +5007,6 @@ class ControllerForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm):
             "role",
             "description",
             "platform",
-            "tenant_group",
             "tenant",
             "location",
             "capabilities",
@@ -5063,7 +5059,6 @@ class ControllerFilterForm(
         "description",
         "location",
         "platform",
-        "tenant_group",
         "tenant",
         "external_integration",
         "controller_device",
@@ -5090,7 +5085,7 @@ class ControllerBulkEditForm(
         required=False,
     )
     capabilities = JSONArrayFormField(
-        choices=ControllerCapabilitiesChoices,
+        choices=add_blank_choice(ControllerCapabilitiesChoices),
         base_field=forms.CharField(),
         required=False,
     )
@@ -5119,18 +5114,15 @@ class ControllerBulkEditForm(
             "description",
             "location",
             "platform",
+            "tenant",
             "external_integration",
             "controller_device",
             "controller_device_redundancy_group",
             "tags",
         )
-        nullable_fields = (
-            "tenant",
-            "capabilities",
-        )
 
 
-class ControllerManagedDeviceGroupForm(NautobotModelForm, TenancyForm):
+class ControllerManagedDeviceGroupForm(NautobotModelForm):
     """ControllerManagedDeviceGroup create/edit form."""
 
     controller = DynamicModelChoiceField(queryset=Controller.objects.all(), required=True)
@@ -5147,15 +5139,12 @@ class ControllerManagedDeviceGroupForm(NautobotModelForm, TenancyForm):
         fields = (
             "controller",
             "name",
-            "description",
             "devices",
             "parent",
             "capabilities",
             "weight",
             "radio_profiles",
             "tags",
-            "tenant_group",
-            "tenant",
         )
 
     def __init__(self, *args, **kwargs):
@@ -5170,13 +5159,12 @@ class ControllerManagedDeviceGroupForm(NautobotModelForm, TenancyForm):
         return instance
 
 
-class ControllerManagedDeviceGroupFilterForm(NautobotFilterForm, TenancyFilterForm):
+class ControllerManagedDeviceGroupFilterForm(NautobotFilterForm):
     """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,
@@ -5197,14 +5185,11 @@ class ControllerManagedDeviceGroupFilterForm(NautobotFilterForm, TenancyFilterFo
     field_order = (
         "q",
         "name",
-        "description",
         "controller",
         "parent",
         "weight",
         "subtree",
         "tags",
-        "tenant",
-        "tenant_group",
     )
 
 
@@ -5229,11 +5214,10 @@ class ControllerManagedDeviceGroupBulkEditForm(TagsBulkEditFormMixin, NautobotBu
         label="Remove Radio Profiles",
     )
     capabilities = JSONArrayFormField(
-        choices=ControllerCapabilitiesChoices,
+        choices=add_blank_choice(ControllerCapabilitiesChoices),
         base_field=forms.CharField(),
         required=False,
     )
-    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
 
     class Meta:
         model = ControllerManagedDeviceGroup
@@ -5241,11 +5225,8 @@ class ControllerManagedDeviceGroupBulkEditForm(TagsBulkEditFormMixin, NautobotBu
             "controller",
             "parent",
             "weight",
-            "tags",
-        )
-        nullable_fields = (
-            "tenant",
             "capabilities",
+            "tags",
         )
 
 

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()  # pylint: disable=no-member
+            model = self.termination_a_type.model_class()
             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()  # pylint: disable=no-member
+            model = self.termination_b_type.model_class()
             return f"{model._meta.app_label}.{model._meta.model_name}"
         return None