nautobot 2.4.6__py3-none-any.whl → 2.4.7__py3-none-any.whl

nautobot/apps/forms.py

@@ -53,6 +53,7 @@ from nautobot.core.forms.utils import (
 from nautobot.core.forms.widgets import (
     APISelect,
     APISelectMultiple,
+    AutoPopulateWidget,
     BulkEditNullBooleanSelect,
     ColorSelect,
     ContentTypeSelect,
@@ -102,6 +103,7 @@ __all__ = (
     "APISelect",
     "APISelectMultiple",
     "AddressFieldMixin",
+    "AutoPopulateWidget",
     "BootstrapMixin",
     "BulkEditForm",
     "BulkEditNullBooleanSelect",

nautobot/circuits/templates/circuits/providernetwork.html

@@ -1,2 +1,2 @@
 {% extends 'circuits/providernetwork_retrieve.html' %}
-{% comment %}2.0 TODO: remove this template, which only exists for backward compatibility with 1.3 and earlier{% endcomment %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/circuits/templates/circuits/providernetwork_retrieve.html

@@ -1,57 +1,4 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load static %}
-{% load helpers %}
-{% load plugins %}
-
-{% block breadcrumbs %}
-  <li><a href="{% url 'circuits:providernetwork_list' %}">Provider Networks</a></li>
+{% block extra_breadcrumbs %}
   <li><a href="{% url 'circuits:providernetwork_list' %}?provider={{ object.provider_id }}">{{ object.provider }}</a></li>
-  <li>{{ object }}</li>
-{% endblock %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Provider Network</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Provider</td>
-                    <td>{{ object.provider|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Name</td>
-                    <td>{{ object.name }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description }}</td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Comments</strong>
-            </div>
-            <div class="panel-body rendered-markdown">
-                {% if object.comments %}
-                    {{ object.comments|render_markdown }}
-                {% else %}
-                    <span class="text-muted">None</span>
-                {% endif %}
-            </div>
-        </div>
-{% endblock content_right_page %}
-
-{% block content_full_width_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Circuits</strong>
-            </div>
-            {% include 'inc/table.html' with table=circuits_table %}
-        </div>
-        {% include 'inc/paginator.html' with paginator=circuits_table.paginator page=circuits_table.page %}
-{% endblock content_full_width_page %}
+{% endblock extra_breadcrumbs %}

nautobot/circuits/views.py

@@ -1,6 +1,5 @@
 from django.contrib import messages
 from django.db import transaction
-from django.db.models import Q
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.html import format_html
 from django_tables2 import RequestConfig
@@ -300,28 +299,26 @@ class ProviderNetworkUIViewSet(NautobotUIViewSet):
     serializer_class = serializers.ProviderNetworkSerializer
     table_class = tables.ProviderNetworkTable
 
-    def get_extra_context(self, request, instance):
-        context = super().get_extra_context(request, instance)
-        if self.action == "retrieve":
-            circuits = (
-                Circuit.objects.restrict(request.user, "view")
-                .filter(
-                    Q(circuit_termination_a__provider_network=instance.pk)
-                    | Q(circuit_termination_z__provider_network=instance.pk)
-                )
-                .select_related("circuit_type", "tenant")
-                .prefetch_related("circuit_terminations__location")
-            )
-
-            circuits_table = tables.CircuitTable(circuits)
-            circuits_table.columns.hide("circuit_termination_a")
-            circuits_table.columns.hide("circuit_termination_z")
-
-            paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
-            RequestConfig(request, paginate).configure(circuits_table)
-
-            context["circuits_table"] = circuits_table
-        return context
+    object_detail_content = ObjectDetailContent(
+        panels=(
+            ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields="__all__",
+            ),
+            ObjectsTablePanel(
+                weight=200,
+                section=SectionChoices.FULL_WIDTH,
+                table_class=tables.CircuitTable,
+                table_filter=["circuit_termination_a__provider_network", "circuit_termination_z__provider_network"],
+                prefetch_related_fields=["circuit_terminations__location"],
+                select_related_fields=["circuit_type", "tenant"],
+                exclude_columns=["provider_network", "circuit_termination_a", "circuit_termination_z"],
+                related_field_name="provider_network",
+                add_button_route=None,
+            ),
+        )
+    )
 
 
 class CircuitSwapTerminations(generic.ObjectEditView):

nautobot/cloud/templates/cloud/cloudaccount_retrieve.html

@@ -1,43 +1,5 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
 {% block extra_breadcrumbs %}
-                <li><a href="{% url 'cloud:cloudaccount_list' %}?provider={{ object.provider.pk }}">{{ object.provider }}</a></li>
+    <li><a href="{% url 'cloud:cloudaccount_list' %}?provider={{ object.provider.pk }}">{{ object.provider }}</a></li>
 {% endblock extra_breadcrumbs %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Cloud Account</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Name</td>
-                    <td>
-                        {{ object.name }}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Provider</td>
-                    <td>{{ object.provider|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Account Number</td>
-                    <td>
-                        <span class="hover_copy"><span id="copy_accountnumber">{{ object.account_number }}</span><button type="button" class="btn btn-inline btn-default hover_copy_button" data-clipboard-target="#copy_accountnumber">
-                            <span class="mdi mdi-content-copy"></span>
-                        </button>
-                        </span>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Secrets Group</td>
-                    <td>{{ object.secrets_group|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/cloud/views.py

@@ -31,6 +31,8 @@ from nautobot.cloud.forms import (
 )
 from nautobot.cloud.models import CloudAccount, CloudNetwork, CloudResourceType, CloudService
 from nautobot.cloud.tables import CloudAccountTable, CloudNetworkTable, CloudResourceTypeTable, CloudServiceTable
+from nautobot.core.ui import object_detail
+from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.core.views.viewsets import NautobotUIViewSet
 from nautobot.ipam.tables import PrefixTable
@@ -45,6 +47,16 @@ class CloudAccountUIViewSet(NautobotUIViewSet):
     table_class = CloudAccountTable
     form_class = CloudAccountForm
 
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=(
+            object_detail.ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields="__all__",
+            ),
+        )
+    )
+
 
 class CloudNetworkUIViewSet(NautobotUIViewSet):
     queryset = CloudNetwork.objects.all()

nautobot/core/api/urls.py

@@ -1,7 +1,6 @@
 from django.conf.urls import include
 from django.urls import path
 from drf_spectacular.views import (
-    SpectacularAPIView,
     SpectacularJSONAPIView,
     SpectacularYAMLAPIView,
 )
@@ -12,6 +11,7 @@ from nautobot.core.api.views import (
     GetFilterSetFieldDOMElementAPIView,
     GetFilterSetFieldLookupExpressionChoicesAPIView,
     GraphQLDRFAPIView,
+    NautobotSpectacularAPIView,
     NautobotSpectacularRedocView,
     NautobotSpectacularSwaggerView,
     RenderJinjaView,
@@ -55,7 +55,7 @@ urlpatterns = [
     path("docs/", NautobotSpectacularSwaggerView.as_view(url_name="schema"), name="api_docs"),
     path("redoc/", NautobotSpectacularRedocView.as_view(url_name="schema"), name="api_redocs"),
     path("settings-schema/", SettingsJSONSchemaView.as_view(), name="setting_schema_json"),
-    path("swagger/", SpectacularAPIView.as_view(), name="schema"),
+    path("swagger/", NautobotSpectacularAPIView.as_view(), name="schema"),
     path("swagger.json", SpectacularJSONAPIView.as_view(), name="schema_json"),
     path("swagger.yaml", SpectacularYAMLAPIView.as_view(), name="schema_yaml"),
     # GraphQL

nautobot/core/api/views.py

@@ -7,6 +7,7 @@ from django import __version__ as DJANGO_VERSION, forms
 from django.apps import apps
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
+from django.core.cache import cache
 from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist, ValidationError
 from django.db import transaction
 from django.db.models import ProtectedError
@@ -14,10 +15,12 @@ from django.db.models.fields.related import ForeignKey, ManyToManyField, Related
 from django.db.models.fields.reverse_related import ManyToManyRel, ManyToOneRel
 from django.http.response import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
+from django.utils.decorators import method_decorator
+from django.views.decorators.gzip import gzip_page
 from drf_spectacular.plumbing import get_relative_url, set_query_parameters
 from drf_spectacular.renderers import OpenApiJsonRenderer
 from drf_spectacular.utils import extend_schema
-from drf_spectacular.views import SpectacularRedocView, SpectacularSwaggerView
+from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView, SpectacularSwaggerView
 from graphene_django.settings import graphene_settings
 from graphene_django.views import GraphQLView, HttpError, instantiate_middleware
 from graphql import get_default_backend
@@ -608,6 +611,41 @@ class NautobotSpectacularRedocView(APIVersioningGetSchemaURLMixin, SpectacularRe
     """Extend SpectacularRedocView to support Nautobot's ?api_version=<version> query parameter."""
 
 
+@method_decorator(gzip_page, name="dispatch")
+class NautobotSpectacularAPIView(SpectacularAPIView):
+    def _get_schema_response(self, request):
+        # version specified as parameter to the view always takes precedence. after
+        # that we try to source version through the schema view's own versioning_class.
+        version = self.api_version or request.version or self._get_version_parameter(request)
+        cache_key = f"openapi_schema_cache_{version}_{settings.VERSION}"  # Invalidate cache on Nautobot release
+        etag = f'W/"{hash(cache_key)}"'
+
+        # With combined browser cache and backend cache, we have three options:
+        # - cache expired on browser, but Etag is the same (no changes in nautobot) -> 70-100ms response
+        # - cache expired on browser, Etag is different, cache present on backend -> 400-600ms response
+        # - cache expired on browser, Etag is different, no cache on backend -> 3-4s response
+
+        if_none_match = request.META.get("HTTP_IF_NONE_MATCH", "")
+        if if_none_match == etag:
+            return Response(status=304)
+
+        schema = cache.get(cache_key)
+        if not schema:
+            generator = self.generator_class(urlconf=self.urlconf, api_version=version, patterns=self.patterns)
+            schema = generator.get_schema(request=request, public=self.serve_public)
+            cache.set(cache_key, schema, 60 * 60 * 24 * 7)
+
+        return Response(
+            data=schema,
+            headers={
+                "Content-Disposition": f'inline; filename="{self._get_filename(request, version)}"',
+                "Cache-Control": f"max-age={3 * 24 * 60 * 60}, public",
+                "ETag": etag,
+                "Vary": "Accept, Accept-Encoding",
+            },
+        )
+
+
 #
 # GraphQL
 #

nautobot/core/forms/__init__.py

@@ -60,6 +60,7 @@ from nautobot.core.forms.utils import (
 from nautobot.core.forms.widgets import (
     APISelect,
     APISelectMultiple,
+    AutoPopulateWidget,
     BulkEditNullBooleanSelect,
     ClearableFileInput,
     ColorSelect,
@@ -86,6 +87,7 @@ __all__ = (
     "APISelect",
     "APISelectMultiple",
     "AddressFieldMixin",
+    "AutoPopulateWidget",
     "AutoPositionField",
     "AutoPositionPatternField",
     "BootstrapMixin",

nautobot/core/forms/fields.py

@@ -457,7 +457,7 @@ class AutoPositionField(django_forms.CharField):
             source (str, tuple): Name of the field (or a list of field names) that will be used to suggest a position.
         """
         kwargs.setdefault("label", "Position")
-        kwargs.setdefault("widget", forms.SlugWidget)
+        kwargs.setdefault("widget", forms.AutoPopulateWidget)
         super().__init__(*args, **kwargs)
         if isinstance(source, (tuple, list)):
             source = " ".join(source)
@@ -473,7 +473,7 @@ class AutoPositionPatternField(ExpandableNameField):
             source (str, tuple): Name pattern of the field (or a list of field names) that will be used to suggest a position pattern.
         """
         kwargs.setdefault("label", "Position")
-        kwargs.setdefault("widget", forms.SlugWidget)
+        kwargs.setdefault("widget", forms.AutoPopulateWidget(attrs={"title": "Regenerate position"}))
         super().__init__(*args, **kwargs)
         if isinstance(source, (tuple, list)):
             source = " ".join(source)

nautobot/core/forms/widgets.py

@@ -12,6 +12,7 @@ from nautobot.core.forms import utils
 __all__ = (
     "APISelect",
     "APISelectMultiple",
+    "AutoPopulateWidget",
     "BulkEditNullBooleanSelect",
     "ClearableFileInput",
     "ColorSelect",
@@ -41,6 +42,23 @@ class SlugWidget(forms.TextInput):
 
     template_name = "widgets/sluginput.html"
 
+    def get_context(self, name, value, attrs):
+        custom_title = self.attrs.pop("title", None)
+        context = super().get_context(name, value, attrs)
+        context["widget"]["custom_title"] = custom_title
+        return context
+
+
+class AutoPopulateWidget(SlugWidget):
+    """
+    Subclass SlugWidget and add support for auto-populate JavaScript logic from `form.js`.
+    """
+
+    def get_context(self, name, value, attrs):
+        attrs["data-autopopulate"] = ""
+        context = super().get_context(name, value, attrs)
+        return context
+
 
 class ColorSelect(forms.Select):
     """

nautobot/core/templates/widgets/sluginput.html

@@ -1,7 +1,11 @@
 <div class="input-group">
     {% include "django/forms/widgets/input.html" %}
     <span class="input-group-btn">
-        <button class="btn btn-default reslugify" type="button" title="Regenerate slug">
+        <button class="btn btn-default reslugify"
+                type="button"
+                title="{% if widget.custom_title %}{{ widget.custom_title }}{%  else  %}Regenerate slug{% endif %}"
+                data-regenerate="{{ widget.attrs.id }}"
+        >
             <i class="mdi mdi-refresh"></i>
         </button>
     </span>

nautobot/core/templatetags/helpers.py

@@ -2,7 +2,7 @@ import datetime
 import json
 import logging
 import re
-from urllib.parse import parse_qs
+from urllib.parse import parse_qs, quote_plus
 
 from django import template
 from django.conf import settings
@@ -711,6 +711,20 @@ def render_ancestor_hierarchy(value):
     return result
 
 
+@library.filter()
+@register.filter()
+def render_address(address):
+    if address:
+        map_link = format_html(
+            '<a href="https://maps.google.com/?q={}" target="_blank" class="btn btn-primary btn-xs">'
+            '<i class="mdi mdi-map-marker"></i> Map it</a>',
+            quote_plus(address),
+        )
+        address = format_html_join("", "{}<br>", ((line,) for line in address.split("\n")))
+        return format_html('<div class="pull-right noprint">{}</div>{}', map_link, address)
+    return HTML_NONE
+
+
 #
 # Tags
 #

nautobot/core/testing/integration.py

@@ -35,11 +35,15 @@ class ObjectsListMixin:
         """
         self.browser.find_by_css("#object_list_form input.toggle").click()
 
-    def select_one_item(self):
+    def select_one_item(self, pk=None):
         """
         Click first row checkbox on items table list to select one row.
         """
-        self.browser.find_by_css('#object_list_form input[name="pk"]').click()
+        selector = '#object_list_form input[name="pk"]'
+        if pk:
+            selector = f'{selector}[value="{pk}"]'
+
+        self.browser.find_by_css(selector).click()
 
     def set_per_page(self, per_page=1):
         """

nautobot/core/ui/object_detail.py

@@ -8,7 +8,7 @@ import logging
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist
 from django.db import models
-from django.db.models import CharField, JSONField, URLField
+from django.db.models import CharField, JSONField, Q, URLField
 from django.db.models.fields.related import ManyToManyField
 from django.template import Context
 from django.template.defaultfilters import truncatechars
@@ -665,10 +665,14 @@ class ObjectsTablePanel(Panel):
                 Table (`BaseTable`) instance. Mutually exclusive with `table_class`, `table_filter`, `table_attribute`.
             table_class (obj): The table class that will be instantiated and rendered e.g. CircuitTable, DeviceTable.
                 Mutually exclusive with `context_table_key`.
-            table_filter (str, optional): The name of the filter to apply to the queryset to initialize the table class.
+            table_filter (str, list, optional): The filter(s) to apply to the queryset to initialize the table class.
                 For example, in a LocationType detail view, for an ObjectsTablePanel of related Locations, this would
                 be `location_type`, because `Location.objects.filter(location_type=obj)` gives the desired queryset.
                 Mutually exclusive with `table_attribute`.
+                For example, in ProviderNetwork detail view, for an ObjectsTablePanel of related Circuits, this would
+                be `["circuit_termination_a__provider_network", "circuit_termination_z__provider_network"]` because
+                `Circuit.objects.filter(Q(circuit_termination_a__provider_network=instance)
+                | Q(circuit_termination_z__provider_network=instance))` gives the desired queryset.
             table_attribute (str, optional): The attribute of the detail view instance that contains the queryset to
                 initialize the table class. e.g. `dynamic_groups`.
                 Mutually exclusive with `table_filter`.
@@ -789,7 +793,16 @@ class ObjectsTablePanel(Panel):
             if self.table_attribute:
                 body_content_table_queryset = getattr(instance, self.table_attribute)
             else:
-                body_content_table_queryset = body_content_table_model.objects.filter(**{self.table_filter: instance})
+                if isinstance(self.table_filter, str):
+                    table_filters = [self.table_filter]
+                elif isinstance(self.table_filter, list):
+                    table_filters = self.table_filter
+                else:
+                    table_filters = []
+                query = Q()
+                for table_filter in table_filters:
+                    query = query | Q(**{table_filter: instance})
+                body_content_table_queryset = body_content_table_model.objects.filter(query)
 
             body_content_table_queryset = body_content_table_queryset.restrict(request.user, "view")
             if self.select_related_fields:

nautobot/core/utils/lookup.py

@@ -291,9 +291,9 @@ def get_table_class_string_from_view_name(view_name):
 
     view_func = resolve(reverse(view_name)).func
     view_class = getattr(view_func, "cls", getattr(view_func, "view_class", None))
-    if hasattr(view_class, "table_class"):
+    if hasattr(view_class, "table_class") and view_class.table_class:
         return view_class.table_class.__name__
-    if hasattr(view_class, "table"):
+    if hasattr(view_class, "table") and view_class.table:
         return view_class.table.__name__
     return None
 

nautobot/dcim/forms.py

@@ -768,6 +768,16 @@ class RackReservationFilterForm(NautobotFilterForm, TenancyFilterForm):
 #
 
 
+class ManufacturerBulkEditForm(NautobotBulkEditForm):
+    pk = forms.ModelMultipleChoiceField(queryset=Manufacturer.objects.all(), widget=forms.MultipleHiddenInput())
+    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+
+    class Meta:
+        nullable_fields = [
+            "description",
+        ]
+
+
 class ManufacturerForm(NautobotModelForm):
     class Meta:
         model = Manufacturer

nautobot/dcim/models/locations.py

@@ -220,6 +220,15 @@ class Location(TreeModel, PrimaryModel):
     def __str__(self):
         return self.name
 
+    @property
+    def display(self):
+        """
+        Honor LOCATION_NAME_AS_NATURAL_KEY for display value rendering, else fallback to TreeModel.display().
+        """
+        if get_settings_or_config("LOCATION_NAME_AS_NATURAL_KEY"):
+            return self.name
+        return super().display
+
     @classproperty  # https://github.com/PyCQA/pylint-django/issues/240
     def natural_key_field_lookups(cls):  # pylint: disable=no-self-argument
         """

nautobot/dcim/templates/dcim/device_list.html

@@ -3,7 +3,7 @@
 {% block bulk_buttons %}
     {% if perms.dcim.change_device %}
         <div class="btn-group dropup">
-            <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="device-bulk-add-components-button">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Components <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">

nautobot/dcim/templates/dcim/devicetype.html

@@ -10,7 +10,7 @@
 {% block extra_buttons %}
     {% if perms.dcim.change_devicetype %}
         <div class="btn-group">
-            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="device-type-add-components-button">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Components <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">

nautobot/dcim/templates/dcim/manufacturer.html

@@ -1,64 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Manufacturer</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Devices</td>
-                    <td>
-                        <a href="{% url 'dcim:device_list' %}?manufacturer={{ object.name }}">{{ device_table.rows|length }}</a>
-                    </td>
-                </tr>
-                {% if cloud_account_table.rows %}
-                    <tr>
-                        <td>Cloud Accounts</td>
-                        <td>
-                            <a href="{% url 'cloud:cloudaccount_list' %}?provider={{ object.name }}">{{ cloud_account_table.rows|length }}</a>
-                        </td>
-                    </tr>
-                {% endif %}
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_full_width_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Devices</strong>
-            </div>
-            {% include 'inc/table.html' with table=device_table %}
-            {% if perms.dcim.add_device %}
-                <div class="panel-footer text-right noprint">
-                    <a href="{% url 'dcim:device_add' %}?manufacturer={{ object.pk }}" class="btn btn-xs btn-primary">
-                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add device
-                    </a>
-                </div>
-            {% endif %}
-        </div>
-    {% include 'inc/paginator.html' with paginator=device_table.paginator page=device_table.page %}
-    {% if cloud_account_table.rows %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Cloud Accounts</strong>
-            </div>
-            {% include 'inc/table.html' with table=cloud_account_table %}
-            {% if perms.cloud.add_cloudaccount %}
-                <div class="panel-footer text-right noprint">
-                    <a href="{% url 'cloud:cloudaccount_add' %}?provider={{ object.pk }}" class="btn btn-xs btn-primary">
-                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Cloud Account
-                    </a>
-                </div>
-            {% endif %}
-        </div>
-        {% include 'inc/paginator.html' with paginator=cloud_account_table.paginator page=cloud_account_table.page %}
-    {% endif %}
-    <div class="row"></div>
-{% endblock content_full_width_page %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/module_list.html

@@ -3,7 +3,7 @@
 {% block bulk_buttons %}
     {% if perms.dcim.change_module %}
         <div class="btn-group dropup">
-            <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="module-bulk-add-components-button">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Components <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">

nautobot/dcim/templates/dcim/moduletype_retrieve.html

@@ -9,7 +9,7 @@
 {% block extra_buttons %}
         {% if perms.dcim.change_moduletype %}
             <div class="btn-group">
-                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="module-type-add-components-button">
                     <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Components <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu">