nautobot 2.0.0a2__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/dcim/api/urls.py

@@ -1,4 +1,4 @@
-from nautobot.core.api import OrderedDefaultRouter
+from nautobot.core.api.routers import OrderedDefaultRouter
 from . import views
 
 

nautobot/dcim/api/views.py

@@ -80,7 +80,6 @@ class DCIMRootView(APIRootView):
 
 
 class PathEndpointMixin:
-
     # TODO: the OpenAPI schema for this endpoint is wrong since it defaults to the same as "retrieve".
     @action(detail=True, url_path="trace")
     def trace(self, request, pk):
@@ -98,14 +97,14 @@ class PathEndpointMixin:
                 break
 
             # Serialize each object
-            serializer_a = get_serializer_for_model(near_end, prefix="Nested")
+            serializer_a = get_serializer_for_model(near_end)
             x = serializer_a(near_end, context={"request": request}).data
             if cable is not None:
                 y = serializers.TracedCableSerializer(cable, context={"request": request}).data
             else:
                 y = None
             if far_end is not None:
-                serializer_b = get_serializer_for_model(far_end, prefix="Nested")
+                serializer_b = get_serializer_for_model(far_end)
                 z = serializer_b(far_end, context={"request": request}).data
             else:
                 z = None
@@ -285,8 +284,6 @@ class DeviceTypeViewSet(NautobotModelViewSet):
     )
     serializer_class = serializers.DeviceTypeSerializer
     filterset_class = filters.DeviceTypeFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["manufacturer"]
 
 
 #
@@ -368,34 +365,18 @@ class DeviceViewSet(ConfigContextQuerySetMixin, NautobotModelViewSet):
         "tenant",
         "platform",
         "rack",
+        "location",
         "parent_bay",
         "primary_ip4",
         "primary_ip6",
         "virtual_chassis__master",
+        "device_redundancy_group",
+        "secrets_group",
         "status",
     ).prefetch_related("tags", "primary_ip4__nat_outside_list", "primary_ip6__nat_outside_list")
+    serializer_class = serializers.DeviceSerializer
     filterset_class = filters.DeviceFilterSet
 
-    def get_serializer_class(self):
-        """
-        Select the specific serializer based on the request context.
-
-        If the `brief` query param equates to True, return the NestedDeviceSerializer
-
-        If the `exclude` query param includes `config_context` as a value, return the DeviceSerializer
-
-        Else, return the DeviceWithConfigContextSerializer
-        """
-
-        request = self.get_serializer_context()["request"]
-        if request is not None and request.query_params.get("brief", False):
-            return serializers.NestedDeviceSerializer
-
-        elif request is not None and "config_context" in request.query_params.get("exclude", []):
-            return serializers.DeviceSerializer
-
-        return serializers.DeviceWithConfigContextSerializer
-
     @extend_schema(
         filters=False,
         parameters=[OpenApiParameter(name="method", location="query", required=True, type=OpenApiTypes.STR)],
@@ -560,8 +541,6 @@ class ConsolePortViewSet(PathEndpointMixin, NautobotModelViewSet):
     )
     serializer_class = serializers.ConsolePortSerializer
     filterset_class = filters.ConsolePortFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["device"]
 
 
 class ConsoleServerPortViewSet(PathEndpointMixin, NautobotModelViewSet):
@@ -570,8 +549,6 @@ class ConsoleServerPortViewSet(PathEndpointMixin, NautobotModelViewSet):
     )
     serializer_class = serializers.ConsoleServerPortSerializer
     filterset_class = filters.ConsoleServerPortFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["device"]
 
 
 class PowerPortViewSet(PathEndpointMixin, NautobotModelViewSet):
@@ -580,8 +557,6 @@ class PowerPortViewSet(PathEndpointMixin, NautobotModelViewSet):
     )
     serializer_class = serializers.PowerPortSerializer
     filterset_class = filters.PowerPortFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["device"]
 
 
 class PowerOutletViewSet(PathEndpointMixin, NautobotModelViewSet):
@@ -590,8 +565,6 @@ class PowerOutletViewSet(PathEndpointMixin, NautobotModelViewSet):
     )
     serializer_class = serializers.PowerOutletSerializer
     filterset_class = filters.PowerOutletFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["device"]
 
 
 class InterfaceViewSet(PathEndpointMixin, NautobotModelViewSet):
