nautobot 2.4.8__py3-none-any.whl → 2.4.10__py3-none-any.whl

nautobot/circuits/templates/circuits/circuittype.html

@@ -1,2 +1,2 @@
 {% extends 'circuits/circuittype_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/circuittype_retrieve.html

@@ -1,40 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Circuit Type</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Circuits</td>
-                    <td>
-                        <a href="{% url 'circuits:circuit_list' %}?circuit_type={{ object.pk }}">{{ circuits_table.rows|length }}</a>
-                    </td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_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 %}
-            {% if perms.circuits.add_circuit %}
-                <div class="panel-footer text-right noprint">
-                    <a href="{% url 'circuits:circuit_add' %}?type={{ object.pk }}" class="btn btn-xs btn-primary">
-                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add circuit
-                    </a>
-                </div>
-            {% endif %}
-        </div>
-        {% include 'inc/paginator.html' with paginator=circuits_table.paginator page=circuits_table.page %}
-        <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/circuits/views.py

@@ -2,7 +2,6 @@ from django.contrib import messages
 from django.db import transaction
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.html import format_html
-from django_tables2 import RequestConfig
 
 from nautobot.core.forms import ConfirmationForm
 from nautobot.core.templatetags.helpers import bettertitle, humanize_speed, placeholder
@@ -14,7 +13,6 @@ from nautobot.core.ui.object_detail import (
 )
 from nautobot.core.ui.utils import render_component_template
 from nautobot.core.views import generic
-from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.core.views.viewsets import NautobotUIViewSet
 
 from . import filters, forms, tables
@@ -32,27 +30,24 @@ class CircuitTypeUIViewSet(NautobotUIViewSet):
     serializer_class = serializers.CircuitTypeSerializer
     table_class = tables.CircuitTypeTable
 
-    def get_extra_context(self, request, instance):
-        # Circuits
-        context = super().get_extra_context(request, instance)
-        if self.action == "retrieve":
-            circuits = (
-                Circuit.objects.restrict(request.user, "view")
-                .filter(circuit_type=instance)
-                .select_related("circuit_type", "tenant")
-                .prefetch_related("circuit_terminations__location")
-            )
-
-            circuits_table = tables.CircuitTable(circuits)
-            circuits_table.columns.hide("circuit_type")
-
-            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(
+                section=SectionChoices.LEFT_HALF,
+                weight=100,
+                fields="__all__",
+            ),
+            ObjectsTablePanel(
+                section=SectionChoices.FULL_WIDTH,
+                weight=100,
+                table_class=tables.CircuitTable,
+                table_filter="circuit_type",
+                select_related_fields=["circuit_type", "tenant"],
+                prefetch_related_fields=["circuit_terminations__location"],
+                exclude_columns=["circuit_type"],
+            ),
+        ),
+    )
 
 
 class CircuitTerminationUIViewSet(NautobotUIViewSet):

nautobot/cloud/templates/cloud/cloudresourcetype_retrieve.html

