nautobot 3.0.0a2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/core/templates/utilities/templatetags/filter_form_drawer.html

@@ -75,14 +75,14 @@
                         </div>
 
                         <div class="d-print-none justify-content-between mb-n20 nb-form-sticky-footer">
-                            <button type="reset" class="btn btn-secondary">
-                                <span aria-hidden="true" class="mdi mdi-close me-4"></span><!--
-                                -->Clear All
-                            </button>
                             <button type="submit" class="btn btn-primary">
                                 <span class="mdi mdi-check me-4" aria-hidden="true"></span><!--
                                 -->Apply Specified
                             </button>
+                            <button type="reset" class="btn btn-secondary">
+                                <span aria-hidden="true" class="mdi mdi-close me-4"></span><!--
+                                -->Clear All
+                            </button>
                         </div>
                     </form>
                 </div>
@@ -124,6 +124,31 @@
                     dynamicFilterForm: document.querySelector('#dynamic-filter-form'),
                 });
 
+                const prepopulateFilterSelectsFromURL = (() => {
+                    const { defaultFilterForm } = getFilterForms();
+                    const urlParams = new URLSearchParams(window.location.search);
+                    // Only target Select2 controls inside the default filter form.
+                    [...defaultFilterForm.querySelectorAll('select.nautobot-select2-multi-value-char')].forEach((el) => {
+                        const name = el.getAttribute('name');
+                        if (!name) { return; }
+                        const values = urlParams.getAll(name);
+                        if (!values.length) { return; }
+                        values.forEach((val) => {
+                            let found = Array.prototype.find.call(el.options, (opt) => {
+                                return String(opt.value) === String(val);
+                            });
+                            if (found) {
+                                found.selected = true;
+                            } else {
+                                el.add(new Option(val, val, true, true));
+                            }
+                        });
+                        if (window.jQuery && $(el).data('select2')) {
+                            $(el).trigger('change');
+                        }
+                    });
+                })();
+
                 /**
                  * Synchronize given `filter` value from default to dynamic filter form.
                  * @param {string} name - Filter name.
@@ -435,6 +460,14 @@
 
                         const { defaultFilterForm, dynamicFilterForm } = getFilterForms();
 
+                        /*
+                         * Just before the form submission automatically add filter selected in "Advanced" tab (if any)
+                         * which hasn't been manually applied for whatever reason (usually forgetfulness, speed, etc.).
+                         * This is a requested UX flavor.
+                         */
+                        const add = dynamicFilterForm.querySelector('button.nb-dynamic-filter-add');
+                        add.click();
+
                         // Remove all field names which are not applied filters container descendants.
                         [...dynamicFilterForm.querySelectorAll('input, select, textarea')].forEach((field) =>
                             field.closest('.nb-dynamic-filter-items') ? undefined : field.removeAttribute('name'),

nautobot/core/templates/utilities/theme_preview.html

@@ -56,7 +56,7 @@
                 {% export_button content_type list_element=True %}
             </ul>
         </div>
-        <div class="btn-group">
+        <div class="dropdown d-inline-flex">
             <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                 Actions
             </button>
@@ -234,11 +234,11 @@
                         <div class="mb-10 d-flex justify-content-center">
                             <label class="col-md-3 col-form-label nb-required" for="id_status">
                                 Status
-                                <span class="form-text">Help text for this form field</span>
                             </label>
                             <div class="col-md-9">
                                 <select name="status" class="nautobot-select2-api form-control select2-hidden-accessible" data-query-param-content_types="[&quot;dcim.device&quot;]" display-field="display" value-field="id" data-depth="0" required="" placeholder="Status" data-url="/api/extras/statuses/" id="id_status">
                                 </select>
+                                <span class="form-text">Help text for this form field</span>
                             </div>
                         </div>
                     </div>
@@ -471,6 +471,15 @@
                                 <button type="button" class="btn btn-link disabled">Link</button>
                             </td>
                         </tr>
+                        <tr>
+                            <td><code>btn-group</code> like radio buttons</td>
+                            <td>
+                                <div class="btn-group" role="group">
+                                    <button type="button" class="btn btn-primary bg-primary nb-text-body-bg">Current Active Option</button>
+                                    <button type="button" class="btn btn-primary">Alternative Option</button>
+                                </div>
+                            </td>
+                        </tr>
                     </table>
                 </div>
             </div>
@@ -1120,15 +1129,19 @@ This:
     <h1>Nautobot Icons</h1>
     <div class="row">
         <div class="col-12">
-            <div class="column-gap-8 d-flex flex-wrap px-20 py-16 rounded row-gap-16" style="background-color: #121a25;">
+            <div class="column-gap-8 d-flex flex-wrap px-20 py-16 rounded row-gap-16" style="background-color: #121212;">
                 <div class="icon-preview"><img alt="360-degrees icon" src="{% static 'nautobot-icons/360-degrees.svg' %}">360-degrees</div>
                 <div class="icon-preview"><img alt="arrow-decision icon" src="{% static 'nautobot-icons/arrow-decision.svg' %}">arrow-decision</div>
                 <div class="icon-preview"><img alt="arrows-expand-rec icon" src="{% static 'nautobot-icons/arrows-expand-rec.svg' %}">arrows-expand-rec</div>
                 <div class="icon-preview"><img alt="arrows-move-rec icon" src="{% static 'nautobot-icons/arrows-move-rec.svg' %}">arrows-move-rec</div>
                 <div class="icon-preview"><img alt="arrows-move-2-rec icon" src="{% static 'nautobot-icons/arrows-move-2-rec.svg' %}">arrows-move-2-rec</div>
                 <div class="icon-preview"><img alt="atom icon" src="{% static 'nautobot-icons/atom.svg' %}">atom</div>
+                <div class="icon-preview"><img alt="power icon" src="{% static 'nautobot-icons/battery-3.svg' %}">battery-3</div>
                 <div class="icon-preview"><img alt="branch icon" src="{% static 'nautobot-icons/branch.svg' %}">branch</div>
                 <div class="icon-preview"><img alt="briefcase-2 icon" src="{% static 'nautobot-icons/briefcase-2.svg' %}">briefcase-2</div>
+                <div class="icon-preview"><img alt="bus-globe icon" src="{% static 'nautobot-icons/bus-globe.svg' %}">bus-globe</div>
+                <div class="icon-preview"><img alt="bus-shield icon" src="{% static 'nautobot-icons/bus-shield.svg' %}">bus-shield</div>
+                <div class="icon-preview"><img alt="bus-shield-check icon" src="{% static 'nautobot-icons/bus-shield-check.svg' %}">bus-shield-check</div>
                 <div class="icon-preview"><img alt="cable-data icon" src="{% static 'nautobot-icons/cable-data.svg' %}">cable-data</div>
                 <div class="icon-preview"><img alt="cable-data-2 icon" src="{% static 'nautobot-icons/cable-data-2.svg' %}">cable-data-2</div>
                 <div class="icon-preview"><img alt="cast icon" src="{% static 'nautobot-icons/cast.svg' %}">cast</div>
@@ -1145,6 +1158,7 @@ This:
                 <div class="icon-preview"><img alt="device-lifecycle icon" src="{% static 'nautobot-icons/device-lifecycle.svg' %}">device-lifecycle</div>
                 <div class="icon-preview"><img alt="direction icon" src="{% static 'nautobot-icons/direction.svg' %}">direction</div>
                 <div class="icon-preview"><img alt="elements icon" src="{% static 'nautobot-icons/elements.svg' %}">elements</div>
+                <div class="icon-preview"><img alt="extensibility icon" src="{% static 'nautobot-icons/extensibility.svg' %}">extensibility</div>
                 <div class="icon-preview"><img alt="globe icon" src="{% static 'nautobot-icons/globe.svg' %}">globe</div>
                 <div class="icon-preview"><img alt="globe-2 icon" src="{% static 'nautobot-icons/globe-2.svg' %}">globe-2</div>
                 <div class="icon-preview"><img alt="hammer icon" src="{% static 'nautobot-icons/hammer.svg' %}">hammer</div>
@@ -1154,6 +1168,7 @@ This:
                 <div class="icon-preview"><img alt="lightning icon" src="{% static 'nautobot-icons/lightning.svg' %}">lightning</div>
                 <div class="icon-preview"><img alt="list-unordered icon" src="{% static 'nautobot-icons/list-unordered.svg' %}">list-unordered</div>
                 <div class="icon-preview"><img alt="map-view icon" src="{% static 'nautobot-icons/map-view.svg' %}">map-view</div>
+                <div class="icon-preview"><img alt="organization icon" src="{% static 'nautobot-icons/organization.svg' %}">organization</div>
                 <div class="icon-preview"><img alt="pin-2 icon" src="{% static 'nautobot-icons/pin-2.svg' %}">pin-2</div>
                 <div class="icon-preview"><img alt="pin-3 icon" src="{% static 'nautobot-icons/pin-3.svg' %}">pin-3</div>
                 <div class="icon-preview"><img alt="plug icon" src="{% static 'nautobot-icons/plug.svg' %}">plug</div>
@@ -1162,6 +1177,7 @@ This:
                 <div class="icon-preview"><img alt="rotate-cw icon" src="{% static 'nautobot-icons/rotate-cw.svg' %}">rotate-cw</div>
                 <div class="icon-preview"><img alt="route icon" src="{% static 'nautobot-icons/route.svg' %}">route</div>
                 <div class="icon-preview"><img alt="secrets icon" src="{% static 'nautobot-icons/secrets.svg' %}">secrets</div>
+                <div class="icon-preview"><img alt="security icon" src="{% static 'nautobot-icons/security.svg' %}">security</div>
                 <div class="icon-preview"><img alt="server icon" src="{% static 'nautobot-icons/server.svg' %}">server</div>
                 <div class="icon-preview"><img alt="server-2 icon" src="{% static 'nautobot-icons/server-2.svg' %}">server-2</div>
                 <div class="icon-preview"><img alt="share icon" src="{% static 'nautobot-icons/share.svg' %}">share</div>

nautobot/core/templates/widgets/number_input_with_choices.html

@@ -0,0 +1,44 @@
+<div class="input-group">
+    {% include 'django/forms/widgets/number.html' %}
+    {% if widget.choices %}
+        <span class="input-group-btn">
+            <button type="button" class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown">
+                <span class="mdi mdi-chevron-down"></span>
+            </button>
+            <ul class="dropdown-menu dropdown-menu-end">
+                {% for value, label in widget.choices %}
+                    <li><a href="#" data-name="{{ widget.name }}" data-value="{{ value }}" class="set_value dropdown-item">{{ label }}</a></li>
+                {% endfor %}
+            </ul>
+        </span>
+    {% endif %}
+</div>
+
+{% if widget.choices %}
+    <script type="text/javascript">
+        (function() {
+            if (window.__nbNumberWithSelectWidgetBound) return;
+            window.__nbNumberWithSelectWidgetBound = true;
+            function bindNumberWithSelectHandler() {
+                document.addEventListener("click", function(e) {
+                    if (!e.target) return;
+                    var link = e.target.closest && e.target.closest("a.set_value");
+                    if (!link) return;
+                    e.preventDefault();
+                    var container = link.closest(".input-group");
+                    var name = link.getAttribute("data-name");
+                    var value = link.getAttribute("data-value");
+                    var input = container && name ? container.querySelector('input[name="' + name + '"]') : null;
+                    if (input) {
+                        input.value = value;
+                    }
+                });
+            }
+            if (document.readyState === 'loading') {
+                document.addEventListener('DOMContentLoaded', bindNumberWithSelectHandler);
+            } else {
+                bindNumberWithSelectHandler();
+            }
+        })();
+    </script>
+{% endif %}

nautobot/core/templates/widgets/selectwithdisabled_option.html

@@ -1 +1,3 @@
-<option value="{{ widget.value }}"{% include "django/forms/widgets/attrs.html" %}{% if widget.label.disabled %} disabled="disabled"{% endif %}>{{ widget.label.label|default:widget.label }}</option>
+<option value="{{ widget.value }}"
+        {% include "django/forms/widgets/attrs.html" %}
+        {% if widget.label.disabled %} disabled{% endif %}>{{ widget.label.label|default:widget.label }}</option>

nautobot/core/templatetags/helpers.py

@@ -1,5 +1,6 @@
 from collections.abc import Iterable
 import datetime
+from importlib import resources
 import json
 import logging
 import re
@@ -7,6 +8,7 @@ from typing import Literal
 from urllib.parse import parse_qs, quote_plus
 
 from django import template
+from django.apps import apps
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.models import AnonymousUser
@@ -14,9 +16,11 @@ from django.contrib.staticfiles.finders import find
 from django.core.exceptions import ObjectDoesNotExist
 from django.templatetags.static import static, StaticNode
 from django.urls import NoReverseMatch, reverse
+from django.utils.formats import date_format
 from django.utils.html import format_html, format_html_join, strip_tags
 from django.utils.safestring import mark_safe
 from django.utils.text import slugify as django_slugify
+from django.utils.translation import gettext as _
 from django_jinja import library
 from markdown import markdown
 import yaml
@@ -122,23 +126,29 @@ def placeholder(value):
 
 @library.filter()
 @register.filter()
-def pre_tag(value):
+def pre_tag(value, format_empty_value=True):
     """Render a value within `<pre></pre>` tags to enable formatting.
 
     Args:
         value (any): Input value, can be any variable.
+        format_empty_value (bool): Whether format empty value or render placeholder.
 
     Returns:
-        (str): Value wrapped in `<pre></pre>` tags.
+        (str): Value wrapped in `<pre></pre>` tags or placeholder if None or format_empty_values=False and empty
 
     Example:
         >>> pre_tag("")
         '<pre></pre>'
         >>> pre_tag("hello")
         '<pre>hello</pre>'
+        >>> pre_tag("", format_empty_value=False)
+        '<span class="text-secondary">&mdash;</span>'
     """
-    if value is not None:
+    if format_empty_value and value is not None:
+        return format_html("<pre>{}</pre>", value)
+    elif value:
         return format_html("<pre>{}</pre>", value)
+
     return HTML_NONE
 
 
@@ -391,17 +401,19 @@ def humanize_speed(speed):
         1544 => "1.544 Mbps"
         100000 => "100 Mbps"
         10000000 => "10 Gbps"
+        1000000000 => "1 Tbps"
+        1600000000 => "1.6 Tbps"
+        10000000000 => "10 Tbps"
     """
     if not speed:
         return ""
-    if speed >= 1000000000 and speed % 1000000000 == 0:
-        return f"{int(speed / 1000000000)} Tbps"
-    elif speed >= 1000000 and speed % 1000000 == 0:
-        return f"{int(speed / 1000000)} Gbps"
-    elif speed >= 1000 and speed % 1000 == 0:
-        return f"{int(speed / 1000)} Mbps"
+
+    if speed >= 1000000000:
+        return f"{speed / 1000000000:g} Tbps"
+    elif speed >= 1000000:
+        return f"{speed / 1000000:g} Gbps"
     elif speed >= 1000:
-        return f"{float(speed) / 1000} Mbps"
+        return f"{speed / 1000:g} Mbps"
     else:
         return f"{speed} Kbps"
 
@@ -483,11 +495,13 @@ def percentage(x, y):
 @library.filter()
 @register.filter()
 def get_docs_url(model):
-    """Return the likely static documentation path for the specified model, if it can be found/predicted.
+    """Return the documentation URL for the specified model, if it can be found/predicted.
 
     - Core models, as of 2.0, are usually at `docs/user-guide/core-data-model/{app_label}/{model_name}.html`.
         - Models in the `extras` app are usually at `docs/user-guide/platform-functionality/{model_name}.html`.
-    - Apps (plugins) are generally expected to be documented at `{app_label}/docs/models/{model_name}.html`.
+    - Apps (plugins) are expected to be documented within their package at
+      ``docs/models/{model_name}.html`` and are served dynamically through
+      the ``AppDocsView`` endpoint (``/docs/<app_name>/<path>``).
 
     Any model can define a `documentation_static_path` class attribute if it needs to override the above expectations.
 
@@ -501,16 +515,36 @@ def get_docs_url(model):
 
     Example:
         >>> get_docs_url(location_instance)
-        "static/docs/models/dcim/location.html"
+        "static/docs/user-guide/core-data-model/dcim/location.html"
+        >>> get_docs_url(virtual_server_instance)
+        "static/docs/user-guide/core-data-model/load-balancers/virtualserver.html"
+        >>> get_docs_url(example_model)
+        "/docs/example-app/models/examplemodel.html"
     """
     if hasattr(model, "documentation_static_path"):
         path = model.documentation_static_path
     elif model._meta.app_label in settings.PLUGINS:
+        app_label = model._meta.app_label
+        app_config = apps.get_app_config(app_label)
+        app_base_url = getattr(app_config, "base_url", None) or app_config.label
+        path = f"models/{model._meta.model_name}.html"
+        # Check that the file actually exists inside the app's docs folder
+        try:
+            base_dir = resources.files(app_label) / "docs"
+            file_path = base_dir / path
+            if file_path.is_file():
+                return reverse("docs_file", kwargs={"app_base_url": app_base_url, "path": path})
+        except ModuleNotFoundError:
+            pass
+        logger.debug("No documentation found for %s (expected at %s)", type(model), path)
+        # define path to try to get static
         path = f"{model._meta.app_label}/docs/models/{model._meta.model_name}.html"
     elif model._meta.app_label == "extras":
         path = f"docs/user-guide/platform-functionality/{model._meta.model_name}.html"
     else:
-        path = f"docs/user-guide/core-data-model/{model._meta.app_label}/{model._meta.model_name}.html"
+        path = (
+            f"docs/user-guide/core-data-model/{model._meta.app_label.replace('_', '-')}/{model._meta.model_name}.html"
+        )
 
     # Check to see if documentation exists in any of the static paths.
     if find(path):
@@ -759,7 +793,7 @@ def render_address(address):
             quote_plus(address),
         )
         address = format_html_join("", "{}<br>", ((line,) for line in address.split("\n")))