@@ -605,8 +578,6 @@ class InterfaceViewSet(PathEndpointMixin, NautobotModelViewSet):
     ).prefetch_related("tags", "_path__destination", "_cable_peer", "ip_addresses")
     serializer_class = serializers.InterfaceSerializer
     filterset_class = filters.InterfaceFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["device"]
 
 
 class FrontPortViewSet(PassThroughPortMixin, NautobotModelViewSet):
@@ -615,36 +586,29 @@ class FrontPortViewSet(PassThroughPortMixin, NautobotModelViewSet):
     ).prefetch_related("tags")
     serializer_class = serializers.FrontPortSerializer
     filterset_class = filters.FrontPortFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["device"]
 
 
 class RearPortViewSet(PassThroughPortMixin, NautobotModelViewSet):
     queryset = RearPort.objects.select_related("device__device_type__manufacturer", "cable").prefetch_related("tags")
     serializer_class = serializers.RearPortSerializer
     filterset_class = filters.RearPortFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["device"]
 
 
 class DeviceBayViewSet(NautobotModelViewSet):
     queryset = DeviceBay.objects.select_related("installed_device").prefetch_related("tags")
     serializer_class = serializers.DeviceBaySerializer
     filterset_class = filters.DeviceBayFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["device"]
 
 
 class InventoryItemViewSet(NautobotModelViewSet):
     queryset = InventoryItem.objects.select_related("device", "manufacturer").prefetch_related("tags")
     serializer_class = serializers.InventoryItemSerializer
     filterset_class = filters.InventoryItemFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["device"]
 
 
 #
 # Connections
+# TODO: remove these in favor of using the ConsolePort/PowerPort/Interface API endpoints and/or Cable endpoint.
 #
 
 
@@ -692,8 +656,6 @@ class VirtualChassisViewSet(NautobotModelViewSet):
     )
     serializer_class = serializers.VirtualChassisSerializer
     filterset_class = filters.VirtualChassisFilterSet
-    # v2 TODO(jathan): Replace prefetch_related with select_related
-    brief_prefetch_fields = ["master"]
 
 
 #
@@ -775,7 +737,6 @@ class ConnectedDeviceViewSet(ViewSet):
         responses={"200": serializers.DeviceSerializer},
     )
     def list(self, request):
-
         peer_device_name = request.query_params.get(self._device_param.name)
         peer_interface_name = request.query_params.get(self._interface_param.name)
 

nautobot/dcim/choices.py

@@ -7,7 +7,6 @@ from nautobot.core.choices import ChoiceSet
 
 
 class LocationStatusChoices(ChoiceSet):
-
     STATUS_PLANNED = "planned"
     STATUS_STAGING = "staging"
     STATUS_ACTIVE = "active"
@@ -29,7 +28,6 @@ class LocationStatusChoices(ChoiceSet):
 
 
 class RackTypeChoices(ChoiceSet):
-
     TYPE_2POST = "2-post-frame"
     TYPE_4POST = "4-post-frame"
     TYPE_CABINET = "4-post-cabinet"
@@ -52,7 +50,6 @@ class RackTypeChoices(ChoiceSet):
 
 
 class RackWidthChoices(ChoiceSet):
-
     WIDTH_10IN = 10
     WIDTH_19IN = 19
     WIDTH_21IN = 21
@@ -67,7 +64,6 @@ class RackWidthChoices(ChoiceSet):
 
 
 class RackStatusChoices(ChoiceSet):
-
     STATUS_RESERVED = "reserved"
     STATUS_AVAILABLE = "available"
     STATUS_PLANNED = "planned"
@@ -84,7 +80,6 @@ class RackStatusChoices(ChoiceSet):
 
 
 class RackDimensionUnitChoices(ChoiceSet):
-
     UNIT_MILLIMETER = "mm"
     UNIT_INCH = "in"
 
@@ -95,7 +90,6 @@ class RackDimensionUnitChoices(ChoiceSet):
 
 
 class RackElevationDetailRenderChoices(ChoiceSet):
-
     RENDER_JSON = "json"
     RENDER_SVG = "svg"
 
@@ -108,7 +102,6 @@ class RackElevationDetailRenderChoices(ChoiceSet):
 
 
 class SubdeviceRoleChoices(ChoiceSet):
-
     ROLE_PARENT = "parent"
     ROLE_CHILD = "child"
 
