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

nautobot/extras/forms/forms.py

@@ -6,7 +6,6 @@ from django.core.exceptions import ValidationError
 from django.db.models.fields import TextField
 from django.forms import ModelMultipleChoiceField, inlineformset_factory
 from django.urls.base import reverse
-from django.utils.safestring import mark_safe
 
 from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
 from nautobot.core.forms import (
@@ -19,10 +18,7 @@ from nautobot.core.forms import (
     ColorSelect,
     CommentField,
     CSVContentTypeField,
-    CSVModelChoiceField,
     CSVModelForm,
-    CSVMultipleChoiceField,
-    CSVMultipleContentTypeField,
     DateTimePicker,
     DynamicModelChoiceField,
     DynamicModelMultipleChoiceField,
@@ -113,7 +109,6 @@ __all__ = (
     "ExportTemplateForm",
     "ExportTemplateFilterForm",
     "GitRepositoryForm",
-    "GitRepositoryCSVForm",
     "GitRepositoryBulkEditForm",
     "GitRepositoryFilterForm",
     "GraphQLQueryForm",
@@ -139,21 +134,17 @@ __all__ = (
     "RelationshipFilterForm",
     "RelationshipAssociationFilterForm",
     "RoleBulkEditForm",
-    "RoleCSVForm",
     "RoleForm",
     "ScheduledJobFilterForm",
     "SecretForm",
-    "SecretCSVForm",
     "SecretFilterForm",
     "SecretsGroupForm",
     "SecretsGroupFilterForm",
     "SecretsGroupAssociationFormSet",
     "StatusForm",
-    "StatusCSVForm",
     "StatusFilterForm",
     "StatusBulkEditForm",
     "TagForm",
-    "TagCSVForm",
     "TagFilterForm",
     "TagBulkEditForm",
     "WebhookForm",
@@ -172,7 +163,9 @@ class ComputedFieldForm(BootstrapMixin, forms.ModelForm):
         required=True,
         label="Content Type",
     )
-    slug = SlugField(
+    key = SlugField(
+        label="Key",
+        max_length=50,
         slug_source="label",
         help_text="Internal name of this field. Please use underscores rather than dashes.",
     )
@@ -189,7 +182,7 @@ class ComputedFieldForm(BootstrapMixin, forms.ModelForm):
         fields = (
             "content_type",
             "label",
-            "slug",
+            "key",
             "description",
             "template",
             "fallback_value",
@@ -197,6 +190,12 @@ class ComputedFieldForm(BootstrapMixin, forms.ModelForm):
             "advanced_ui",
         )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if self.instance and self.instance.present_in_database:
+            self.fields["key"].widget.attrs["readonly"] = True
+
 
 class ComputedFieldFilterForm(BootstrapMixin, forms.Form):
     model = ComputedField
@@ -284,24 +283,24 @@ class ConfigContextFilterForm(BootstrapMixin, forms.Form):
     schema = DynamicModelChoiceField(queryset=ConfigContextSchema.objects.all(), to_field_name="slug", required=False)
     location = DynamicModelMultipleChoiceField(queryset=Location.objects.all(), to_field_name="slug", required=False)
     role = DynamicModelMultipleChoiceField(
-        queryset=Role.objects.get_for_models([Device, VirtualMachine]), to_field_name="slug", required=False
+        queryset=Role.objects.get_for_models([Device, VirtualMachine]), to_field_name="name", required=False
     )
     type = DynamicModelMultipleChoiceField(queryset=DeviceType.objects.all(), to_field_name="slug", required=False)
-    platform = DynamicModelMultipleChoiceField(queryset=Platform.objects.all(), to_field_name="slug", required=False)
+    platform = DynamicModelMultipleChoiceField(queryset=Platform.objects.all(), to_field_name="name", required=False)
     cluster_group = DynamicModelMultipleChoiceField(
-        queryset=ClusterGroup.objects.all(), to_field_name="slug", required=False
+        queryset=ClusterGroup.objects.all(), to_field_name="name", required=False
     )
     cluster_id = DynamicModelMultipleChoiceField(queryset=Cluster.objects.all(), required=False, label="Cluster")
     tenant_group = DynamicModelMultipleChoiceField(
-        queryset=TenantGroup.objects.all(), to_field_name="slug", required=False
+        queryset=TenantGroup.objects.all(), to_field_name="name", required=False
     )
-    tenant = DynamicModelMultipleChoiceField(queryset=Tenant.objects.all(), to_field_name="slug", required=False)
+    tenant = DynamicModelMultipleChoiceField(queryset=Tenant.objects.all(), to_field_name="name", required=False)
     device_redundancy_group = DynamicModelMultipleChoiceField(
-        queryset=DeviceRedundancyGroup.objects.all(), to_field_name="slug", required=False
+        queryset=DeviceRedundancyGroup.objects.all(), to_field_name="name", required=False
     )
     tag = DynamicModelMultipleChoiceField(queryset=Tag.objects.all(), to_field_name="slug", required=False)
     dynamic_groups = DynamicModelMultipleChoiceField(
-        queryset=DynamicGroup.objects.all(), to_field_name="slug", required=False
+        queryset=DynamicGroup.objects.all(), to_field_name="name", required=False
     )
 
     def __init__(self, *args, **kwargs):
@@ -401,9 +400,21 @@ class CustomFieldForm(BootstrapMixin, forms.ModelForm):
             "validation_regex",
         )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if self.instance and self.instance.present_in_database:
+            self.fields["key"].widget.attrs["readonly"] = True
+
 
 class CustomFieldModelCSVForm(CSVModelForm, CustomFieldModelFormMixin):
-    """Base class for CSV export of models that support custom fields."""
+    """
+    Base class for CSV/JSON/YAML import of models that support custom fields.
+
+    TODO: The class name is a misnomer; as of 2.0 this class is **not** used for any CSV imports,
+    as that's now handled by the REST API. However it is still used when importing component-templates as
+    part of a JSON/YAML DeviceType import.
+    """
 
     def _append_customfield_fields(self):
         # Append form fields
@@ -464,7 +475,6 @@ class CustomLinkFilterForm(BootstrapMixin, forms.Form):
 class DynamicGroupForm(NautobotModelForm):
     """DynamicGroup model form."""
 
-    slug = SlugField()
     content_type = CSVContentTypeField(
         queryset=ContentType.objects.filter(FeatureQuery("dynamic_groups").get_query()).order_by("app_label", "model"),
         label="Content Type",
@@ -474,7 +484,6 @@ class DynamicGroupForm(NautobotModelForm):
         model = DynamicGroup
         fields = [
             "name",
-            "slug",
             "description",
             "content_type",
         ]
@@ -613,36 +622,24 @@ class GitRepositoryForm(BootstrapMixin, RelationshipModelFormMixin):
             "tags",
         ]
 
-    def clean(self):
-        super().clean()
-
-        # set dryrun after a successful clean
-        if "_dryrun_create" in self.data or "_dryrun_update" in self.data:
-            self.instance.set_dryrun()
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
+        if self.instance and self.instance.present_in_database:
+            self.fields["slug"].widget.attrs["readonly"] = True
 
-class GitRepositoryCSVForm(CSVModelForm):
-    secrets_group = CSVModelChoiceField(
-        queryset=SecretsGroup.objects.all(),
-        to_field_name="name",
-        required=False,
-        help_text="Secrets group for repository access (if any)",
-    )
+    def save(self, commit=True):
+        instance = super().save(commit=commit)
 
-    class Meta:
-        model = GitRepository
-        fields = GitRepository.csv_headers
+        # TODO(jathan): Move sync() call out of the form and into the view. However, in v2 UI this
+        # probably just goes away since UI views will be making API calls. For now, the user is
+        # magically stored on the instance by the view code.
+        if commit:
+            # Set dryrun if that button was clicked in the UI, otherwise perform a normal sync.
+            dry_run = "_dryrun_create" in self.data or "_dryrun_update" in self.data
+            instance.sync(user=instance.user, dry_run=dry_run)
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields["provided_contents"] = CSVMultipleChoiceField(
-            choices=get_git_datasource_content_choices(),
-            required=False,
-            help_text=mark_safe(
-                "The data types this repository provides. Multiple values must be comma-separated and wrapped in "
-                'double quotes (e.g. <code>"extras.job,extras.configcontext"</code>).'
-            ),
-        )
+        return instance
 
 
 class GitRepositoryBulkEditForm(NautobotBulkEditForm):
@@ -682,14 +679,12 @@ class GitRepositoryFilterForm(BootstrapMixin, forms.Form):
 
 
 class GraphQLQueryForm(BootstrapMixin, forms.ModelForm):
-    slug = SlugField()
     query = TextField()
 
     class Meta:
         model = GraphQLQuery
         fields = (
             "name",
-            "slug",
             "query",
         )
 
@@ -727,11 +722,11 @@ class JobForm(BootstrapMixin, forms.Form):
     controlled by the job definition. See `nautobot.extras.jobs.BaseJob.as_form`
     """
 
-    _commit = forms.BooleanField(
+    _profile = forms.BooleanField(
         required=False,
-        initial=True,
-        label="Commit changes",
-        help_text="Commit changes to the database (uncheck for a dry-run)",
+        initial=False,
+        label="Profile job execution",
+        help_text="Profiles the job execution using cProfile and outputs a report to /tmp/",
     )
     _task_queue = forms.ChoiceField(
         required=False,
@@ -742,27 +737,16 @@ class JobForm(BootstrapMixin, forms.Form):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        # Move _task_queue and _commit to the end of the form
-        task_queue = self.fields.pop("_task_queue")
-        self.fields["_task_queue"] = task_queue
-        commit = self.fields.pop("_commit")
-        self.fields["_commit"] = commit
-
-    @property
-    def requires_input(self):
-        """
-        A boolean indicating whether the form requires user input (ignore the _commit field).
-        """
-        return bool(len(self.fields) > 1)
+        # Move special fields to the end of the form
+        for field in ["_task_queue", "_profile"]:
+            value = self.fields.pop(field)
+            self.fields[field] = value
 
 
 class JobEditForm(NautobotModelForm):
-    slug = SlugField()
-
     class Meta:
         model = Job
         fields = [
-            "slug",
             "enabled",
             "name_override",
             "name",
@@ -770,12 +754,10 @@ class JobEditForm(NautobotModelForm):
             "grouping",
             "description_override",
             "description",
-            "commit_default_override",
-            "commit_default",
+            "dryrun_default_override",
+            "dryrun_default",
             "hidden_override",
             "hidden",
-            "read_only_override",
-            "read_only",
             "approval_required_override",
             "approval_required",
             "soft_time_limit_override",
@@ -814,7 +796,7 @@ class JobFilterForm(BootstrapMixin, forms.Form):
     has_sensitive_variables = forms.NullBooleanField(
         required=False, widget=StaticSelect2(choices=BOOLEAN_WITH_BLANK_CHOICES)
     )
-    commit_default = forms.NullBooleanField(required=False, widget=StaticSelect2(choices=BOOLEAN_WITH_BLANK_CHOICES))
+    dryrun_default = forms.NullBooleanField(required=False, widget=StaticSelect2(choices=BOOLEAN_WITH_BLANK_CHOICES))
     hidden = forms.NullBooleanField(
         initial=False,
         required=False,
@@ -1142,7 +1124,12 @@ class ObjectChangeFilterForm(BootstrapMixin, forms.Form):
 
 
 class RelationshipForm(BootstrapMixin, forms.ModelForm):
-    slug = SlugField(help_text="Internal name of this relationship. Please use underscores rather than dashes.")
+    key = SlugField(
+        help_text="Internal name of this relationship. Please use underscores rather than dashes.",
+        label="Key",
+        max_length=50,
+        slug_source="label",
+    )
     source_type = forms.ModelChoiceField(
         queryset=ContentType.objects.filter(FeatureQuery("relationships").get_query()).order_by("app_label", "model"),
         help_text="The source object type to which this relationship applies.",
@@ -1165,8 +1152,8 @@ class RelationshipForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = Relationship
         fields = [
-            "name",
-            "slug",
+            "label",
+            "key",
             "description",
             "type",
             "required_on",
@@ -1181,6 +1168,12 @@ class RelationshipForm(BootstrapMixin, forms.ModelForm):
             "destination_filter",
         ]
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if self.instance and self.instance.present_in_database:
+            self.fields["key"].widget.attrs["readonly"] = True
+
     def save(self, commit=True):
         # TODO add support for owner when a CR is created in the UI
         obj = super().save(commit)
@@ -1207,7 +1200,7 @@ class RelationshipAssociationFilterForm(BootstrapMixin, forms.Form):
 
     relationship = DynamicModelMultipleChoiceField(
         queryset=Relationship.objects.all(),
-        to_field_name="slug",
+        to_field_name="key",
         required=False,
     )
 
@@ -1228,7 +1221,6 @@ class RelationshipAssociationFilterForm(BootstrapMixin, forms.Form):
 class RoleForm(NautobotModelForm):
     """Generic create/update form for `Role` objects."""
 
-    slug = SlugField()
     content_types = MultipleContentTypeField(
         required=False,
         label="Content Type(s)",
@@ -1238,7 +1230,7 @@ class RoleForm(NautobotModelForm):
     class Meta:
         model = Role
         widgets = {"color": ColorSelect()}
-        fields = ["name", "slug", "weight", "description", "content_types", "color"]
+        fields = ["name", "weight", "description", "content_types", "color"]
 
 
 class RoleBulkEditForm(NautobotBulkEditForm):
@@ -1254,28 +1246,6 @@ class RoleBulkEditForm(NautobotBulkEditForm):
         nullable_fields = ["weight"]
 
 
-class RoleCSVForm(CustomFieldModelCSVForm):
-    """Generic CSV bulk import form for `Role` objects."""
-
-    content_types = CSVMultipleContentTypeField(
-        queryset=RoleModelsQuery().as_queryset(),
-        choices_as_strings=True,
-        help_text=mark_safe(
-            "The object types to which this role applies. Multiple values "
-            "must be comma-separated and wrapped in double quotes. (e.g. "
-            '<code>"dcim.device,dcim.rack"</code>)'
-        ),
-        label="Content type(s)",
-    )
-
-    class Meta:
-        model = Role
-        fields = ["name", "slug", "weight", "color", "content_types", "description"]
-        help_texts = {
-            "color": mark_safe("RGB color in hexadecimal (e.g. <code>00ff00</code>)"),
-        }
-
-
 #
 # Secrets
 #
@@ -1288,8 +1258,6 @@ def provider_choices():
 class SecretForm(NautobotModelForm):
     """Create/update form for `Secret` objects."""
 
-    slug = SlugField()
-
     provider = forms.ChoiceField(choices=provider_choices, widget=StaticSelect2())
 
     parameters = JSONField(help_text='Enter parameters in <a href="https://json.org/">JSON</a> format.')
@@ -1298,7 +1266,6 @@ class SecretForm(NautobotModelForm):
         model = Secret
         fields = [
             "name",
-            "slug",
             "description",
             "provider",
             "parameters",
@@ -1306,12 +1273,6 @@ class SecretForm(NautobotModelForm):
         ]
 
 
-class SecretCSVForm(CustomFieldModelCSVForm):
-    class Meta:
-        model = Secret
-        fields = Secret.csv_headers
-
-
 def provider_choices_with_blank():
     return add_blank_choice(sorted([(slug, provider.name) for slug, provider in registry["secrets_providers"].items()]))
 
@@ -1342,13 +1303,10 @@ SecretsGroupAssociationFormSet = inlineformset_factory(
 class SecretsGroupForm(NautobotModelForm):
     """Create/update form for `SecretsGroup` objects."""
 
-    slug = SlugField()
-
     class Meta:
         model = SecretsGroup
         fields = [
             "name",
-            "slug",
             "description",
         ]
 
@@ -1366,35 +1324,12 @@ class SecretsGroupFilterForm(NautobotFilterForm):
 class StatusForm(NautobotModelForm):
     """Generic create/update form for `Status` objects."""
 
-    slug = SlugField()
     content_types = MultipleContentTypeField(feature="statuses", label="Content Type(s)")
 
     class Meta:
         model = Status
         widgets = {"color": ColorSelect()}
-        fields = ["name", "slug", "description", "content_types", "color"]
-
-
-class StatusCSVForm(CustomFieldModelCSVForm):
-    """Generic CSV bulk import form for `Status` objects."""
-
-    content_types = CSVMultipleContentTypeField(
-        feature="statuses",
-        choices_as_strings=True,
-        help_text=mark_safe(
-            "The object types to which this status applies. Multiple values "
-            "must be comma-separated and wrapped in double quotes. (e.g. "
-            '<code>"dcim.device,dcim.rack"</code>)'
-        ),
-        label="Content type(s)",
-    )
-
-    class Meta:
-        model = Status
-        fields = Status.csv_headers
-        help_texts = {
-            "color": mark_safe("RGB color in hexadecimal (e.g. <code>00ff00</code>)"),
-        }
+        fields = ["name", "description", "content_types", "color"]
 
 
 class StatusFilterForm(NautobotFilterForm):
@@ -1449,17 +1384,6 @@ class TagForm(NautobotModelForm):
         return data
 
 
-class TagCSVForm(CustomFieldModelCSVForm):
-    slug = SlugField()
-
-    class Meta:
-        model = Tag
-        fields = Tag.csv_headers
-        help_texts = {
-            "color": mark_safe("RGB color in hexadecimal (e.g. <code>00ff00</code>)"),
-        }
-
-
 class TagFilterForm(NautobotFilterForm):
     model = Tag
     q = forms.CharField(required=False, label="Search")

nautobot/extras/forms/mixins.py

@@ -8,8 +8,6 @@ from django.db.models import Q
 from nautobot.core.forms import (
     BulkEditForm,
     CommentField,
-    CSVModelChoiceField,
-    CSVModelForm,
     DynamicModelChoiceField,
     DynamicModelMultipleChoiceField,
 )
@@ -44,7 +42,6 @@ __all__ = (
     "RelationshipModelFormMixin",
     "StatusModelBulkEditFormMixin",
     "StatusModelFilterFormMixin",
-    "StatusModelCSVFormMixin",
     "TagsBulkEditFormMixin",
     # 2.0 TODO: remove the below deprecated aliases
     "AddRemoveTagsForm",
@@ -53,9 +50,7 @@ __all__ = (
     "CustomFieldModelForm",
     "RelationshipModelForm",
     "RoleModelBulkEditFormMixin",
-    "RoleModelCSVFormMixin",
     "RoleModelFilterFormMixin",
-    "RoleRequiredRoleModelCSVFormMixin",
     "StatusBulkEditFormMixin",
     "StatusFilterFormMixin",
 )
@@ -214,10 +209,10 @@ class RelationshipModelBulkEditFormMixin(BulkEditForm):
             peer_side = RelationshipSideChoices.OPPOSITE[side]
 
             # If this model is on the "source" side of the relationship, then the field will be named
-            # "cr_<relationship-slug>__destination" since it's used to pick the destination object(s).
-            # If we're on the "destination" side, the field will be "cr_<relationship-slug>__source".
-            # For a symmetric relationship, both sides are "peer", so the field will be "cr_<relationship-slug>__peer"
-            field_name = f"cr_{relationship.slug}__{peer_side}"
+            # "cr_<relationship_key>__destination" since it's used to pick the destination object(s).
+            # If we're on the "destination" side, the field will be "cr_<relationship_key>__source".
+            # For a symmetric relationship, both sides are "peer", so the field will be "cr_<relationship_key>__peer"
+            field_name = f"cr_{relationship.key}__{peer_side}"
 
             if field_name in self.relationships:
                 # This is a symmetric relationship that we already processed from the opposing "initial_side".
@@ -257,7 +252,7 @@ class RelationshipModelBulkEditFormMixin(BulkEditForm):
         for side, relationships_data in instance_relationships.items():
             peer_side = RelationshipSideChoices.OPPOSITE[side]
             for relationship, relationshipassociation_queryset in relationships_data.items():
-                field_name = f"cr_{relationship.slug}__{peer_side}"
+                field_name = f"cr_{relationship.key}__{peer_side}"
                 logger.debug(
                     "Processing relationship %s %s (field %s) for instance %s",
                     relationship,
@@ -347,22 +342,25 @@ class RelationshipModelBulkEditFormMixin(BulkEditForm):
     def clean(self):
         # Get any initial required relationship objects errors (i.e. non-existent required objects)
         required_objects_errors = self.model.required_related_objects_errors(output_for="ui")
-        already_invalidated_slugs = []
+        already_invalidated_keys = []
         for field, errors in required_objects_errors.items():
             self.add_error(None, errors)
-            relationship_slug = field.split("__")[0][3:]
-            already_invalidated_slugs.append(relationship_slug)
+            # rindex() find the last occurrence of "__" which is
+            # guaranteed to be cr_{key}__source, cr_{key}__destination, or cr_{key}__peer
+            # regardless of how {key} is formatted
+            relationship_key = field[: field.rindex("__")][3:]
+            already_invalidated_keys.append(relationship_key)
 
         required_relationships = []
         # The following query excludes already invalidated relationships (this happened above
         # by checking for the existence of required objects
         # with the call to self.Meta().model.required_related_objects_errors(output_for="ui"))
         for relationship in Relationship.objects.get_required_for_model(self.model).exclude(
-            slug__in=already_invalidated_slugs
+            key__in=already_invalidated_keys
         ):
             required_relationships.append(
                 {
-                    "slug": relationship.slug,
+                    "key": relationship.key,
                     "required_side": RelationshipSideChoices.OPPOSITE[relationship.required_on],
                     "relationship": relationship,
                 }
@@ -371,7 +369,7 @@ class RelationshipModelBulkEditFormMixin(BulkEditForm):
         # Get difference of add/remove objects for each required relationship:
         required_relationships_to_check = []
         for required_relationship in required_relationships:
-            required_field = f"cr_{required_relationship['slug']}__{required_relationship['required_side']}"
+            required_field = f"cr_{required_relationship['key']}__{required_relationship['required_side']}"
 
             add_list = []
             if f"add_{required_field}" in self.cleaned_data:
@@ -456,10 +454,10 @@ class RelationshipModelFormMixin(forms.ModelForm):
             for relationship, queryset in relationships.items():
                 peer_side = RelationshipSideChoices.OPPOSITE[side]
                 # If this model is on the "source" side of the relationship, then the field will be named
-                # cr_<relationship-slug>__destination since it's used to pick the destination object(s).
-                # If we're on the "destination" side, the field will be cr_<relationship-slug>__source.
-                # For a symmetric relationship, both sides are "peer", so the field will be cr_<relationship-slug>__peer
-                field_name = f"cr_{relationship.slug}__{peer_side}"
+                # cr_<relationship_key>__destination since it's used to pick the destination object(s).
+                # If we're on the "destination" side, the field will be cr_<relationship_key>__source.
+                # For a symmetric relationship, both sides are "peer", so the field will be cr_<relationship_key>__peer
+                field_name = f"cr_{relationship.key}__{peer_side}"
                 self.fields[field_name] = relationship.to_form_field(side=side)
 
                 # HTML5 validation for required relationship field:
@@ -501,7 +499,7 @@ class RelationshipModelFormMixin(forms.ModelForm):
             for relationship in relationships:
                 # The form field name reflects what it provides, i.e. the peer object(s) to link via this relationship.
                 peer_side = RelationshipSideChoices.OPPOSITE[side]
-                field_name = f"cr_{relationship.slug}__{peer_side}"
+                field_name = f"cr_{relationship.key}__{peer_side}"
 
                 # Is the form trying to set this field (create/update a RelationshipAssociation(s))?
                 # If not (that is, clearing the field / deleting RelationshipAssociation(s)), we don't need to check.
@@ -649,11 +647,16 @@ class RelationshipModelFilterFormMixin(forms.Form):
         """
         Append form fields for all Relationships assigned to this model.
         """
-        source_relationships = Relationship.objects.filter(source_type=self.obj_type, source_hidden=False)
-        self._append_relationships_side(source_relationships, RelationshipSideChoices.SIDE_SOURCE)
+        query = Q(source_type=self.obj_type, source_hidden=False) | Q(
+            destination_type=self.obj_type, destination_hidden=False
+        )
+        relationships = Relationship.objects.select_related("source_type", "destination_type").filter(query)
 
-        dest_relationships = Relationship.objects.filter(destination_type=self.obj_type, destination_hidden=False)
-        self._append_relationships_side(dest_relationships, RelationshipSideChoices.SIDE_DESTINATION)
+        for rel in relationships.iterator():
+            if rel.source_type == self.obj_type and not rel.source_hidden:
+                self._append_relationships_side([rel], RelationshipSideChoices.SIDE_SOURCE)
+            if rel.destination_type == self.obj_type and not rel.destination_hidden:
+                self._append_relationships_side([rel], RelationshipSideChoices.SIDE_DESTINATION)
 
     def _append_relationships_side(self, relationships, initial_side):
         """
@@ -667,10 +670,10 @@ class RelationshipModelFilterFormMixin(forms.Form):
             peer_side = RelationshipSideChoices.OPPOSITE[side]
 
             # If this model is on the "source" side of the relationship, then the field will be named
-            # "cr_<relationship-slug>__destination" since it's used to pick the destination object(s).
-            # If we're on the "destination" side, the field will be "cr_<relationship-slug>__source".
-            # For a symmetric relationship, both sides are "peer", so the field will be "cr_<relationship-slug>__peer"
-            field_name = f"cr_{relationship.slug}__{peer_side}"
+            # "cr_<relationship_key>__destination" since it's used to pick the destination object(s).
+            # If we're on the "destination" side, the field will be "cr_<relationship_key>__source".
+            # For a symmetric relationship, both sides are "peer", so the field will be "cr_<relationship_key>__peer"
+            field_name = f"cr_{relationship.key}__{peer_side}"
 
             if field_name in self.relationships:
                 # This is a symmetric relationship that we already processed from the opposing "initial_side".
@@ -710,27 +713,11 @@ class RoleModelFilterFormMixin(forms.Form):
             required=False,
             queryset=Role.objects.all(),
             query_params={"content_types": self.model._meta.label_lower},
-            to_field_name="slug",
+            to_field_name="name",
         )
         self.order_fields(self.field_order)  # Reorder fields again
 
 
-class RoleModelCSVFormMixin(CSVModelForm):
-    """Mixin to add a non-required `role` choice field to CSV import forms."""
-
-    role = CSVModelChoiceField(
-        queryset=Role.objects.all(), to_field_name="name", required=False, help_text="Assigned role"
-    )
-
-
-class RoleRequiredRoleModelCSVFormMixin(CSVModelForm):
-    """Mixin to add a required `role` choice field to CSV import forms."""
-
-    role = CSVModelChoiceField(
-        queryset=Role.objects.all(), to_field_name="name", required=True, help_text="Assigned role"
-    )
-
-
 class StatusModelBulkEditFormMixin(forms.Form):
     """Mixin to add non-required `status` choice field to forms."""
 
@@ -755,21 +742,11 @@ class StatusModelFilterFormMixin(forms.Form):
             required=False,
             queryset=Status.objects.all(),
             query_params={"content_types": self.model._meta.label_lower},
-            to_field_name="slug",
+            to_field_name="name",
         )
         self.order_fields(self.field_order)  # Reorder fields again
 
 
-class StatusModelCSVFormMixin(CSVModelForm):
-    """Mixin to add a required `status` choice field to CSV import forms."""
-
-    status = CSVModelChoiceField(
-        queryset=Status.objects.all(),
-        to_field_name="slug",
-        help_text="Operational status",
-    )
-
-
 class TagsBulkEditFormMixin(forms.Form):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)