-        return format_html('<div class="pull-right d-print-none">{}</div>{}', map_link, address)
+        return format_html('<div class="float-end d-print-none">{}</div>{}', map_link, address)
     return HTML_NONE
 
 
@@ -798,7 +832,11 @@ def render_button_class(value):
     """
     if value:
         base = value.split()[0]
-        return format_html('<button class="btn btn-{}">{}</button>', base.lower(), base.capitalize())
+        return format_html(
+            '<button class="btn btn-{}">{}</button>',
+            base.lower() if base.lower() != "default" else "secondary",
+            base.capitalize(),
+        )
     return ""
 
 
@@ -831,6 +869,26 @@ def label_list(value, suffix=""):
     )
 
 
+@library.filter()
+@register.filter()
+def format_timezone(time_zone):
+    """
+    Return a human-readable representation of a time zone including:
+      - Time zone name and UTC offset on the first line
+      - Local date and time on the next line (in smaller font)
+    """
+    if not time_zone:
+        return HTML_NONE
+
+    now = datetime.datetime.now(time_zone)
+
+    # Locale-aware formatting (respects USE_L10N + active locale)
+    local_time = date_format(now, format="DATETIME_FORMAT", use_l10n=True)
+
+    result = f"{time_zone} (UTC {now.strftime('%z')})<br><small>{_('Local time')}: {local_time}</small>"
+    return format_html(result)
+
+
 #
 # Tags
 #
@@ -899,7 +957,7 @@ def django_querystring(context, query_dict=None, **kwargs):
         {% django_querystring my_query_dict foo=3 %}
     """
     if query_dict is None:
-        query_dict = context.request.GET
+        query_dict = context["request"].GET
     params = query_dict.copy()
     for key, value in kwargs.items():
         if value is None:
@@ -932,7 +990,7 @@ def table_config_button(table, table_name=None, extra_classes="", disabled=False
             <span class="mdi mdi-cog" aria-hidden="true"></span>
             <span class="visually-hidden">Configure</span>
         </button>"""
-    return format_html(html_template, extra_classes, table_name, 'disabled="disabled"' if disabled else "", table_name)
+    return format_html(html_template, extra_classes, table_name, "disabled" if disabled else "", table_name)
 
 
 @register.inclusion_tag("utilities/templatetags/utilization_graph.html")

nautobot/core/testing/api.py

@@ -17,6 +17,7 @@ from rest_framework import serializers, status
 from rest_framework.relations import ManyRelatedField
 from rest_framework.test import APITransactionTestCase as _APITransactionTestCase
 
+from nautobot.core import constants
 from nautobot.core.api.utils import get_serializer_for_model
 from nautobot.core.models import fields as core_fields
 from nautobot.core.models.tree_queries import TreeModel
@@ -294,8 +295,9 @@ class APIViewTestCases:
             m2m_fields = self.get_m2m_fields()
             self.add_permissions(f"{self.model._meta.app_label}.view_{self.model._meta.model_name}")
             list_url = f"{self._get_list_url()}?depth=0"
+            # With exclude_m2m query parameter set to False
             with CaptureQueriesContext(connections[DEFAULT_DB_ALIAS]) as cqc:
-                response = self.client.get(list_url, **self.header)
+                response = self.client.get(list_url + "&exclude_m2m=false", **self.header)
             base_num_queries = len(cqc)
 
             self.assertHttpStatus(response, status.HTTP_200_OK)
@@ -340,9 +342,9 @@ class APIViewTestCases:
                                 app_label, model_name = object_type.split(".")
                                 ContentType.objects.get(app_label=app_label, model=model_name)
 
-            list_url += "&exclude_m2m=true"
+            # With exclude_m2m query parameter set to True
             with CaptureQueriesContext(connections[DEFAULT_DB_ALIAS]) as cqc:
-                response = self.client.get(list_url, **self.header)
+                response = self.client.get(list_url + "&exclude_m2m=true", **self.header)
 
             self.assertHttpStatus(response, status.HTTP_200_OK)
             self.assertIsInstance(response.data, dict)
@@ -387,8 +389,9 @@ class APIViewTestCases:
             m2m_fields = self.get_m2m_fields()
             self.add_permissions(f"{self.model._meta.app_label}.view_{self.model._meta.model_name}")
             list_url = f"{self._get_list_url()}?depth=1"
+            # With exclude_m2m query parameter set to False
             with CaptureQueriesContext(connections[DEFAULT_DB_ALIAS]) as cqc:
-                response = self.client.get(list_url, **self.header)
+                response = self.client.get(list_url + "&exclude_m2m=false", **self.header)
             base_num_queries = len(cqc)
 
             self.assertHttpStatus(response, status.HTTP_200_OK)
@@ -420,9 +423,9 @@ class APIViewTestCases:
                                 self.assertTrue(is_uuid(response_data[field]["id"]))
                             self.assertGreater(len(response_data[field].keys()), 3, response_data[field])
 
-            list_url += "&exclude_m2m=true"
+            # With exclude_m2m query parameter set to True
             with CaptureQueriesContext(connections[DEFAULT_DB_ALIAS]) as cqc:
-                response = self.client.get(list_url, **self.header)
+                response = self.client.get(list_url + "&exclude_m2m=true", **self.header)
 
             self.assertHttpStatus(response, status.HTTP_200_OK)
             self.assertIsInstance(response.data, dict)
@@ -458,6 +461,54 @@ class APIViewTestCases:
                     self.assertNotIn(field, response_data)
                 # TODO: we should assert that all other fields are still present, but there's a few corner cases...
 
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_list_objects_exclude_m2m(self):
+            """
+            GET a list of objects with or without the "exclude_m2m" parameter.
+
+            With exclude_m2m query parameter set to True, we should see no many-to-many fields.
+            With exclude_m2m query parameter set to False, we should see all many-to-many fields.
+            With exclude_m2m query parameter not set, we should only see the default many-to-many fields.
+            """
+            m2m_fields = self.get_m2m_fields()
+            if not m2m_fields:
+                self.skipTest("No many-to-many fields to test")
+            self.add_permissions(f"{self.model._meta.app_label}.view_{self.model._meta.model_name}")
+            list_url = f"{self._get_list_url()}"
+
+            # With exclude_m2m query parameter not set
+            response = self.client.get(list_url, **self.header)
+            self.assertHttpStatus(response, status.HTTP_200_OK)
+            self.assertIsInstance(response.data, dict)
+            self.assertIn("results", response.data)
+
+            for response_data in response.data["results"]:
+                for field in m2m_fields:
+                    if field in constants.DEFAULT_M2M_FIELDS:
+                        self.assertIn(field, response_data)
+                        self.assertIsInstance(response_data[field], list)
+                    else:
+                        self.assertNotIn(field, response_data)
+
+            # With exclude_m2m query parameter set to True
+            response = self.client.get(list_url + "?exclude_m2m=true", **self.header)
+            self.assertHttpStatus(response, status.HTTP_200_OK)
+            self.assertIsInstance(response.data, dict)
+            self.assertIn("results", response.data)
+            for response_data in response.data["results"]:
+                for field in m2m_fields:
+                    self.assertNotIn(field, response_data)
+
+            # With exclude_m2m query parameter set to False
+            response = self.client.get(list_url + "?exclude_m2m=false", **self.header)
+            self.assertHttpStatus(response, status.HTTP_200_OK)
+            self.assertIsInstance(response.data, dict)
+            self.assertIn("results", response.data)
+            for response_data in response.data["results"]:
+                for field in m2m_fields:
+                    self.assertIn(field, response_data)
+                    self.assertIsInstance(response_data[field], list)
+
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_list_objects_without_permission(self):
             """
@@ -1076,12 +1127,20 @@ class APIViewTestCases:
 
             self.assertIn("actions", data)
 
-            # Grab any field that has choices defined (fields with enums)
+            # Grab any field that has choices defined (fields with enums including child fields with enums)
             field_choices = {}
             if "POST" in data["actions"]:
-                field_choices = {k for k, v in data["actions"]["POST"].items() if "choices" in v}
+                field_choices = {
+                    k
+                    for k, v in data["actions"]["POST"].items()
+                    if "choices" in v or ("child" in v and "choices" in v["child"])
+                }
             elif "PUT" in data["actions"]:
-                field_choices = {k for k, v in data["actions"]["PUT"].items() if "choices" in v}
+                field_choices = {
+                    k
+                    for k, v in data["actions"]["PUT"].items()
+                    if "choices" in v or ("child" in v and "choices" in v["child"])
+                }
             else:
                 self.fail(f"Neither PUT nor POST are available actions in: {data['actions']}")
 

nautobot/core/testing/filters.py

@@ -21,7 +21,6 @@ from nautobot.core.filters import (
 )
 from nautobot.core.models.generics import PrimaryModel
 from nautobot.core.testing import views
-from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
 from nautobot.extras.models import Contact, ContactAssociation, Role, Status, Tag, Team
 from nautobot.tenancy import models
 
@@ -435,28 +434,6 @@ class FilterTestCases:
                         ),
                     )
 