@@ -124,7 +117,6 @@ class SubdeviceRoleChoices(ChoiceSet):
 
 
 class DeviceFaceChoices(ChoiceSet):
-
     FACE_FRONT = "front"
     FACE_REAR = "rear"
 
@@ -135,7 +127,6 @@ class DeviceFaceChoices(ChoiceSet):
 
 
 class DeviceStatusChoices(ChoiceSet):
-
     STATUS_OFFLINE = "offline"
     STATUS_ACTIVE = "active"
     STATUS_PLANNED = "planned"
@@ -161,7 +152,6 @@ class DeviceStatusChoices(ChoiceSet):
 
 
 class ConsolePortTypeChoices(ChoiceSet):
-
     TYPE_DE9 = "de-9"
     TYPE_DB25 = "db-25"
     TYPE_RJ11 = "rj-11"
@@ -213,7 +203,6 @@ class ConsolePortTypeChoices(ChoiceSet):
 
 
 class PowerPortTypeChoices(ChoiceSet):
-
     # IEC 60320
     TYPE_IEC_C6 = "iec-60320-c6"
     TYPE_IEC_C8 = "iec-60320-c8"
@@ -474,7 +463,6 @@ class PowerPortTypeChoices(ChoiceSet):
 
 
 class PowerOutletTypeChoices(ChoiceSet):
-
     # IEC 60320
     TYPE_IEC_C5 = "iec-60320-c5"
     TYPE_IEC_C7 = "iec-60320-c7"
@@ -716,7 +704,6 @@ class PowerOutletTypeChoices(ChoiceSet):
 
 
 class PowerOutletFeedLegChoices(ChoiceSet):
-
     FEED_LEG_A = "A"
     FEED_LEG_B = "B"
     FEED_LEG_C = "C"
@@ -734,7 +721,6 @@ class PowerOutletFeedLegChoices(ChoiceSet):
 
 
 class InterfaceTypeChoices(ChoiceSet):
-
     # Virtual
     TYPE_VIRTUAL = "virtual"
     TYPE_BRIDGE = "bridge"
@@ -1038,7 +1024,6 @@ class InterfaceTypeChoices(ChoiceSet):
 
 
 class InterfaceModeChoices(ChoiceSet):
-
     MODE_ACCESS = "access"
     MODE_TAGGED = "tagged"
     MODE_TAGGED_ALL = "tagged-all"
@@ -1051,7 +1036,6 @@ class InterfaceModeChoices(ChoiceSet):
 
 
 class InterfaceStatusChoices(ChoiceSet):
-
     STATUS_PLANNED = "planned"
     STATUS_ACTIVE = "active"
     STATUS_DECOMMISSIONING = "decommissioning"
@@ -1073,7 +1057,6 @@ class InterfaceStatusChoices(ChoiceSet):
 
 
 class PortTypeChoices(ChoiceSet):
-
     TYPE_8P8C = "8p8c"
     TYPE_8P6C = "8p6c"
     TYPE_8P4C = "8p4c"
@@ -1181,7 +1164,6 @@ class PortTypeChoices(ChoiceSet):
 
 
 class CableTypeChoices(ChoiceSet):
-
     TYPE_CAT3 = "cat3"
     TYPE_CAT5 = "cat5"
     TYPE_CAT5E = "cat5e"
@@ -1244,7 +1226,6 @@ class CableTypeChoices(ChoiceSet):
 
 
 class CableStatusChoices(ChoiceSet):
-
     STATUS_CONNECTED = "connected"
     STATUS_PLANNED = "planned"
     STATUS_DECOMMISSIONING = "decommissioning"
@@ -1257,7 +1238,6 @@ class CableStatusChoices(ChoiceSet):
 
 
 class CableLengthUnitChoices(ChoiceSet):
-
     # Metric
     UNIT_KILOMETER = "km"
     UNIT_METER = "m"
@@ -1284,7 +1264,6 @@ class CableLengthUnitChoices(ChoiceSet):
 
 
 class PowerFeedStatusChoices(ChoiceSet):
-
     STATUS_OFFLINE = "offline"
     STATUS_ACTIVE = "active"
     STATUS_PLANNED = "planned"
@@ -1299,7 +1278,6 @@ class PowerFeedStatusChoices(ChoiceSet):
 
 
 class PowerFeedTypeChoices(ChoiceSet):
