nautobot 2.4.16__py3-none-any.whl → 2.4.18__py3-none-any.whl

nautobot/apps/utils.py

@@ -13,6 +13,7 @@ from nautobot.core.utils.data import (
     render_jinja2,
     shallow_compare_dict,
     to_meters,
+    validate_jinja2,
 )
 from nautobot.core.utils.deprecation import class_deprecated, class_deprecated_in_favor_of
 from nautobot.core.utils.filtering import (
@@ -139,5 +140,6 @@ __all__ = (
     "swap_status_initials",
     "task_queues_as_choices",
     "to_meters",
+    "validate_jinja2",
     "wrap_model_clean_methods",
 )

nautobot/apps/views.py

@@ -30,6 +30,7 @@ from nautobot.core.views.mixins import (
     ObjectListViewMixin,
     ObjectNotesViewMixin,
     ObjectPermissionRequiredMixin,
+    UIComponentsMixin,
 )
 from nautobot.core.views.paginator import EnhancedPage, EnhancedPaginator, get_paginate_count
 from nautobot.core.views.renderers import NautobotHTMLRenderer
@@ -78,6 +79,7 @@ __all__ = (
     "ObjectNotesViewMixin",
     "ObjectPermissionRequiredMixin",
     "ObjectView",
+    "UIComponentsMixin",
     "check_and_call_git_repository_function",
     "check_filter_for_display",
     "csv_format",

nautobot/circuits/templates/circuits/circuittermination_retrieve.html

@@ -1,9 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block breadcrumbs %}
-    <li><a href="{% url 'circuits:circuit_list' %}">Circuits</a></li>
-    <li><a href="{% url 'circuits:circuit_list' %}?provider={{ object.circuit.provider.pk }}">{{ object.circuit.provider }}</a></li>
-    <li>{{ object.circuit|hyperlinked_object }}</li>
-    <li>{{ object|hyperlinked_object }}</li>
-{% endblock breadcrumbs %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/circuits/templates/circuits/inc/circuit_termination_speed_fragment.html

@@ -0,0 +1,9 @@
+{% spaceless %}
+{% load helpers %}
+{% if termination.port_speed and termination.upstream_speed %}
+<i class="mdi mdi-arrow-down-bold" title="Downstream"></i>{{ termination.port_speed|humanize_speed }}&nbsp;
+<i class="mdi mdi-arrow-up-bold" title="Upstream"></i>{{ termination.upstream_speed|humanize_speed }}
+{% else %}
+{{ termination.port_speed|humanize_speed|placeholder }}
+{% endif %}
+{% endspaceless %}

nautobot/circuits/tests/integration/test_circuit.py

@@ -128,8 +128,8 @@ class CircuitTestCase(SeleniumTestCase, ObjectsListMixin, ObjectDetailsMixin):
                 # Assert that value are properly set
                 panel_label = f"Termination - {side} Side"
                 self.assertPanelValue(panel_label, "Location", self.location.name)
-                self.assertPanelValue(panel_label, "Port Speed (Kbps)", port_speed)
-                self.assertPanelValue(panel_label, "Upstream Speed (Kbps)", upstream_speed)
+                self.assertPanelValue(panel_label, "Speed", port_speed)
+                self.assertPanelValue(panel_label, "Speed", upstream_speed)
                 self.assertPanelValue(panel_label, "Cross-connect ID", xconnect_id)
                 self.assertPanelValue(panel_label, "Patch Panel/port(s)", pp_info)
                 self.assertPanelValue(panel_label, "Description", description)

nautobot/circuits/views.py

@@ -5,6 +5,7 @@ from django.utils.html import format_html, format_html_join
 
 from nautobot.core.forms import ConfirmationForm
 from nautobot.core.templatetags import helpers
+from nautobot.core.ui.breadcrumbs import Breadcrumbs, InstanceBreadcrumbItem, ModelBreadcrumbItem
 from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.ui.object_detail import (
     ObjectDetailContent,
@@ -58,6 +59,10 @@ class CircuitTerminationObjectFieldsPanel(ObjectFieldsPanel):
     def render_key(self, key, value, context):
         if key == "connected_endpoint":
             return "IP Addressing"
+
+        if key == "port_speed":
+            return "Speed"
+
         return super().render_key(key, value, context)
 
     def render_value(self, key, value, context):
@@ -80,6 +85,10 @@ class CircuitTerminationObjectFieldsPanel(ObjectFieldsPanel):
                 "{} ({})",
                 ((helpers.hyperlinked_object(ip), getattr(ip, "vrf", None) or "Global") for ip in ip_addresses.all()),
             )
+
+        if key == "port_speed":
+            return render_component_template("circuits/inc/circuit_termination_speed_fragment.html", context)
+
         return super().render_value(key, value, context)
 
 
@@ -93,6 +102,20 @@ class CircuitTerminationUIViewSet(NautobotUIViewSet):
     serializer_class = serializers.CircuitTerminationSerializer
     table_class = tables.CircuitTerminationTable
 
+    breadcrumbs = Breadcrumbs(
+        items={
+            "detail": [
+                ModelBreadcrumbItem(model=Circuit),
+                ModelBreadcrumbItem(
+                    model=Circuit,
+                    label=lambda c: c["object"].circuit.provider,
+                    reverse_query_params=lambda c: {"provider": c["object"].circuit.provider.pk},
+                ),
+                InstanceBreadcrumbItem(instance=lambda c: c["object"].circuit),
+            ]
+        }
+    )
+
     object_detail_content = ObjectDetailContent(
         panels=(
             CircuitTerminationObjectFieldsPanel(
@@ -104,7 +127,6 @@ class CircuitTerminationUIViewSet(NautobotUIViewSet):
                     "cloud_network",
                     "cable",
                     "port_speed",
-                    "upstream_speed",
                     "connected_endpoint",
                     "xconnect_id",
                     "pp_info",
@@ -115,15 +137,7 @@ class CircuitTerminationUIViewSet(NautobotUIViewSet):
                     "provider_network",
                     "cloud_network",
                     "port_speed",
-                    "upstream_speed",
-                ],
-                exclude_fields=[
-                    "circuit",
                 ],
-                value_transforms={
-                    "port_speed": [helpers.humanize_speed],
-                    "upstream_speed": [helpers.humanize_speed],
-                },
             ),
         )
     )
@@ -188,17 +202,12 @@ class CircuitUIViewSet(NautobotUIViewSet):
                     "provider_network",
                     "cloud_network",
                     "port_speed",
-                    "upstream_speed",
                     "ip_addresses",
                     "xconnect_id",
                     "pp_info",
                     "description",
                 ),
-                value_transforms={
-                    "port_speed": [helpers.humanize_speed, helpers.placeholder],
-                    "upstream_speed": [helpers.humanize_speed],
-                },
-                hide_if_unset=("location", "provider_network", "cloud_network", "upstream_speed"),
+                hide_if_unset=("location", "provider_network", "cloud_network"),
                 ignore_nonexistent_fields=True,  # ip_addresses may be undefined
                 header_extra_content_template_path="circuits/inc/circuit_termination_header_extra_content.html",
                 **kwargs,
@@ -245,6 +254,10 @@ class CircuitUIViewSet(NautobotUIViewSet):
                 )
             if key == "ip_addresses":
                 return "IP Addressing"
+
+            if key == "port_speed":
+                return "Speed"
+
             return super().render_key(key, value, context)
 
         def render_value(self, key, value, context):
@@ -257,6 +270,10 @@ class CircuitUIViewSet(NautobotUIViewSet):
                 if not context["termination"].location:
                     return ""
                 return render_component_template("circuits/inc/circuit_termination_cable_fragment.html", context)
+
+            if key == "port_speed":
+                return render_component_template("circuits/inc/circuit_termination_speed_fragment.html", context)
+
             return super().render_value(key, value, context)
 
         def queryset_list_url_filter(self, key, value, context):

nautobot/cloud/templates/cloud/cloudresourcetype_retrieve.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_retrieve.html' %}
-{% block extra_breadcrumbs %}
-    <li><a href="{% url 'cloud:cloudresourcetype_list' %}?provider={{ object.provider.pk }}">{{ object.provider }}</a></li>
+{% extends 'generic/object_retrieve.html' %}
+{% block extra_breadcrumbs %}
+    <li><a href="{% url 'cloud:cloudresourcetype_list' %}?provider={{ object.provider.pk }}">{{ object.provider }}</a></li>
 {% endblock extra_breadcrumbs %}

nautobot/cloud/views.py

@@ -94,6 +94,7 @@ class CloudNetworkUIViewSet(NautobotUIViewSet):
                         table_class=CloudNetworkTable,
                         table_filter="parent",
                         tab_id="children",
+                        include_paginator=True,
                     ),
                 ),
             ),
@@ -111,6 +112,7 @@ class CloudNetworkUIViewSet(NautobotUIViewSet):
                         table_filter="cloud_networks",
                         exclude_columns=("location_count", "vlan"),
                         tab_id="prefixes",
+                        include_paginator=True,
                     ),
                 ),
             ),
@@ -129,6 +131,7 @@ class CloudNetworkUIViewSet(NautobotUIViewSet):
                         related_field_name="cloud_network",
                         exclude_columns=("circuit_termination_a", "circuit_termination_z"),
                         tab_id="circuits",
+                        include_paginator=True,
                     ),
                 ),
             ),
@@ -146,6 +149,7 @@ class CloudNetworkUIViewSet(NautobotUIViewSet):
                         table_filter="cloud_networks",
                         exclude_columns=("cloud_network_count"),
                         tab_id="cloud_services",
+                        include_paginator=True,
                     ),
                 ),
             ),
@@ -222,6 +226,7 @@ class CloudResourceTypeUIViewSet(NautobotUIViewSet):
                         table_class=CloudNetworkTable,
                         table_filter="cloud_resource_type",
                         tab_id="networks",
+                        include_paginator=True,
                     ),
                 ),
             ),
@@ -238,6 +243,7 @@ class CloudResourceTypeUIViewSet(NautobotUIViewSet):
                         table_class=CloudServiceTable,
                         table_filter="cloud_resource_type",
                         tab_id="services",
+                        include_paginator=True,
                     ),
                 ),
             ),
@@ -302,6 +308,7 @@ class CloudServiceUIViewSet(NautobotUIViewSet):
                         table_filter="cloud_services",
                         tab_id="cloud_networks",
                         add_button_route=None,
+                        include_paginator=True,
                     ),
                 ),
             ),

nautobot/core/apps/__init__.py

@@ -337,6 +337,7 @@ class CoreConfig(NautobotConfig):
         from graphene_django.converter import convert_django_field
 
         from nautobot.core.graphql import BigInteger
+        import nautobot.core.jobs  # noqa: F401  # unused-import -- but this import registers the system jobs
 
         @convert_django_field.register(JSONField)
         def convert_json(field, registry=None):  # pylint: disable=redefined-outer-name

nautobot/core/celery/__init__.py

@@ -54,7 +54,8 @@ def import_jobs(sender=None, **kwargs):
 
     Note that app-provided jobs are automatically imported at startup time via NautobotAppConfig.ready()
     """
-    import nautobot.core.jobs  # noqa: F401
+    import nautobot.core.jobs
+    import nautobot.ipam.jobs  # noqa: F401
 
     _import_jobs_from_jobs_root()
     _import_dynamic_jobs_from_apps()

nautobot/core/filters.py

@@ -175,7 +175,7 @@ class RelatedMembershipBooleanFilter(django_filters.BooleanFilter):
         )
 
     def filter(self, qs, value):
-        if value in EMPTY_VALUES:
+        if value in EMPTY_VALUES or (hasattr(value, "exists") and not value.exists()):
             return qs
         if self.distinct:
             qs = qs.distinct()
@@ -542,7 +542,7 @@ class TreeNodeMultipleChoiceFilter(NaturalKeyOrPKMultipleChoiceFilter):
         return query
 
     def filter(self, qs, value):
-        if value in EMPTY_VALUES:
+        if value in EMPTY_VALUES or (hasattr(value, "exists") and not value.exists()):
             return qs
 
         # Fetch the generated Q object and filter the incoming qs with it before passing it along.

nautobot/core/settings.py

@@ -157,6 +157,7 @@ METRICS_AUTHENTICATED = is_truthy(os.getenv("NAUTOBOT_METRICS_AUTHENTICATED", "F
 METRICS_DISABLED_APPS = []
 if "NAUTOBOT_METRICS_DISABLED_APPS" in os.environ and os.environ["NAUTOBOT_METRICS_DISABLED_APPS"] != "":
     METRICS_DISABLED_APPS = os.getenv("NAUTOBOT_METRICS_DISABLED_APPS", "").split(_CONFIG_SETTING_SEPARATOR)
+METRICS_EXPERIMENTAL_CACHING_DURATION = int(os.getenv("NAUTOBOT_METRICS_EXPERIMENTAL_CACHING_DURATION", "0"))
 
 # Napalm
 NAPALM_ARGS = {}

nautobot/core/settings.yaml

@@ -1377,6 +1377,15 @@ properties:
     see_also:
       "Guide to Nautobot Prometheus metrics": "../guides/prometheus-metrics.md"
     type: "boolean"
+  METRICS_EXPERIMENTAL_CACHING_DURATION:
+    default: 0
+    description: >-
+      The number of seconds to cache Nautobot App metrics before refreshing them.
+      A value of `0` means no caching (i.e. always recompute metrics on each request). This feature is experimental
+      and may change or be removed in a future release, including patch releases.
+    environment_variable: "NAUTOBOT_METRICS_EXPERIMENTAL_CACHING_DURATION"
+    type: "integer"
+    version_added: "2.4.18"
   NAPALM_ARGS:
     additionalProperties: true
     default: {}

nautobot/core/tables.py

@@ -17,7 +17,6 @@ import django_tables2
 from django_tables2.data import TableData, TableQuerysetData
 from django_tables2.rows import BoundRows
 from django_tables2.utils import Accessor, OrderBy, OrderByTuple
-from tree_queries.models import TreeNode
 
 from nautobot.core.models.querysets import count_related
 from nautobot.core.templatetags import helpers
@@ -107,6 +106,12 @@ class BaseTable(django_tables2.Table):
         if order_by is None and saved_view is not None:
             order_by = saved_view.config.get("sort_order", None)
 
+        # Don't show hierarchy if we're sorted
+        if order_by is not None and hide_hierarchy_ui is None:
+            hide_hierarchy_ui = True
+
+        self.hide_hierarchy_ui = hide_hierarchy_ui
+
         # Init table
         super().__init__(*args, order_by=order_by, **kwargs)
 
@@ -118,12 +123,6 @@ class BaseTable(django_tables2.Table):
                 *[column.name for column in self.columns if isinstance(column.column, LinkedCountColumn)],
             ]
 
-        # Don't show hierarchy if we're sorted
-        if order_by is not None and hide_hierarchy_ui is None:
-            hide_hierarchy_ui = True
-
-        self.hide_hierarchy_ui = hide_hierarchy_ui
-
         # Set default empty_text if none was provided
         if self.empty_text is None:
             self.empty_text = f"No {self._meta.model._meta.verbose_name_plural} found"
@@ -304,6 +303,10 @@ class BaseTable(django_tables2.Table):
         Arguments:
             value: iterable or comma separated string of order by aliases.
         """
+        # The below block of code is copied from Table.order_by()
+        # due to limitations in directly calling parent class methods within a property setter.
+        # See Python bug report: https://bugs.python.org/issue14965
+
         # collapse empty values to ()
         order_by = () if not value else value
         # accept string
@@ -316,22 +319,17 @@ class BaseTable(django_tables2.Table):
                 valid.append(alias)
         self._order_by = OrderByTuple(valid)
 
-        # The above block of code is copied from super().order_by
-        # due to limitations in directly calling parent class methods within a property setter.
-        # See Python bug report: https://bugs.python.org/issue14965
-        model = getattr(self.Meta, "model", None)
-        if model and issubclass(model, TreeNode):
-            # Use the TreeNode model's approach to sorting
-            queryset = self.data.data
-            # If the data passed into the Table is a list (as in cases like BulkImport post),
-            # convert this list to a queryset.
-            # This ensures consistent behavior regardless of the input type.
-            if isinstance(self.data.data, list):
-                queryset = model.objects.filter(pk__in=[instance.pk for instance in self.data.data])
-            self.data.data = queryset.extra(order_by=self._order_by)
-        else:
-            # Otherwise, use the default sorting method
-            self.data.order_by(self._order_by)
+        # Nautobot-specific logic begins here
+        if self._order_by:
+            self.hide_hierarchy_ui = True
+            if isinstance(self.data.data, QuerySet) and hasattr(self.data.data, "without_tree_fields"):
+                self.data.data = self.data.data.without_tree_fields()
+        elif not self.hide_hierarchy_ui:
+            if isinstance(self.data.data, QuerySet) and hasattr(self.data.data, "with_tree_fields"):
+                self.data.data = self.data.data.with_tree_fields()
+
+        # Resume base class implementation
+        self.data.order_by(self._order_by)
 
     def add_conditional_prefetch(self, table_field, db_column=None, prefetch=None):
         """Conditionally prefetch the specified database column if the related table field is visible.

nautobot/core/templates/components/breadcrumbs.html

@@ -0,0 +1,19 @@
+{% load helpers %}
+
+<ol class="breadcrumb">
+    {% block breadcrumbs %}
+        {% if legacy_breadcrumbs %}
+            {{ legacy_breadcrumbs | safe }}
+        {% else %}
+            {% for url, title in breadcrumbs_items %}
+                <li>
+                {% if url %}
+                    <a href="{{ url }}">{{ title }}</a>
+                {% else %}
+                    {{ title }}
+                {% endif %}
+                </li>
+            {% endfor %}
+        {% endif %}
+    {% endblock %}
+</ol>

nautobot/core/templates/components/panel/panel.html

@@ -15,6 +15,6 @@
     {% endif %}
 </div>
 
-{% if body_content_table.paginator %}
+{% if include_paginator and body_content_table.paginator%}
     {% include 'inc/paginator.html' with paginator=body_content_table.paginator page=body_content_table.page %}
 {% endif %}

nautobot/core/templates/generic/object_changelog.html

@@ -1,7 +1,5 @@
 {% extends base_template %}
 
-{% block title %}{{ block.super }} - Change Log{% endblock %}
-
 {% block content %}
     {% include 'panel_table.html' %}
     {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}

nautobot/core/templates/generic/object_list.html

@@ -11,19 +11,22 @@
 {% block header %}
     <div class="row noprint">
         <div class="{% if search_form %}col-sm-8 col-md-9 {% else %} col-md-12 {% endif %}">
-            {% if breadcrumbs is not None %}
-                {% render_breadcrumbs %}
-            {% else %}
-                {# TODO: remove this fragment after breadcrumbs implementation in generic views like ConsoleConnectionsListView #}
-                <ol class="breadcrumb">
-                    {% block breadcrumbs %}
-                        {% if list_url %}
-                            <li><a href="{% url list_url %}">{{ title }}</a></li>
-                        {% endif %}
-                        {% block extra_breadcrumbs %}{% endblock extra_breadcrumbs %}
-                    {% endblock breadcrumbs %}
-                </ol>
+        {% captureas default_breadcrumbs %}
+            {% if list_url %}
+                <li><a href="{% url list_url %}">{{ title }}</a></li>
             {% endif %}
+        {% endcaptureas %}
+
+        {% captureas block_breadcrumbs %}
+            {% block breadcrumbs %}
+                {% if list_url %}
+                    <li><a href="{% url list_url %}">{{ title }}</a></li>
+                {% endif %}
+                {% block extra_breadcrumbs %}{% endblock extra_breadcrumbs %}
+            {% endblock breadcrumbs %}
+        {% endcaptureas %}
+
+        {% render_breadcrumbs default_breadcrumbs block_breadcrumbs %}
         </div>
         {% if search_form %}
         <div class="col-sm-4 col-md-3">

nautobot/core/templates/generic/object_notes.html

@@ -2,8 +2,6 @@
 {% load helpers %}
 {% load form_helpers %}
 
-{% block title %}{{ block.super }} - Notes{% endblock %}
-
 {% block content %}
     {% if perms.extras.add_note %}
         <form action="{% url 'extras:note_add' %}?return_url={{ request.path }}?tab=notes" method="post" enctype="multipart/form-data" class="form form-horizontal">

nautobot/core/templates/generic/object_retrieve.html

@@ -14,17 +14,24 @@
     <div class="row noprint">
         {% with list_url=object|validated_viewname:"list" %}
         <div class="col-sm-8 col-md-9">
-            <ol class="breadcrumb">
+        {% captureas default_breadcrumbs %}
+            {% with list_url=object|validated_viewname:"list" %}
+                <li><a href="{% url list_url %}">{{ verbose_name_plural|bettertitle }}</a></li>
+            {% endwith %}
+            <li>{{ object|hyperlinked_object }}</li>
+        {% endcaptureas %}
+
+        {% captureas block_breadcrumbs %}
             {% block breadcrumbs %}
-                {% if list_url %}
-                <li><a href="{% url list_url %}">
-                    {{ verbose_name_plural|bettertitle }}
-                </a></li>
-                {% endif %}
+                {% with list_url=object|validated_viewname:"list" %}
+                    <li><a href="{% url list_url %}">{{ verbose_name_plural|bettertitle }}</a></li>
+                {% endwith %}
                 {% block extra_breadcrumbs %}{% endblock extra_breadcrumbs %}
                 <li>{{ object|hyperlinked_object }}</li>
-            {% endblock breadcrumbs %}
-            </ol>
+            {% endblock %}
+        {% endcaptureas %}
+
+        {% render_breadcrumbs default_breadcrumbs block_breadcrumbs %}
         </div>
         {% if list_url %}
         <div class="col-sm-4 col-md-3">
@@ -55,7 +62,7 @@
     {% block masthead %}
         <h1>
             <span class="hover_copy">
-                <span id="copy_title">{% block title %}{{object.display|default:object}}{% endblock %}</span>
+                <span id="copy_title">{% block title %}{% render_title %}{% endblock %}</span>
                 <button type="button" class="btn btn-inline btn-default hover_copy_button" data-clipboard-text="{{ object.display | default:object }}">
                     <span class="mdi mdi-content-copy"></span>
                 </button>

nautobot/core/templates/inc/paginator.html

@@ -5,17 +5,17 @@
         <nav>
             <ul class="pagination pull-right">
                 {% if page.has_previous %}
-                    <li><a href="{% querystring request page=page.previous_page_number %}"><i class="mdi mdi-chevron-double-left"></i></a></li>
+                    <li><a href="{% legacy_querystring request page=page.previous_page_number %}"><i class="mdi mdi-chevron-double-left"></i></a></li>
                 {% endif %}
                 {% for p in page.smart_pages %}
                     {% if p %}
-                        <li{% if page.number == p %} class="active"{% endif %}><a href="{% querystring request page=p %}">{{ p }}</a></li>
+                        <li{% if page.number == p %} class="active"{% endif %}><a href="{% legacy_querystring request page=p %}">{{ p }}</a></li>
                     {% else %}
                         <li class="disabled"><span>&hellip;</span></li>
                     {% endif %}
                 {% endfor %}
                 {% if page.has_next %}
-                    <li><a href="{% querystring request page=page.next_page_number %}"><i class="mdi mdi-chevron-double-right"></i></a></li>
+                    <li><a href="{% legacy_querystring request page=page.next_page_number %}"><i class="mdi mdi-chevron-double-right"></i></a></li>
                 {% endif %}
             </ul>
         </nav>

nautobot/core/templates/inc/table.html

@@ -1,6 +1,6 @@
-{% load django_tables2 %}
+{% load querystring from django_tables2 %}
 
-<table{% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
+<table {% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
     {% if table.show_header %}
         <thead>
             <tr>