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

nautobot/cloud/factory.py

@@ -24,7 +24,6 @@ class CloudAccountFactory(PrimaryModelFactory):
     has_description = NautobotBoolIterator()
     description = factory.Maybe("has_description", factory.Faker("sentence"), "")
     provider = random_instance(Manufacturer, allow_null=False)
-    # TODO: once SecretsGroupFactory is implemented:
     # has_secrets_group = NautobotBoolIterator()
     # secrets_group = factory.Maybe(
     #     "has_secrets_group",
@@ -41,7 +40,6 @@ class CloudResourceTypeFactory(PrimaryModelFactory):
     name = factory.LazyAttributeSequence(lambda o, n: f"{o.provider.name} CloudResourceType {n + 1}")
     has_description = NautobotBoolIterator()
     description = factory.Maybe("has_description", factory.Faker("sentence"), "")
-    # TODO: if we add a `config_schema` here, then CloudNetworkFactory and CloudServiceFactory have to follow it...
 
     @factory.post_generation
     def content_types(self, create, extracted, **kwargs):

nautobot/cloud/filters.py

@@ -74,8 +74,6 @@ class CloudNetworkFilterSet(NautobotFilterSet):
         filter_predicates={
             "name": "icontains",
             "description": "icontains",
-            "parent__name": "icontains",
-            "parent__description": "icontains",
             "cloud_account__name": "icontains",
             "cloud_account__description": "icontains",
             "cloud_resource_type__name": "icontains",
@@ -98,7 +96,6 @@ class CloudNetworkFilterSet(NautobotFilterSet):
         queryset=models.CloudNetwork.objects.all(),
         label="Parent cloud network (name or ID)",
     )
-    prefixes = django_filters.ModelMultipleChoiceFilter(queryset=Prefix.objects.all())
 
     class Meta:
         model = models.CloudNetwork

nautobot/cloud/forms.py

@@ -94,7 +94,6 @@ class CloudNetworkForm(NautobotModelForm):
     )
     parent = DynamicModelChoiceField(
         queryset=CloudNetwork.objects.all(),
-        query_params={"parent__isnull": True},
         required=False,
     )
     namespace = DynamicModelChoiceField(queryset=Namespace.objects.all(), required=False)
@@ -188,12 +187,7 @@ class CloudNetworkFilterForm(NautobotFilterForm):
     cloud_account = DynamicModelMultipleChoiceField(
         queryset=CloudAccount.objects.all(), to_field_name="name", required=False
     )
-    parent = DynamicModelMultipleChoiceField(
-        queryset=CloudNetwork.objects.all(),
-        query_params={"parent__isnull": True},
-        to_field_name="name",
-        required=False,
-    )
+    parent = DynamicModelMultipleChoiceField(queryset=CloudNetwork.objects.all(), to_field_name="name", required=False)
     tags = TagFilterField(model)
 
 

nautobot/cloud/migrations/0001_initial.py

@@ -271,7 +271,7 @@ class Migration(migrations.Migration):
             field=models.ForeignKey(
                 blank=True,
                 null=True,
-                on_delete=django.db.models.deletion.PROTECT,
+                on_delete=django.db.models.deletion.SET_NULL,
                 related_name="children",
                 to="cloud.cloudnetwork",
             ),

nautobot/cloud/models.py