-
     TYPE_PRIMARY = "primary"
     TYPE_REDUNDANT = "redundant"
 
@@ -1315,7 +1293,6 @@ class PowerFeedTypeChoices(ChoiceSet):
 
 
 class PowerFeedSupplyChoices(ChoiceSet):
-
     SUPPLY_AC = "ac"
     SUPPLY_DC = "dc"
 
@@ -1326,7 +1303,6 @@ class PowerFeedSupplyChoices(ChoiceSet):
 
 
 class PowerFeedPhaseChoices(ChoiceSet):
-
     PHASE_SINGLE = "single-phase"
     PHASE_3PHASE = "three-phase"
 
@@ -1342,7 +1318,6 @@ class PowerFeedPhaseChoices(ChoiceSet):
 
 
 class DeviceRedundancyGroupStatusChoices(ChoiceSet):
-
     STATUS_PLANNED = "planned"
     STATUS_STAGING = "staging"
     STATUS_ACTIVE = "active"
@@ -1359,10 +1334,12 @@ class DeviceRedundancyGroupStatusChoices(ChoiceSet):
 
 
 class DeviceRedundancyGroupFailoverStrategyChoices(ChoiceSet):
+    FAILOVER_UNSPECIFIED = ""
     FAILOVER_ACTIVE_ACTIVE = "active-active"
     FAILOVER_ACTIVE_PASSIVE = "active-passive"
 
     CHOICES = (
+        (FAILOVER_UNSPECIFIED, "(unspecified)"),
         (FAILOVER_ACTIVE_ACTIVE, "Active/Active"),
         (FAILOVER_ACTIVE_PASSIVE, "Active/Passive"),
     )

nautobot/dcim/elevations.py

@@ -237,7 +237,6 @@ class RackElevationSVG:
             drawing.add(drawing.text(str(unit), position_coordinates, class_="unit"))
 
         for unit in self.merge_elevations(face):
-
             # Loop through all units in the elevation
             device = unit["device"]
             height = unit.get("height", 1)

nautobot/dcim/factory.py

@@ -2,6 +2,8 @@ import factory
 import logging
 import pytz
 import random
+
+from django.utils.text import slugify
 from faker import Faker
 
 from django.contrib.auth import get_user_model
@@ -74,6 +76,15 @@ NAPALM_DRIVERS = {
 }
 
 
+# Retrieve correct rack reservation units
+def get_rack_reservation_units(obj):
+    available_units = obj.rack.units
+    unavailable_units = []
+    for rack in obj.rack.rack_reservations.exclude(id=obj.id):
+        unavailable_units += rack.units
+    return [unit for unit in available_units if unit not in unavailable_units][:1]
+
+
 class DeviceTypeFactory(PrimaryModelFactory):
     class Meta:
         model = DeviceType
@@ -162,7 +173,7 @@ class PlatformFactory(OrganizationalModelFactory):
     # If it has a manufacturer, it *might* have a napalm_driver.
     napalm_driver = factory.Maybe(
         "has_manufacturer",
-        factory.LazyAttribute(lambda o: random.choice(NAPALM_DRIVERS.get(o.manufacturer.slug, [""]))),
+        factory.LazyAttribute(lambda o: random.choice(NAPALM_DRIVERS.get(slugify(o.manufacturer.name), [""]))),
         "",
     )
 
@@ -185,7 +196,7 @@ class LocationTypeFactory(OrganizationalModelFactory):
     has_description = NautobotBoolIterator()
     description = factory.Maybe("has_description", factory.Faker("sentence", nb_words=5), "")
 
-    nestable = factory.LazyAttribute(lambda l: bool(l.name in ["Campus", "Root"]))
+    nestable = factory.LazyAttribute(lambda loc_type: bool(loc_type.name in ["Campus", "Root"]))
 
     @factory.lazy_attribute
     def parent(self):
@@ -267,7 +278,7 @@ class LocationFactory(PrimaryModelFactory):
             "_parent",
         )
 
-    name = factory.LazyAttributeSequence(lambda l, n: f"{l.location_type.name}-{n:02d}")
+    name = factory.LazyAttributeSequence(lambda loc, num: f"{loc.location_type.name}-{num:02d}")
     status = random_instance(lambda: Status.objects.get_for_model(Location), allow_null=False)
 
     has_asn = NautobotBoolIterator()