@@ -1,111 +1,4 @@
-{% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_breadcrumbs %}
-    <li><a href="{% url 'cloud:cloudresourcetype_list' %}?provider={{ object.provider.pk }}">{{ object.provider }}</a></li>
-{% endblock extra_breadcrumbs %}
-
-{% block extra_nav_tabs %}
-    {% if networks_count %}
-        <li role="presentation"{% if request.GET.tab == 'networks' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#networks" onclick="switch_tab(this.href, reload=false)" aria-controls="networks" role="tab" data-toggle="tab">
-                Cloud Networks {% badge networks_count %}
-            </a>
-        </li>
-    {% endif %}
-    {% if services_count %}
-        <li role="presentation"{% if request.GET.tab == 'services' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#services" onclick="switch_tab(this.href, reload=false)" aria-controls="services" role="tab" data-toggle="tab">
-                Cloud Services {% badge services_count %}
-            </a>
-        </li>
-    {% endif %}
-{% endblock extra_nav_tabs %}
-
-{% block content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Cloud Resource Type</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>Content Type(s)</td>
-                <td>
-                    {% if object.content_types.all %}
-                        <ul>
-                            {% for content_type in object.content_types.all %}
-                                <li>{{ content_type }}</li>
-                            {% endfor %}
-                        </ul>
-                    {% else %}
-                        {{ None|placeholder }}
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Description</td>
-                <td>{{ object.description|placeholder }}</td>
-            </tr>
-        </table>
-    </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 %}">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Cloud Networks</strong>
-                </div>
-                {% include 'inc/table.html' with table=networks_table %}
-                {% if perms.cloud.add_cloudnetwork %}
-                    <div class="panel-footer text-right noprint">
-                        <a href="{% url 'cloud:cloudnetwork_add' %}?cloud_resource_type={{ object.pk }}" class="btn btn-xs btn-primary">
-                            <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add cloud network
-                        </a>
-                    </div>
-                {% endif %}
-            </div>
-            {% include 'inc/paginator.html' with paginator=networks_table.paginator page=networks_table.page %}
-        </div>
-    {% endif %}
-    {% if services_count %}
-        <div id="services" role="tabpanel" class="tab-pane {% if not active_tab and not request.GET.tab or request.GET.tab == "services" %}active{% else %}fade{% endif %}">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Cloud Services</strong>
-                </div>
-                {% include 'inc/table.html' with table=services_table %}
-                {% if perms.cloud.add_cloudservice %}
-                    <div class="panel-footer text-right noprint">
-                        <a href="{% url 'cloud:cloudservice_add' %}?cloud_resource_type={{ object.pk }}" class="btn btn-xs btn-primary">
-                            <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add cloud service
-                        </a>
-                    </div>
-                {% endif %}
-            </div>
-            {% include 'inc/paginator.html' with paginator=services_table.paginator page=services_table.page %}
-        </div>
-    {% endif %}
-{% endblock extra_tab_content %}
+{% 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

@@ -1,4 +1,3 @@
-from django_tables2 import RequestConfig
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
@@ -33,7 +32,6 @@ from nautobot.cloud.models import CloudAccount, CloudNetwork, CloudResourceType,
 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
 
@@ -181,31 +179,64 @@ class CloudResourceTypeUIViewSet(NautobotUIViewSet):
     form_class = CloudResourceTypeForm
     bulk_update_form_class = CloudResourceTypeBulkEditForm
 
-    def get_extra_context(self, request, instance=None):
-        context = super().get_extra_context(request, instance)
-        if self.action == "retrieve":
-            paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
-
-            networks = instance.cloud_networks.restrict(request.user, "view")
-            networks_table = CloudNetworkTable(networks)
-            networks_table.columns.hide("cloud_resource_type")
-            RequestConfig(request, paginate).configure(networks_table)
-
-            services = instance.cloud_services.restrict(request.user, "view")
-            services_table = CloudServiceTable(services)
-            services_table.columns.hide("cloud_resource_type")
-            RequestConfig(request, paginate).configure(services_table)
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=(
+            object_detail.ObjectFieldsPanel(
+                section=SectionChoices.LEFT_HALF,
+                weight=100,
+                fields=("name", "provider", "content_types", "description"),
+            ),
+            object_detail.ObjectTextPanel(
+                section=SectionChoices.RIGHT_HALF,
+                weight=100,
+                object_field="config_schema",
+                label="Config Schema",
+                render_as=object_detail.ObjectTextPanel.RenderOptions.JSON,
+            ),
+        ),
+        extra_tabs=(
+            object_detail.DistinctViewTab(
+                weight=900,
+                tab_id="networks",
+                label="Cloud Networks",
+                url_name="cloud:cloudresourcetype_networks",
+                related_object_attribute="cloud_networks",
+                panels=(
+                    object_detail.ObjectsTablePanel(
+                        section=SectionChoices.FULL_WIDTH,
+                        weight=100,
+                        table_class=CloudNetworkTable,
+                        table_filter="cloud_resource_type",
+                        tab_id="networks",
+                    ),
+                ),
+            ),
+            object_detail.DistinctViewTab(
+                weight=1000,
+                tab_id="services",
+                label="Cloud Services",
+                url_name="cloud:cloudresourcetype_services",
+                related_object_attribute="cloud_services",
+                panels=(
+                    object_detail.ObjectsTablePanel(
+                        section=SectionChoices.FULL_WIDTH,
+                        weight=100,
+                        table_class=CloudServiceTable,
+                        table_filter="cloud_resource_type",
+                        tab_id="services",
+                    ),
+                ),
+            ),
+        ),
+    )
 
-            context.update(
-                {
-                    "networks_count": networks.count(),
-                    "networks_table": networks_table,
-                    "services_count": services.count(),
-                    "services_table": services_table,
-                }
-            )
+    @action(detail=True, url_path="networks")
+    def networks(self, request, *args, **kwargs):
+        return Response({})
 
-        return context
+    @action(detail=True, url_path="services")
+    def services(self, request, *args, **kwargs):
+        return Response({})
 
 
 class CloudServiceUIViewSet(NautobotUIViewSet):

nautobot/core/api/parsers.py

@@ -136,6 +136,56 @@ class NautobotCSVParser(BaseParser):
 
         return data_without_missing_field_lookups_values
 
+    def _convert_m2m_dict_to_list_of_dicts(self, data, field):
+        """
+        Converts a nested dictionary into list of flat dictionaries for M2M serializer.
+
+        Args:
+            data (dict): Nested dictionary with comma-separated string values.
+            field (str): Field name used in error messages.
+
+        Returns:
+            list: List of dictionaries, each containing one set of related values.
+
+        Raises:
+            ParseError: If the number of comma-separated values is inconsistent
+                       across different keys.
+
+        Examples:
+            >>> data = {'manufacturer': {'name': 'Cisco,Cisco,Aruba'}, 'model': 'C9300,C9500,CX 6300'}
+            >>> field = "device_type"
+            >>> value = self.convert_m2m_dict_to_list_of_dicts(data, field)
+            >>> value
+            [
+                {'manufacturer': {'name': 'Cisco'},'model': 'C9300'},
+                {'manufacturer': {'name': 'Cisco'},'model': 'C9500'},
+                {'manufacturer': {'name': 'Aruba'},'model': 'CX 6300'}
+            ]
+        """
+
+        def flatten_dict(d, parent_key=""):
+            """Flatten nested dictionary with __ separated keys"""
+            items = []
+            for k, v in d.items():
+                new_key = f"{parent_key}__{k}" if parent_key else k
+                if isinstance(v, dict):
+                    items.extend(flatten_dict(v, new_key).items())
+                else:
+                    items.append((new_key, v.split(",")))
+            return dict(items)
+
+        flat_data = flatten_dict(data)
+
+        # Convert dictionary to list of dictionaries
+        values_count = {len(value) for value in flat_data.values()}
+        if len(values_count) > 1:
+            raise ParseError(f"Incorrect number of values provided for the {field} field")
+        values_count = values_count.pop()
+        return [
+            self._group_data_by_field_name({key: value[i] for key, value in flat_data.items()})
+            for i in range(values_count)
+        ]
+
     def row_elements_to_data(self, counter, row, serializer):
         """
         Parse a single row of CSV data (represented as a dict) into a dict suitable for consumption by the serializer.
@@ -171,9 +221,13 @@ class NautobotCSVParser(BaseParser):
                 continue
 
             if isinstance(serializer_field, serializers.ManyRelatedField):
-                # A list of related objects, represented as a list of composite-keys
                 if value:
-                    value = value.split(",")
+                    # A list of related objects, represented as a list of composite-keys
+                    if isinstance(value, str):
+                        value = value.split(",")
+                    # A dictionary of fields identifying the objects
+                    elif isinstance(value, dict):
+                        value = self._convert_m2m_dict_to_list_of_dicts(value, key)
                 else:
                     value = []
             elif isinstance(serializer_field, serializers.RelatedField):

nautobot/core/celery/schedulers.py

@@ -76,6 +76,7 @@ class NautobotScheduleEntry(ModelEntry):
             self._disable(model)
 
         if isinstance(model.celery_kwargs, Mapping):
+            # TODO: this allows model.celery_kwargs to override keys like `nautobot_job_user_id`; is that desirable?
             self.options.update(model.celery_kwargs)
 
         # copy-paste from django_celery_beat.schedulers

nautobot/core/filters.py

@@ -397,7 +397,7 @@ class MappedPredicatesFilterMixin:
                 lookup_expr = lookup_info.get("lookup_expr")
                 preprocessor = lookup_info.get("preprocessor")
                 if not callable(preprocessor):
-                    raise TypeError("Preprocessor {preprocessor} must be callable!")
+                    raise TypeError(f"Preprocessor {preprocessor} must be callable!")
             else:
                 raise TypeError(f"Predicate value must be a str or a dict! Got: {type(lookup_info)}")
 

nautobot/core/graphql/schema.py

@@ -95,6 +95,7 @@ CUSTOM_FIELD_MAPPING = {
     CustomFieldTypeChoices.TYPE_URL: graphene.String(),
     CustomFieldTypeChoices.TYPE_SELECT: graphene.String(),
     CustomFieldTypeChoices.TYPE_JSON: JSON(),
+    CustomFieldTypeChoices.TYPE_MULTISELECT: graphene.List(graphene.String),
 }
 
 

nautobot/core/jobs/__init__.py

@@ -38,7 +38,7 @@ from nautobot.extras.jobs import (
     StringVar,
     TextVar,
 )
-from nautobot.extras.models import ExportTemplate, GitRepository
+from nautobot.extras.models import ExportTemplate, GitRepository, SavedView
 
 name = "System Jobs"
 
@@ -150,6 +150,16 @@ class ExportObjectList(Job):
         soft_time_limit = 1800
         time_limit = 2000
 
+    def _get_saved_view_filter_params(self, query_params):
+        """Extract filter params from saved view if applicable."""
+        if "saved_view" in query_params and "all_filters_removed" not in query_params:
+            saved_view_filters = SavedView.objects.get(pk=query_params["saved_view"]).config.get("filter_params", {})
+            if len(query_params) > 1:
+                # Retain only filters also present in query_params
+                saved_view_filters = {key: value for key, value in saved_view_filters.items() if key in query_params}
+            return saved_view_filters
+        return {}
+
     def run(self, *, content_type, query_string="", export_format="csv", export_template=None):  # pylint:disable=arguments-differ
         if not self.user.has_perm(f"{content_type.app_label}.view_{content_type.model}"):
             self.logger.error('User "%s" does not have permission to view %s objects', self.user, content_type.model)
@@ -178,8 +188,9 @@ class ExportObjectList(Job):
             "sort",
             "table_changes_pending",
         )
-        filter_params = get_filterable_params_from_filter_params(
-            query_params, default_non_filter_params, filterset_class()
+        filter_params = self._get_saved_view_filter_params(query_params)
+        filter_params.update(
+            get_filterable_params_from_filter_params(query_params, default_non_filter_params, filterset_class())
         )
         self.logger.debug("Filterset params: `%s`", filter_params)
         filterset = filterset_class(filter_params, queryset)

nautobot/core/models/__init__.py

@@ -132,6 +132,8 @@ class BaseModel(models.Model):
         self.full_clean()
         self.save(*args, **kwargs)
 
+    validated_save.alters_data = True
+
     def natural_key(self) -> list:
         """
         Smarter default implementation of natural key construction.

nautobot/core/tables.py

@@ -704,11 +704,17 @@ class RelationshipColumn(django_tables2.Column):
         if len(value) < 1:
             return "—"
 
+        v = value[0]
+        peer = v.get_peer(record)
+
         # Handle Relationships on the many side.
         if self.relationship.has_many(self.peer_side):
-            v = value[0]
-            meta = type(v.get_peer(record))._meta
-            name = meta.verbose_name_plural if len(value) > 1 else meta.verbose_name
+            if peer is not None:
+                meta = type(peer)._meta
+                name = meta.verbose_name_plural if len(value) > 1 else meta.verbose_name
+            else:  # Perhaps a relationship to an uninstalled App's models?
+                peer_type = getattr(self.relationship, f"{self.peer_side}_type")
+                name = f"{peer_type} object(s)"
             return format_html(
                 '<a href="{}?relationship={}&{}_id={}">{} {}</a>',
                 reverse("extras:relationshipassociation_list"),
@@ -720,6 +726,7 @@ class RelationshipColumn(django_tables2.Column):
             )
         # Handle Relationships on the one side.
         else:
-            v = value[0]
-            peer = v.get_peer(record)
-            return format_html('<a href="{}">{}</a>', peer.get_absolute_url(), peer)
+            if peer is not None:
+                return format_html('<a href="{}">{}</a>', peer.get_absolute_url(), peer)
+            else:
+                return format_html("(unknown)")

nautobot/core/testing/views.py

@@ -302,6 +302,11 @@ class ViewTestCases:
         slug_source = None
         slugify_function = staticmethod(slugify)
         slug_test_object = ""
+        expected_create_form_buttons = [
+            '<button type="submit" name="_create" class="btn btn-primary">Create</button>',
+            '<button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>',
+        ]
+        expected_edit_form_buttons = ['<button type="submit" name="_update" class="btn btn-primary">Update</button>']
 
         def test_create_object_without_permission(self):
             # Try GET without permission
@@ -325,7 +330,14 @@ class ViewTestCases:
             self.add_permissions(f"{self.model._meta.app_label}.add_{self.model._meta.model_name}")
 
             # Try GET with model-level permission
-            self.assertHttpStatus(self.client.get(self._get_url("add")), 200)
+            response = self.client.get(self._get_url("add"))
+            self.assertHttpStatus(response, 200)
+            # The response content should contain the expected form buttons
+            for button in self.expected_create_form_buttons:
+                self.assertBodyContains(response, button)
+            # The response content should not contain the expected form buttons
+            for button in self.expected_edit_form_buttons:
+                self.assertNotContains(response, button)
 
             # Try POST with model-level permission
             request = {
@@ -439,6 +451,11 @@ class ViewTestCases:
 
         form_data = {}
         update_data = {}
+        expected_edit_form_buttons = ['<button type="submit" name="_update" class="btn btn-primary">Update</button>']
+        expected_create_form_buttons = [
+            '<button type="submit" name="_create" class="btn btn-primary">Create</button>',
+            '<button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>',
+        ]
 
         def test_edit_object_without_permission(self):
             instance = self._get_queryset().first()
@@ -464,7 +481,15 @@ class ViewTestCases:
             self.add_permissions(f"{self.model._meta.app_label}.change_{self.model._meta.model_name}")
 
             # Try GET with model-level permission
-            self.assertHttpStatus(self.client.get(self._get_url("edit", instance)), 200)
+            response = self.client.get(self._get_url("edit", instance))
+            self.assertHttpStatus(response, 200)
+            # The response content should contain the expected form buttons
+            for button in self.expected_edit_form_buttons:
+                self.assertBodyContains(response, button)
+
+            # The response content should not contain the unexpected form buttons
+            for button in self.expected_create_form_buttons:
+                self.assertNotContains(response, button)
 
             # Try POST with model-level permission
             update_data = self.update_data or self.form_data