@@ -14,6 +14,7 @@ from nautobot.extras.utils import FeatureQuery, extras_features
 @extras_features(
     "custom_links",
     "custom_validators",
+    "dynamic_groups",
     "export_templates",
     "graphql",
     "webhooks",
@@ -136,7 +137,7 @@ class CloudNetwork(CloudResourceTypeMixin, PrimaryModel):
     description = models.CharField(max_length=CHARFIELD_MAX_LENGTH, blank=True)
     cloud_account = models.ForeignKey(to=CloudAccount, on_delete=models.PROTECT, related_name="cloud_networks")
     parent = models.ForeignKey(
-        to="cloud.CloudNetwork", on_delete=models.PROTECT, blank=True, null=True, related_name="children"
+        to="cloud.CloudNetwork", on_delete=models.SET_NULL, blank=True, null=True, related_name="children"
     )
     prefixes = models.ManyToManyField(
         blank=True,

nautobot/cloud/tables.py

@@ -7,8 +7,9 @@ from nautobot.core.tables import (
     TagColumn,
     ToggleColumn,
 )
+from nautobot.tenancy.tables import TenantColumn
 
-from .models import CloudAccount, CloudNetwork, CloudResourceType, CloudService
+from .models import CloudAccount, CloudNetwork, CloudNetworkPrefixAssignment, CloudResourceType, CloudService
 
 
 class CloudAccountTable(BaseTable):
@@ -94,6 +95,21 @@ class CloudNetworkTable(BaseTable):
         )
 
 
+class CloudNetworkPrefixAssignmentTable(BaseTable):
+    cloud_network = tables.Column(
+        verbose_name="Cloud Network",
+        linkify=lambda record: record.cloud_network.get_absolute_url(),
+        accessor="cloud_network.name",
+    )
+    prefix = tables.Column(linkify=True)
+    rd = tables.Column(accessor="vrf.rd", verbose_name="RD")
+    tenant = TenantColumn(accessor="vrf.tenant")
+
+    class Meta(BaseTable.Meta):
+        model = CloudNetworkPrefixAssignment
+        fields = ("cloud_network", "prefix", "rd", "tenant")
+
+
 class CloudResourceTypeTable(BaseTable):
     pk = ToggleColumn()
     name = tables.Column(linkify=True)

nautobot/cloud/templates/cloud/cloudnetwork_retrieve.html

@@ -100,7 +100,13 @@
                 </tr>
                 <tr>
                     <td>Parent</td>
-                    <td>{{ object.parent|hyperlinked_object }}</td>
+                    <td>
+                        {% if object.parent %}
+                            {{ object.parent|hyperlinked_object }}
+                        {% else %}
+                            <span class="text-muted">&mdash;</span>
+                        {% endif %}
+                    </td>
                 </tr>
                 <tr>
                     <td>Description</td>

nautobot/cloud/templates/cloud/cloudresourcetype_retrieve.html

@@ -60,17 +60,6 @@
     </div>
 {% endblock content_left_page %}
 
-{% block content_right_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Config Schema</strong>
-        </div>
-        <div class="panel-body">
-            <pre>{{ object.config_schema|render_json }}</pre>
-        </div>
-    </div>
-{% endblock content_right_page %}
-
 {% block extra_tab_content %}
     {% if networks_count %}
         <div id="networks" role="tabpanel" class="tab-pane {% if not active_tab and not request.GET.tab or request.GET.tab == "networks" %}active{% else %}fade{% endif %}">

nautobot/cloud/templates/cloud/cloudservice_retrieve.html

@@ -49,10 +49,6 @@
                 <td>Cloud Resource Type</td>
                 <td>{{ object.cloud_resource_type|hyperlinked_object }}</td>
             </tr>
-            <tr>
-                <td>Description</td>
-                <td>{{ object.description|placeholder }}</td>
-            </tr>
         </table>
     </div>
 {% endblock content_left_page %}

nautobot/cloud/tests/test_filters.py

@@ -65,18 +65,6 @@ class CloudNetworkTestCase(FilterTestCases.NameOnlyFilterTestCase):
         ("parent", "parent__id"),
         ("parent", "parent__name"),
     ]
-    exclude_q_filter_predicates = [
-        "parent__name",
-        "parent__description",
-    ]
-
-    def _get_relevant_filterset_queryset(self, queryset, *filter_params):
-        queryset = super()._get_relevant_filterset_queryset(queryset, *filter_params)
-        if "name" in filter_params or "description" in filter_params:
-            # Only select an instance with no children as otherwise the search will also match the children,
-            # due to `parent__name` and `parent__description` also being search parameters
-            queryset = queryset.filter(children__isnull=True)
-        return queryset
 
 
 class CloudNetworkPrefixAssignmentTestCase(FilterTestCases.FilterTestCase):

nautobot/core/filters.py

@@ -6,11 +6,9 @@ from django import forms as django_forms
 from django.conf import settings
 from django.db import models
 from django.forms.utils import ErrorDict, ErrorList
-from django.utils.encoding import force_str
-from django.utils.text import capfirst
 import django_filters
 from django_filters.constants import EMPTY_VALUES
-from django_filters.utils import get_model_field, label_for_filter, resolve_field, verbose_lookup_expr
+from django_filters.utils import get_model_field, resolve_field
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field
 
@@ -722,18 +720,6 @@ class BaseFilterSet(django_filters.FilterSet):
                 # Of course setting the negation of the existing filter's exclude attribute handles both cases
                 new_filter.exclude = not filter_field.exclude
 
-            # If the base filter_field has a custom label, django_filters won't adjust it for the new_filter lookup,
-            # so we have to do it.
-            if filter_field.label and filter_field.label != label_for_filter(
-                cls.Meta.model, filter_field.field_name, filter_field.lookup_expr, filter_field.exclude
-            ):
-                # Lightly adjusted from label_for_filter() implementation:
-                verbose_expression = ["exclude", filter_field.label] if new_filter.exclude else [filter_field.label]
-                if isinstance(lookup_expr, str):
-                    verbose_expression.append(verbose_lookup_expr(lookup_expr))
-                verbose_expression = [force_str(part) for part in verbose_expression if part]
-                new_filter.label = capfirst(" ".join(verbose_expression))
-
             magic_filters[new_filter_name] = new_filter
 
         return magic_filters

nautobot/core/forms/forms.py

@@ -59,13 +59,6 @@ class AddressFieldMixin(forms.ModelForm):
 class BootstrapMixin(forms.BaseForm):
     """
     Add the base Bootstrap CSS classes to form elements.
-
-    Note that this only applies to form fields that are:
-
-    1. statically defined on the form class at declaration time, or
-    2. dynamically added to the form at init time by a class **later in the MRO than this mixin**.
-
-    If a class earlier in the MRO adds its own fields, it will have to ensure that the widgets are correctly configured.
     """
 
     def __init__(self, *args, **kwargs):
@@ -80,9 +73,8 @@ class BootstrapMixin(forms.BaseForm):
 
         for field in self.fields.values():
             if field.widget.__class__ not in exempt_widgets:
-                css_classes = field.widget.attrs.get("class", "")
-                if "form-control" not in css_classes:
-                    field.widget.attrs["class"] = " ".join([css_classes, "form-control"]).strip()
+                css = field.widget.attrs.get("class", "")
+                field.widget.attrs["class"] = " ".join([css, "form-control"]).strip()
             if field.required and not isinstance(field.widget, forms.FileInput):
                 field.widget.attrs["required"] = "required"
             if "placeholder" not in field.widget.attrs:

nautobot/core/graphql/generators.py

@@ -64,8 +64,8 @@ def generate_filter_resolver(schema_type, resolver_name, field_name):
     """
     filterset_class = schema_type._meta.filterset_class
 
-    def resolve_filter(self, info, **kwargs):
-        if not filterset_class or not kwargs:
+    def resolve_filter(self, *args, **kwargs):
+        if not filterset_class:
             return getattr(self, field_name).all()
 
         # Inverse of substitution logic from get_filtering_args_from_filterset() - transform "_type" back to "type"

nautobot/core/graphql/schema.py

@@ -4,7 +4,6 @@ from collections import OrderedDict
 import logging
 
 from django.conf import settings
-from django.contrib.contenttypes.fields import GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.core.validators import ValidationError
 from django.db.models import ManyToManyField
@@ -206,7 +205,8 @@ def extend_schema_type_filter(schema_type, model):
         (DjangoObjectType): The extended schema_type object
     """
     for field in model._meta.get_fields():
-        if not isinstance(field, (ManyToManyField, ManyToManyRel, ManyToOneRel, GenericRelation)):
+        # Check whether attribute is a ManyToOne or ManyToMany field
+        if not isinstance(field, (ManyToManyField, ManyToManyRel, ManyToOneRel)):
             continue
         # OneToOneRel is a subclass of ManyToOneRel, but we don't want to treat it as a list
         if isinstance(field, OneToOneRel):
@@ -374,9 +374,16 @@ def extend_schema_type_config_context(schema_type, model):
 
 def extend_schema_type_global_features(schema_type, model):
     """
-    Extend schema_type object to have attributes and resolvers for global features (dynamic groups, etc.).
+    Extend schema_type object to have attributes and resolvers for global features (contacts, dynamic groups, etc.).
     """
-    # associated_contacts and associated_object_metadata are handled elsewhere by extend_schema_type_filter()
+    if getattr(model, "is_contact_associable_model", False):
+
+        def resolve_associated_contacts(self, args):
+            return self.associated_contacts.all()
+
+        setattr(schema_type, "resolve_associated_contacts", resolve_associated_contacts)
+        schema_type._meta.fields["associated_contacts"] = graphene.Field.mounted(graphene.List(ContactAssociationType))
+
     if getattr(model, "is_dynamic_group_associable_model", False):
 
         def resolve_dynamic_groups(self, args):
@@ -392,9 +399,10 @@ def extend_schema_type_relationships(schema_type, model):
     """Extend the schema type with attributes and resolvers corresponding
     to the relationships associated with this model."""
 
+    ct = ContentType.objects.get_for_model(model)
     relationships_by_side = {
-        "source": Relationship.objects.get_for_model_source(model),
-        "destination": Relationship.objects.get_for_model_destination(model),
+        "source": Relationship.objects.filter(source_type=ct),
+        "destination": Relationship.objects.filter(destination_type=ct),
     }
 
     prefix = ""

nautobot/core/jobs/__init__.py

@@ -1,4 +1,3 @@
-import codecs
 import contextlib
 from io import BytesIO
 
@@ -297,9 +296,7 @@ class ImportObjects(Job):
         if not csv_data and not csv_file:
             raise RunJobTaskFailed("Either csv_data or csv_file must be provided")
         if csv_file:
-            # data_encoding is utf-8 and file_encoding is utf-8-sig
-            # Bytes read from the original file are decoded according to file_encoding, and the result is encoded using data_encoding.
-            csv_bytes = codecs.EncodedFile(csv_file, "utf-8", "utf-8-sig")
+            csv_bytes = csv_file
         else:
             csv_bytes = BytesIO(csv_data.encode("utf-8"))
 

nautobot/core/management/commands/generate_test_data.py

@@ -329,8 +329,6 @@ class Command(BaseCommand):
         )
         _create_batch(MetadataChoiceFactory, 100)
         _create_batch(ObjectChangeFactory, 100)