@@ -414,7 +425,7 @@ class RackReservationFactory(PrimaryModelFactory):
         exclude = ("has_tenant",)
 
     rack = random_instance(Rack, allow_null=False)
-    units = factory.Sequence(lambda n: [n + 1])
+    units = factory.LazyAttribute(get_rack_reservation_units)
 
     has_tenant = factory.Faker("boolean", chance_of_getting_true=75)
     tenant = factory.Maybe("has_tenant", random_instance(Tenant), None)

nautobot/dcim/filters/__init__.py

@@ -466,7 +466,8 @@ class ManufacturerFilterSet(NautobotFilterSet, NameSlugSearchFilterSet):
     )
     platforms = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Platform.objects.all(),
-        label="Platforms (slug or ID)",
+        to_field_name="name",
+        label="Platforms (name or ID)",
     )
     has_platforms = RelatedMembershipBooleanFilter(
         field_name="platforms",
@@ -475,7 +476,7 @@ class ManufacturerFilterSet(NautobotFilterSet, NameSlugSearchFilterSet):
 
     class Meta:
         model = Manufacturer
-        fields = ["id", "name", "slug", "description"]
+        fields = ["id", "name", "description"]
 
 
 class DeviceTypeFilterSet(NautobotFilterSet):
@@ -488,7 +489,7 @@ class DeviceTypeFilterSet(NautobotFilterSet):
         },
     )
     manufacturer = NaturalKeyOrPKMultipleChoiceFilter(
-        queryset=Manufacturer.objects.all(), label="Manufacturer (slug or ID)"
+        queryset=Manufacturer.objects.all(), to_field_name="name", label="Manufacturer (name or ID)"
     )
     console_ports = django_filters.BooleanFilter(
         method="_console_ports",
@@ -732,7 +733,7 @@ class DeviceBayTemplateFilterSet(BaseFilterSet, DeviceComponentTemplateModelFilt
 
 class PlatformFilterSet(NautobotFilterSet, NameSlugSearchFilterSet):
     manufacturer = NaturalKeyOrPKMultipleChoiceFilter(
-        queryset=Manufacturer.objects.all(), label="Manufacturer (slug or ID)"
+        queryset=Manufacturer.objects.all(), to_field_name="name", label="Manufacturer (name or ID)"
     )
     has_devices = RelatedMembershipBooleanFilter(
         field_name="devices",
@@ -748,7 +749,6 @@ class PlatformFilterSet(NautobotFilterSet, NameSlugSearchFilterSet):
         fields = [
             "id",
             "name",
-            "slug",
             "napalm_driver",
             "description",
             "napalm_args",
@@ -784,13 +784,18 @@ class DeviceFilterSet(
         },
     )
     manufacturer = NaturalKeyOrPKMultipleChoiceFilter(
-        field_name="device_type__manufacturer", queryset=Manufacturer.objects.all(), label="Manufacturer (slug or ID)"
+        field_name="device_type__manufacturer",
+        queryset=Manufacturer.objects.all(),
+        to_field_name="name",
+        label="Manufacturer (name or ID)",
     )
     device_type = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=DeviceType.objects.all(),
         label="Device type (slug or ID)",
     )
-    platform = NaturalKeyOrPKMultipleChoiceFilter(queryset=Platform.objects.all(), label="Platform (slug or ID)")
+    platform = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Platform.objects.all(), to_field_name="name", label="Platform (name or ID)"
+    )
     rack_group = TreeNodeMultipleChoiceFilter(
         queryset=RackGroup.objects.all(),
         field_name="rack__rack_group",
@@ -823,6 +828,7 @@ class DeviceFilterSet(
     )
     secrets_group = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SecretsGroup.objects.all(),
+        to_field_name="name",
         label="Secrets group (slug or ID)",
     )
     # TODO: solve https://github.com/nautobot/nautobot/issues/2875 to use this filter correctly
@@ -838,7 +844,8 @@ class DeviceFilterSet(
     device_redundancy_group = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="device_redundancy_group",
         queryset=DeviceRedundancyGroup.objects.all(),
-        label="Device Redundancy Groups (slug or ID)",
+        to_field_name="name",
+        label="Device Redundancy Groups (name or ID)",
     )
     virtual_chassis_member = is_virtual_chassis_member
     has_console_ports = RelatedMembershipBooleanFilter(
@@ -1251,7 +1258,8 @@ class InventoryItemFilterSet(BaseFilterSet, DeviceComponentModelFilterSetMixin):
     )
     manufacturer = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Manufacturer.objects.all(),
-        label="Manufacturer (slug or ID)",
+        to_field_name="name",
+        label="Manufacturer (name or ID)",
     )
     # TODO: solve https://github.com/nautobot/nautobot/issues/2875 to use this filter correctly
     children = NaturalKeyOrPKMultipleChoiceFilter(
@@ -1323,7 +1331,7 @@ class CableFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
         method="filter_device", field_name="device__location__slug", label="Location (name)"
     )
     tenant_id = MultiValueUUIDFilter(method="filter_device", field_name="device__tenant_id", label="Tenant (ID)")