-    # Test cases should just explicitly include `name` as a generic_filter_tests entry
-    @class_deprecated_in_favor_of(FilterTestCase)  # pylint: disable=undefined-variable
-    class NameOnlyFilterTestCase(FilterTestCase):
-        """Add simple tests for filtering by name."""
-
-        def test_filters_generic(self):
-            if not any(test[0] == "name" for test in self.generic_filter_tests):
-                self.generic_filter_tests = (["name"], *self.generic_filter_tests)
-            super().test_filters_generic()
-
-    # Test cases should just explicitly include `name` and `slug` as generic_filter_tests entries
-    @class_deprecated_in_favor_of(FilterTestCase)  # pylint: disable=undefined-variable
-    class NameSlugFilterTestCase(FilterTestCase):
-        """Add simple tests for filtering by name and by slug."""
-
-        def test_filters_generic(self):
-            if not any(test[0] == "slug" for test in self.generic_filter_tests):
-                self.generic_filter_tests = (["slug"], *self.generic_filter_tests)
-            if not any(test[0] == "name" for test in self.generic_filter_tests):
-                self.generic_filter_tests = (["name"], *self.generic_filter_tests)
-            super().test_filters_generic()
-
     class TenancyFilterTestCaseMixin(views.TestCase):
         """Add test cases for tenant and tenant-group filters."""