-        _create_batch(JobResultFactory, 20)
-        _create_batch(JobLogEntryFactory, 100)
         _create_batch(ObjectMetadataFactory, 100)
         _create_batch(
             ObjectMetadataFactory,
@@ -346,6 +344,8 @@ class Command(BaseCommand):
             has_contact=False,
             description="with teams",
         )
+        _create_batch(JobResultFactory, 20)
+        _create_batch(JobLogEntryFactory, 100)
 
     def handle(self, *args, **options):
         if options["flush"]:

nautobot/core/models/__init__.py

@@ -54,11 +54,11 @@ class BaseModel(models.Model):
     is_saved_view_model = False  # SavedViewMixin overrides this to default True
     is_cloud_resource_type_model = False  # CloudResourceTypeMixin overrides this to default True
 
-    associated_object_metadata = GenericRelation(
+    associated_object_metadatas = GenericRelation(
         "extras.ObjectMetadata",
         content_type_field="assigned_object_type",
         object_id_field="assigned_object_id",
-        related_query_name="associated_object_metadata_%(app_label)s_%(class)s",  # e.g. 'associated_object_metadata_dcim_device'
+        related_query_name="associated_object_metadatas_%(app_label)s_%(class)s",  # e.g. 'associated_object_metadatas_dcim_device'
     )
 
     class Meta:

nautobot/core/settings.py

@@ -892,24 +892,13 @@ CELERY_TASK_TRACK_STARTED = True
 # If enabled, a `task-sent` event will be sent for every task so tasks can be tracked before they're consumed by a worker.
 CELERY_TASK_SEND_SENT_EVENT = True
 
-# How many tasks a worker is allowed to reserve for its own consumption and execution.
-# If set to zero (not recommended) a single worker can reserve all tasks even if other workers are free.
-# For short running tasks (such as webhooks) you may want to set this to a larger number to increase throughput.
-# Conversely, for long running tasks (such as SSoT or Golden-Config Jobs at scale) you may want to set this to 1
-# so that a worker executing a long-running task will not prefetch other tasks, which would block their execution
-# until the long-running task completes.
-# https://docs.celeryq.dev/en/stable/userguide/optimizing.html#prefetch-limits
-CELERY_WORKER_PREFETCH_MULTIPLIER = int(os.getenv("NAUTOBOT_CELERY_WORKER_PREFETCH_MULTIPLIER", "4"))
-
 # If enabled stdout and stderr of running jobs will be redirected to the task logger.
 CELERY_WORKER_REDIRECT_STDOUTS = is_truthy(os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS", "True"))
 
-# The log level of log messages generated by redirected job stdout and stderr.
-# Can be one of `DEBUG`, `INFO`, `WARNING`, `ERROR`, or `CRITICAL`.
+# The log level of log messages generated by redirected job stdout and stderr. Can be one of `DEBUG`, `INFO`, `WARNING`, `ERROR`, or `CRITICAL`.
 CELERY_WORKER_REDIRECT_STDOUTS_LEVEL = os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS_LEVEL", "WARNING")
 
-# Send task-related events so that tasks can be monitored using tools like flower.
-# Sets the default value for the workers -E argument.
+# Send task-related events so that tasks can be monitored using tools like flower. Sets the default value for the workers -E argument.
 CELERY_WORKER_SEND_TASK_EVENTS = True
 
 # Default celery queue name that will be used by workers and tasks if no queue is specified

nautobot/core/settings.yaml

@@ -426,20 +426,6 @@ properties:
     see_also:
       "`CELERY_TASK_SOFT_TIME_LIMIT`": "#celery_task_soft_time_limit"
     type: "integer"
-  CELERY_WORKER_PREFETCH_MULTIPLIER:
-    default: 4
-    description: "How many tasks a worker is allowed to reserve for its own consumption and execution."
-    details: >-
-      If set to `0` (not recommended) a single worker can reserve all tasks even if other workers are free.
-      For short running tasks (such as webhooks) you may want to set this to a larger number to increase throughput.
-      Conversely, for long-running tasks (such as SSoT or Golden-Config Jobs at scale) you may want to set this to `1`
-      so that a worker executing a long-running task will not prefetch other tasks, which would block their execution
-      until the long-running task completes.
-    environment_variable: "NAUTOBOT_CELERY_WORKER_PREFETCH_MULTIPLIER"
-    see_also:
-      "Celery documentation": "https://docs.celeryq.dev/en/stable/userguide/optimizing.html#prefetch-limits"
-    type: "integer"
-    version_added: "2.2.9"
   CELERY_WORKER_PROMETHEUS_PORTS:
     default: []
     description: "Ports for Prometheus metric HTTP server running on the celery worker(s)."
@@ -482,8 +468,8 @@ properties:
           If enabling indefinite changelog retention, it is recommended to periodically delete old entries.
           Otherwise, the database may eventually exceed capacity.
 
-      +/- 2.3.0
-          As of Nautobot 2.3.0, changelog cleanup does not run automatically. Use the `Cleanup of ObjectChange records`
+      +/- 2.2.0
+          As of Nautobot 2.2.0, changelog cleanup does not run automatically. Use the `Cleanup of ObjectChange records`
           system Job to handle changelog cleanup; you may schedule this to run automatically like any other Job if
           desired. The `CHANGELOG_RETENTION` setting provides a default age cutoff for the Job but may be overridden
           at runtime if desired.

nautobot/core/tables.py

@@ -155,9 +155,6 @@ class BaseTable(django_tables2.Table):
                     continue
                 if isinstance(column.column, LinkedCountColumn):
                     column_model = lookup.get_model_for_view_name(column.column.viewname)
-                    if column_model is None:
-                        logger.error("Couldn't find model for %s", column.column.viewname)
-                        continue
                     reverse_lookup = column.column.reverse_lookup or next(iter(column.column.url_params.keys()))
                     count_fields.append((column.name, column_model, reverse_lookup))
                     continue

nautobot/core/templates/generic/object_retrieve.html

@@ -106,10 +106,10 @@
             {% endwith %}
         {% endif %}
         {% if object.is_metadata_associable_model and perms.extras.view_objectmetadata %}
-            {% with object.associated_object_metadata.count as om_count %}
+            {% with object.associated_object_metadatas.count as om_count %}
                 {% if om_count %}
-                    <li role="presentation"{% if request.GET.tab == 'object_metadata' %} class="active"{% endif %}>
-                        <a href="{{ object.get_absolute_url }}#object_metadata" onclick="switch_tab(this.href)" aria-controls="object_metadata" role="tab" data-toggle="tab">
+                    <li role="presentation"{% if request.GET.tab == 'object_metadatas' %} class="active"{% endif %}>
+                        <a href="{{ object.get_absolute_url }}#object_metadatas" onclick="switch_tab(this.href)" aria-controls="object_metadatas" role="tab" data-toggle="tab">
                             Object Metadata {% badge om_count %}
                         </a>
                     </li>
@@ -246,7 +246,7 @@
             </div>
         {% endif %}
         {% if object.is_metadata_associable_model and perms.extras.view_objectmetadata %}
-            <div id="object_metadata" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadata' %}active{% else %}fade{% endif %}">
+            <div id="object_metadatas" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadatas' %}active{% else %}fade{% endif %}">
                 <div class="row">
                     <div class="col-md-12">
                         <form method="post">
@@ -259,7 +259,7 @@
                                     </div>
                                 </div>
                                 <div class="table-responsive">
-                                    {% render_table associated_object_metadata_table 'inc/table.html' %}
+                                    {% render_table associated_object_metadatas_table 'inc/table.html' %}
                                 </div>
                             </div>
                         </form>

nautobot/core/templates/nautobot_config.py.j2

@@ -295,15 +295,6 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 # CELERY_TASK_SOFT_TIME_LIMIT = int(os.getenv("NAUTOBOT_CELERY_TASK_SOFT_TIME_LIMIT", str(5 * 60)))
 # CELERY_TASK_TIME_LIMIT = int(os.getenv("NAUTOBOT_CELERY_TASK_TIME_LIMIT", str(10 * 60)))
 
-# How many tasks a worker is allowed to reserve for its own consumption and execution.
-# If set to zero (not recommended) a single worker can reserve all tasks even if other workers are free.
-# For short running tasks (such as webhooks) you may want to set this to a larger number to increase throughput.
-# Conversely, for long running tasks (such as SSoT or Golden-Config Jobs at scale) you may want to set this to 1
-# so that a worker executing a long-running task will not prefetch other tasks, which would block their execution
-# until the long-running task completes.
-# https://docs.celeryq.dev/en/stable/userguide/optimizing.html#prefetch-limits
-# CELERY_WORKER_PREFETCH_MULTIPLIER = int(os.getenv("NAUTOBOT_CELERY_WORKER_PREFETCH_MULTIPLIER", "4"))
-
 # Ports for prometheus metric HTTP server running on the celery worker.
 # Normally this should be set to a single port, unless you have multiple workers running on a single machine, i.e.
 # sharing the same available ports. In that case you need to specify a range of ports greater than or equal to the
@@ -316,12 +307,6 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 #         int(value) for value in os.getenv("NAUTOBOT_CELERY_WORKER_PROMETHEUS_PORTS").split(",")
 #     ]
 
-# If enabled stdout and stderr of running jobs will be redirected to the task logger.
-# CELERY_WORKER_REDIRECT_STDOUTS = is_truthy(os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS", "True"))
-
-# The log level of log messages generated by redirected job stdout and stderr.
-# Can be one of `DEBUG`, `INFO`, `WARNING`, `ERROR`, or `CRITICAL`.
-# CELERY_WORKER_REDIRECT_STDOUTS_LEVEL = os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS_LEVEL", "WARNING")
 
 # Number of days to retain changelog entries. Set to 0 to retain changes indefinitely. Defaults to 90 if not set here.
 #

nautobot/core/testing/filters.py

@@ -132,17 +132,6 @@ class FilterTestCases:
                     if generic_filter_test not in self.generic_filter_tests:
                         self.generic_filter_tests = (*self.generic_filter_tests, generic_filter_test)
 
-                # Make sure we have at least 3 contacts and 3 teams in the database
-                if Contact.objects.count() < 3:
-                    Contact.objects.create(name="Generic Filter Test Contact 1")
-                    Contact.objects.create(name="Generic Filter Test Contact 2")
-                    Contact.objects.create(name="Generic Filter Test Contact 3")
-
-                if Team.objects.count() < 3:
-                    Team.objects.create(name="Generic Filter Test Team 1")
-                    Team.objects.create(name="Generic Filter Test Team 2")
-                    Team.objects.create(name="Generic Filter Test Team 3")
-
                 # Make sure we have some valid contact-associations:
                 for contact, team, instance in zip(Contact.objects.all()[:3], Team.objects.all()[:3], self.queryset):
                     ContactAssociation.objects.create(
@@ -283,7 +272,7 @@ class FilterTestCases:
             # if lookup_method is iexact use the full updated attr
             if lookup_method == "iexact":
                 lookup = randomized_attr_value.upper()
-                model_queryset = self.queryset.filter(**{f"{filter_field_name}__iexact": lookup})
+                model_queryset = self.queryset.filter(**{f"{filter_field_name}": lookup})
             else:
                 lookup = randomized_attr_value[1:].upper()
                 model_queryset = self.queryset.filter(**{f"{filter_field_name}__icontains": lookup})

nautobot/core/tests/integration/test_general_functionality.py

@@ -24,7 +24,7 @@ class StaticMediaFailureTestCase(SeleniumTestCase):
             reverse("graphql"),
             reverse("api_docs"),
             "/admin/",
-            "/static/docs/index.html",
+            "/static/docs/overview/index.html",
         ]
         for url in test_urls:
             with self.subTest(test_url=url):

nautobot/core/tests/test_jobs.py

@@ -3,27 +3,24 @@ from pathlib import Path
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
-from django.core.files.base import ContentFile
 from django.utils import timezone
 import yaml
 
 from nautobot.core.jobs.cleanup import CleanupTypes
 from nautobot.core.testing import create_job_result_and_run_job, TransactionTestCase
-from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Manufacturer
+from nautobot.dcim.models import DeviceType, Location, LocationType, Manufacturer
 from nautobot.extras.choices import JobResultStatusChoices, LogLevelChoices
 from nautobot.extras.factory import JobResultFactory, ObjectChangeFactory
 from nautobot.extras.models import (
     Contact,
     ContactAssociation,
     ExportTemplate,
-    FileProxy,
     JobLogEntry,
     JobResult,
     ObjectChange,
     Role,
     Status,
 )
-from nautobot.ipam.models import Prefix
 from nautobot.users.models import ObjectPermission
 
 
@@ -221,76 +218,6 @@ class ImportObjectsTestCase(TransactionTestCase):
         )
         self.assertEqual(4, Status.objects.filter(name__startswith="test_status").count())
 
-    def test_csv_import_with_utf_8_with_bom_encoding(self):
-        """
-        A superuser running the job with a .csv file with utf_8 with bom encoding should successfully create all specified objects.
-        Test for bug fix https://github.com/nautobot/nautobot/issues/5812 and https://github.com/nautobot/nautobot/issues/5985
-        """
-
-        status = Status.objects.get(name="Active").pk
-        content = f"prefix,status\n192.168.1.1/32,{status}"
-        content = content.encode("utf-8-sig")
-        filename = "test.csv"
-        csv_file = FileProxy.objects.create(name=filename, file=ContentFile(content, name=filename))
-        job_result = create_job_result_and_run_job(
-            "nautobot.core.jobs",
-            "ImportObjects",
-            content_type=ContentType.objects.get_for_model(Prefix).pk,
-            csv_file=csv_file.id,
-        )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
-        self.assertFalse(
-            JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_WARNING).exists()
-        )
-        self.assertFalse(
-            JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR).exists()
-        )
-        self.assertEqual(
-            1, Prefix.objects.filter(status=Status.objects.get(name="Active"), prefix="192.168.1.1/32").count()
-        )
-        mfr = Manufacturer.objects.create(name="Test Cisco Manufacturer")
-        device_type = DeviceType.objects.create(
-            manufacturer=mfr,
-            model="Cisco CSR1000v",
-            u_height=0,
-        )
-        location_type = LocationType.objects.create(name="Test Location Type")
-        location_type.content_types.set([ContentType.objects.get_for_model(Device)])
-        location = Location.objects.create(
-            name="Device Location",
-            location_type=location_type,
-            status=Status.objects.get_for_model(Location).first(),
-        )
-        role = Role.objects.create(name="Device Status")
-        role.content_types.set([ContentType.objects.get_for_model(Device)])
-        content = "\n".join(
-            [
-                "serial,asset_tag,device_type,location,status,name,role",
-                f"1021C4,CA211,{device_type.pk},{location.pk},{status},Test-AC-01,{role}",
-                f"1021C5,CA212,{device_type.pk},{location.pk},{status},Test-AC-02,{role}",
-            ]
-        )
-        content = content.encode("utf-8-sig")
-        filename = "test.csv"
-        csv_file = FileProxy.objects.create(name=filename, file=ContentFile(content, name=filename))
-        job_result = create_job_result_and_run_job(
-            "nautobot.core.jobs",
-            "ImportObjects",
-            content_type=ContentType.objects.get_for_model(Device).pk,
-            csv_file=csv_file.id,
-        )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
-        self.assertFalse(
-            JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_WARNING).exists()
-        )
-        self.assertFalse(
-            JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR).exists()
-        )
-        device_1 = Device.objects.get(name="Test-AC-01")
-        device_2 = Device.objects.get(name="Test-AC-02")
-        self.assertEqual(device_1.serial, "1021C4")
-        self.assertEqual(device_2.serial, "1021C5")
-
     def test_csv_import_bad_row(self):
         """A row of incorrect data should fail validation for that object but import all others successfully if `roll_back_if_error` is False."""
         csv_data = self.csv_data.split("\n")