-    tenant = MultiValueCharFilter(method="filter_device", field_name="device__tenant__slug", label="Tenant (name)")
+    tenant = MultiValueCharFilter(method="filter_device", field_name="device__tenant__name", label="Tenant (name)")
     termination_a_type = ContentTypeMultipleChoiceFilter(
         choices=FeatureQuery("cable_terminations").get_choices,
         conjoined=False,
@@ -1332,6 +1340,14 @@ class CableFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
         choices=FeatureQuery("cable_terminations").get_choices,
         conjoined=False,
     )
+    termination_type = ContentTypeMultipleChoiceFilter(
+        choices=FeatureQuery("cable_terminations").get_choices,
+        conjoined=False,
+        distinct=True,
+        lookup_expr="in",
+        method="_termination_type",
+        label="Termination (either end) type",
+    )
 
     class Meta:
         model = Cable
@@ -1351,6 +1367,19 @@ class CableFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
         )
         return queryset
 
+    def generate_query__termination_type(self, value):
+        a_type_q = Q()
+        b_type_q = Q()
+        for label in value:
+            app_label, model = label.split(".")
+            a_type_q |= Q(termination_a_type__app_label=app_label, termination_a_type__model=model)
+            b_type_q |= Q(termination_b_type__app_label=app_label, termination_b_type__model=model)
+        return a_type_q | b_type_q
+
+    @extend_schema_field({"type": "string"})
+    def _termination_type(self, queryset, name, value):
+        return queryset.filter(self.generate_query__termination_type(value)).distinct()
+
 
 class ConnectionFilterSetMixin:
     def filter_location(self, queryset, name, value):
@@ -1475,10 +1504,10 @@ class DeviceRedundancyGroupFilterSet(NautobotFilterSet, StatusModelFilterSetMixi
     q = SearchFilter(filter_predicates={"name": "icontains", "comments": "icontains"})
     secrets_group = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=SecretsGroup.objects.all(),
-        to_field_name="slug",
-        label="Secrets group",
+        to_field_name="name",
+        label="Secrets group (name or ID)",
     )
 
     class Meta:
         model = DeviceRedundancyGroup
-        fields = ["id", "name", "slug", "failover_strategy", "tags"]
+        fields = ["id", "name", "failover_strategy", "tags"]

nautobot/dcim/form_mixins.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib.contenttypes.models import ContentType
 
-from nautobot.core.forms import CSVModelChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField
+from nautobot.core.forms import DynamicModelChoiceField, DynamicModelMultipleChoiceField
 from nautobot.dcim.models import Location
 
 
@@ -50,32 +50,6 @@ class LocatableModelBulkEditFormMixin(forms.Form):
         )
 
 
-class LocatableModelCSVFormMixin(forms.Form):
-    """
-    Mixin for CSV forms that can be associated to a Location.
-    """
-
-    location = CSVModelChoiceField(
-        queryset=Location.objects.all(),
-        to_field_name="name",
-        help_text="Assigned location",
-    )
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Set the `required` flag on the `location` field and widget based on the model attributes
-        self.fields["location"].required = not (
-            self.Meta.model.location.field.null and self.Meta.model.location.field.blank
-        )
-        self.fields["location"].widget.attrs["required"] = self.fields["location"].required
-
-        # Filter the `location` widget to only select locations that permit this content-type
-        self.fields["location"].queryset = Location.objects.filter(
-            location_type__content_types=ContentType.objects.get_for_model(self.Meta.model)
-        )
-
-
 class LocatableModelFilterFormMixin(forms.Form):
     """
     Mixin for filterset forms that can filter by Location.