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

nautobot/apps/choices.py

@@ -14,8 +14,10 @@ from nautobot.dcim.choices import (
     ConsolePortTypeChoices,
     DeviceFaceChoices,
     DeviceRedundancyGroupFailoverStrategyChoices,
+    InterfaceDuplexChoices,
     InterfaceModeChoices,
     InterfaceRedundancyGroupProtocolChoices,
+    InterfaceSpeedChoices,
     InterfaceTypeChoices,
     PortTypeChoices,
     PowerFeedBreakerPoleChoices,
@@ -43,7 +45,6 @@ from nautobot.extras.choices import (
     ButtonClassChoices,
     CustomFieldFilterLogicChoices,
     CustomFieldTypeChoices,
-    CustomLinkButtonClassChoices,
     DynamicGroupOperatorChoices,
     JobExecutionType,
     JobResultStatusChoices,
@@ -79,15 +80,16 @@ __all__ = (
     "ConsolePortTypeChoices",
     "CustomFieldFilterLogicChoices",
     "CustomFieldTypeChoices",
-    "CustomLinkButtonClassChoices",
     "DeviceFaceChoices",
     "DeviceRedundancyGroupFailoverStrategyChoices",
     "DynamicGroupOperatorChoices",
     "IPAddressRoleChoices",
     "IPAddressTypeChoices",
     "IPAddressVersionChoices",
+    "InterfaceDuplexChoices",
     "InterfaceModeChoices",
     "InterfaceRedundancyGroupProtocolChoices",
+    "InterfaceSpeedChoices",
     "InterfaceTypeChoices",
     "JobExecutionType",
     "JobResultStatusChoices",

nautobot/apps/filters.py

@@ -28,24 +28,22 @@ from nautobot.core.filters import (
     TagFilter,
     TreeNodeMultipleChoiceFilter,
 )
-from nautobot.extras.filters import (
+from nautobot.extras.filter_mixins import (
+    ConfigContextRoleFilter,
     CreatedUpdatedModelFilterSetMixin,
     CustomFieldModelFilterSetMixin,
-    NautobotFilterSet,
-    RelationshipModelFilterSetMixin,
-    StatusModelFilterSetMixin,
-)
-from nautobot.extras.filters.mixins import (
-    ConfigContextRoleFilter,
     LocalContextModelFilterSetMixin,
     RelationshipFilter,
+    RelationshipModelFilterSetMixin,
     RoleFilter,
     RoleModelFilterSetMixin,
     StatusFilter,
+    StatusModelFilterSetMixin,
 )
+from nautobot.extras.filters import NautobotFilterSet
 from nautobot.extras.plugins import FilterExtension
-from nautobot.ipam.filters import PrefixFilter
-from nautobot.tenancy.filters import TenancyModelFilterSetMixin
+from nautobot.ipam.filter_mixins import PrefixFilter
+from nautobot.tenancy.filter_mixins import TenancyModelFilterSetMixin
 
 __all__ = (
     "BaseFilterSet",

nautobot/apps/models.py

@@ -43,11 +43,11 @@ from nautobot.extras.models import (
     CustomFieldModel,
     RelationshipModel,
     StatusField,
-    StatusModel,
 )
 from nautobot.extras.models.mixins import (
     ApprovableModelMixin,
     ContactMixin,
+    DataComplianceModelMixin,
     DynamicGroupMixin,
     DynamicGroupsModelMixin,
     NotesMixin,
@@ -76,6 +76,7 @@ __all__ = (
     "ContentTypeRelatedQuerySet",
     "CustomFieldModel",
     "CustomValidator",
+    "DataComplianceModelMixin",
     "DataComplianceRule",
     "DynamicGroupMixin",
     "DynamicGroupsModelMixin",
@@ -97,7 +98,6 @@ __all__ = (
     "RestrictedQuerySet",
     "SavedViewMixin",
     "StatusField",
-    "StatusModel",
     "TagsField",
     "TagsManager",
     "TreeManager",

nautobot/apps/ui.py

@@ -4,6 +4,7 @@ from nautobot.core.choices import ButtonColorChoices
 from nautobot.core.ui.base import PermissionsMixin
 from nautobot.core.ui.breadcrumbs import (
     AncestorsBreadcrumbs,
+    AncestorsInstanceBreadcrumbItem,
     BaseBreadcrumbItem,
     Breadcrumbs,
     context_object_attr,
@@ -12,7 +13,14 @@ from nautobot.core.ui.breadcrumbs import (
     ModelBreadcrumbItem,
     ViewNameBreadcrumbItem,
 )
-from nautobot.core.ui.choices import EChartsTypeChoices, LayoutChoices, SectionChoices
+from nautobot.core.ui.choices import (
+    EChartsThemeColors,
+    EChartsTypeChoices,
+    LayoutChoices,
+    NavigationIconChoices,
+    NavigationWeightChoices,
+    SectionChoices,
+)
 from nautobot.core.ui.echarts import (
     EChartsBase,
     queryset_to_nested_dict_keys_as_series,
@@ -59,6 +67,7 @@ from nautobot.extras.plugins import Banner, TemplateExtension
 
 __all__ = (
     "AncestorsBreadcrumbs",
+    "AncestorsInstanceBreadcrumbItem",
     "Banner",
     "BannerClassChoices",
     "BaseBreadcrumbItem",
@@ -72,6 +81,7 @@ __all__ = (
     "DropdownButton",
     "EChartsBase",
     "EChartsPanel",
+    "EChartsThemeColors",
     "EChartsTypeChoices",
     "GroupedKeyValueTablePanel",
     "HomePageBase",
@@ -90,6 +100,8 @@ __all__ = (
     "NavMenuImportButton",
     "NavMenuItem",
     "NavMenuTab",
+    "NavigationIconChoices",
+    "NavigationWeightChoices",
     "ObjectDetailContent",
     "ObjectFieldsPanel",
     "ObjectTextPanel",

nautobot/apps/utils.py

@@ -27,10 +27,13 @@ from nautobot.core.utils.filtering import (
 from nautobot.core.utils.git import BranchDoesNotExist, convert_git_diff_log_to_list, GitRepo, swap_status_initials
 from nautobot.core.utils.logging import sanitize
 from nautobot.core.utils.lookup import (
+    get_breadcrumbs_for_model,
     get_changes_for_model,
+    get_detail_view_components_context_for_model,
     get_filterset_for_model,
     get_form_for_model,
     get_model_from_name,
+    get_object_detail_content_for_model,
     get_related_class_for_model,
     get_related_field_for_models,
     get_route_for_model,
@@ -38,6 +41,7 @@ from nautobot.core.utils.lookup import (
     get_url_for_url_pattern,
     get_url_patterns,
     get_view_for_model,
+    get_view_titles_for_model,
 )
 from nautobot.core.utils.migrations import migrate_content_type_references_to_new_model
 from nautobot.core.utils.permissions import (
@@ -97,8 +101,10 @@ __all__ = (
     "generate_signature",
     "get_all_lookup_expr_for_field",
     "get_base_template",
+    "get_breadcrumbs_for_model",
     "get_celery_queues",
     "get_changes_for_model",
+    "get_detail_view_components_context_for_model",
     "get_filter_field_label",
     "get_filterable_params_from_filter_params",
     "get_filterset_field",
@@ -107,6 +113,7 @@ __all__ = (
     "get_form_for_model",
     "get_latest_release",
     "get_model_from_name",
+    "get_object_detail_content_for_model",
     "get_permission_for_model",
     "get_related_class_for_model",
     "get_related_field_for_models",
@@ -116,6 +123,7 @@ __all__ = (
     "get_url_for_url_pattern",
     "get_url_patterns",
     "get_view_for_model",
+    "get_view_titles_for_model",
     "get_worker_count",
     "hex_to_rgb",
     "image_upload",

nautobot/circuits/filters.py

@@ -13,8 +13,9 @@ from nautobot.dcim.filters import (
     PathEndpointModelFilterSetMixin,
 )
 from nautobot.dcim.models import Location
-from nautobot.extras.filters import NautobotFilterSet, StatusModelFilterSetMixin
-from nautobot.tenancy.filters.mixins import TenancyModelFilterSetMixin
+from nautobot.extras.filter_mixins import StatusModelFilterSetMixin
+from nautobot.extras.filters import NautobotFilterSet
+from nautobot.tenancy.filter_mixins import TenancyModelFilterSetMixin
 
 from .models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 

nautobot/circuits/navigation.py

@@ -4,12 +4,13 @@ from nautobot.core.apps import (
     NavMenuItem,
     NavMenuTab,
 )
+from nautobot.core.ui.choices import NavigationIconChoices, NavigationWeightChoices
 
 menu_items = (
     NavMenuTab(
         name="Circuits",
-        icon="rotate-cw",
-        weight=500,
+        icon=NavigationIconChoices.CIRCUITS,
+        weight=NavigationWeightChoices.CIRCUITS,
         groups=(
             NavMenuGroup(
                 name="Circuits",

nautobot/circuits/templates/circuits/circuit_create.html

@@ -10,9 +10,9 @@
             {% render_field form.circuit_type %}
             {% render_field form.status %}
             {% render_field form.install_date %}
-            <div class="mb-10 d-flex justify-content-center">
-                <label class="col-lg-3 col-form-label" for="id_commit_rate">{{ form.commit_rate.label }}</label>
-                <div class="col-lg-9">
+            <div class="mb-10 d-md-flex justify-content-center">
+                <label class="col-md-3 col-form-label" for="id_commit_rate">{{ form.commit_rate.label }}</label>
+                <div class="col-md-9">
                     <div class="input-group">
                         {{ form.commit_rate }}
                         {% include 'circuits/inc/speed_widget.html' with target_field='commit_rate' %}

nautobot/circuits/templates/circuits/circuittermination_create.html

@@ -7,24 +7,9 @@
     <div class="card">
         <div class="card-header"><strong>Termination</strong></div>
         <div class="card-body">
-            <div class="mb-10 d-flex justify-content-center">
-                <label class="col-lg-3 col-form-label">Provider</label>
-                <div class="col-lg-9">
-                    <p class="form-control-plaintext">{{ obj.circuit.provider }}</p>
-                </div>
-            </div>
-            <div class="mb-10 d-flex justify-content-center">
-                <label class="col-lg-3 col-form-label">Circuit</label>
-                <div class="col-lg-9">
-                    <p class="form-control-plaintext">{{ obj.circuit.cid }}</p>
-                </div>
-            </div>
-            <div class="mb-10 d-flex justify-content-center">
-                <label class="col-lg-3 col-form-label">Termination</label>
-                <div class="col-lg-9">
-                    <p class="form-control-plaintext">{{ form.term_side.value }}</p>
-                </div>
-            </div>
+            {% include "inc/form_static_field.html" with label="Provider" value=obj.circuit.provider %}
+            {% include "inc/form_static_field.html" with label="Circuit" value=obj.circuit.cid %}
+            {% include "inc/form_static_field.html" with label="Termination" value=form.term_side.value %}
             {% with location_tab_active=form.initial.location %}
                 {% with providernetwork_tab_active=form.initial.provider_network %}
                     {% with cloudnetwork_tab_active=form.initial.cloud_network %}
@@ -58,9 +43,9 @@
     <div class="card">
         <div class="card-header"><strong>Termination Details</strong></div>
         <div class="card-body">
-            <div class="mb-10 d-flex justify-content-center">
-                <label class="col-lg-3 col-form-label" for="id_port_speed">{{ form.port_speed.label }}</label>
-                <div class="col-lg-9">
+            <div class="mb-10 d-md-flex justify-content-center">
+                <label class="col-md-3 col-form-label" for="id_port_speed">{{ form.port_speed.label }}</label>
+                <div class="col-md-9">
                     <div class="input-group">
                         {{ form.port_speed }}
                         {% include 'circuits/inc/speed_widget.html' with target_field='port_speed' %}
@@ -68,9 +53,9 @@
                     <span class="form-text">{{ form.port_speed.help_text }}</span>
                 </div>
             </div>
-            <div class="mb-10 d-flex justify-content-center">
-                <label class="col-lg-3 col-form-label" for="id_upstream_speed">{{ form.upstream_speed.label }}</label>
-                <div class="col-lg-9">
+            <div class="mb-10 d-md-flex justify-content-center">
+                <label class="col-md-3 col-form-label" for="id_upstream_speed">{{ form.upstream_speed.label }}</label>
+                <div class="col-md-9">
                     <div class="input-group">
                         {{ form.upstream_speed }}
                         {% include 'circuits/inc/speed_widget.html' with target_field='upstream_speed' %}

nautobot/circuits/templates/circuits/inc/circuit_termination_cable_fragment.html

@@ -24,14 +24,14 @@
     {% if perms.dcim.add_cable %}
         <div class="float-end">
             <span class="dropdown">
-                <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-bs-toggle="dropdown" data-bs-popper-config='{"strategy": "fixed"}' aria-haspopup="true" aria-expanded="false">
                     <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
                 </button>
-                <ul class="dropdown-menu dropdown-menu-right">
-                    <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='interface' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Interface</a></li>
-                    <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='front-port' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Front Port</a></li>
-                    <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='rear-port' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Rear Port</a></li>
-                    <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='circuit-termination' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
+                <ul class="dropdown-menu dropdown-menu-end">
+                    <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='interface' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Interface</a></li>
+                    <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='front-port' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Front Port</a></li>
+                    <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='rear-port' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Rear Port</a></li>
+                    <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='circuit-termination' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
                 </ul>
             </span>
         </div>

nautobot/circuits/templates/circuits/inc/speed_widget.html

@@ -1,17 +1,17 @@
 <span class="input-group-btn">
-    <button type="button" class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown">
+    <button type="button" class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown" data-bs-popper-config='{"strategy": "fixed"}'>
         <span class="mdi mdi-chevron-down"></span>
     </button>
-    <ul class="dropdown-menu dropdown-menu-right">
-        <li><a href="#" target="{{ target_field }}" data="10000" class="set_speed">10 Mbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="100000" class="set_speed">100 Mbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="1000000" class="set_speed">1 Gbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="10000000" class="set_speed">10 Gbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="25000000" class="set_speed">25 Gbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="40000000" class="set_speed">40 Gbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="100000000" class="set_speed">100 Gbps</a></li>
-        <li class="divider"></li>
-        <li><a href="#" target="{{ target_field }}" data="1544" class="set_speed">T1 (1.544 Mbps)</a></li>
-        <li><a href="#" target="{{ target_field }}" data="2048" class="set_speed">E1 (2.048 Mbps)</a></li>
+    <ul class="dropdown-menu dropdown-menu-end">
+        <li><a href="#" target="{{ target_field }}" data="10000" class="set_speed dropdown-item">10 Mbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="100000" class="set_speed dropdown-item">100 Mbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="1000000" class="set_speed dropdown-item">1 Gbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="10000000" class="set_speed dropdown-item">10 Gbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="25000000" class="set_speed dropdown-item">25 Gbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="40000000" class="set_speed dropdown-item">40 Gbps</a></li>
+        <li><a href="#" target="{{ target_field }}" data="100000000" class="set_speed dropdown-item">100 Gbps</a></li>
+        <li><hr class="dropdown-divider"></li>
+        <li><a href="#" target="{{ target_field }}" data="1544" class="set_speed dropdown-item">T1 (1.544 Mbps)</a></li>
+        <li><a href="#" target="{{ target_field }}" data="2048" class="set_speed dropdown-item">E1 (2.048 Mbps)</a></li>
     </ul>
 </span>

nautobot/circuits/tests/integration/test_circuit.py

@@ -1,5 +1,4 @@
 from django.contrib.contenttypes.models import ContentType
-from django.test import tag
 from django.urls import reverse
 
 from nautobot.circuits.models import Circuit, CircuitTermination, CircuitType, Provider
@@ -48,7 +47,6 @@ class CircuitTestCase(SeleniumTestCase, ObjectsListMixin, ObjectDetailsMixin):
         )
         return circuit
 
-    @tag("fix_in_v3")
     def test_circuit_create(self):
         cid = "Circuit-test-abc123"
         description = "My Precious Circuit"
@@ -87,16 +85,15 @@ class CircuitTestCase(SeleniumTestCase, ObjectsListMixin, ObjectDetailsMixin):
         circuit = Circuit.objects.get(cid=cid)
         self.assertIn(self.live_server_url + reverse("circuits:circuit", kwargs={"pk": circuit.pk}), self.browser.url)
 
-        self.assertPanelValue("Circuit", "Circuit ID", cid)
-        self.assertPanelValue("Circuit", "Status", "Active")
-        self.assertPanelValue("Circuit", "Provider", self.provider.name)
-        self.assertPanelValue("Circuit", "Circuit Type", self.circuit_type.name)
-        self.assertPanelValue("Circuit", "Tenant", self.tenant.name)
-        self.assertPanelValue("Circuit", "Date Installed", "Jan. 1, 2025")
-        self.assertPanelValue("Circuit", "Commit Rate (Kbps)", "192")
-        self.assertPanelValue("Circuit", "Description", description)
+        self.assertPanelValue("CIRCUIT", "Circuit ID", cid)
+        self.assertPanelValue("CIRCUIT", "Status", "Active")
+        self.assertPanelValue("CIRCUIT", "Provider", self.provider.name)
+        self.assertPanelValue("CIRCUIT", "Circuit Type", self.circuit_type.name)
+        self.assertPanelValue("CIRCUIT", "Tenant", self.tenant.name)
+        self.assertPanelValue("CIRCUIT", "Date Installed", "Jan. 1, 2025")
+        self.assertPanelValue("CIRCUIT", "Commit Rate (Kbps)", "192")
+        self.assertPanelValue("CIRCUIT", "Description", description)
 
-    @tag("fix_in_v3")
     def test_circuit_create_termination(self):
         circuit = self.create_circuit("Circuit-test-termination")
         sides = ["A", "Z"]
@@ -108,7 +105,7 @@ class CircuitTestCase(SeleniumTestCase, ObjectsListMixin, ObjectDetailsMixin):
                 self.assertIn(details_url, self.browser.url)
 
                 # Find and click add termination button
-                termination_panel_xpath = f'//*[@id="main"]//div[@class="card-header"][contains(normalize-space(), "Termination - {side} Side")]'
+                termination_panel_xpath = f'//*[@id="main"]//div[contains(@class, "card-header") and contains(normalize-space(), "TERMINATION - {side} SIDE")]'
                 self.browser.find_by_xpath(f'{termination_panel_xpath}//a[normalize-space()="Add"]').click()
 
                 port_speed = ord(side)
@@ -129,7 +126,7 @@ class CircuitTestCase(SeleniumTestCase, ObjectsListMixin, ObjectDetailsMixin):
                 self.assertTrue(self.browser.is_text_present(f"Created circuit termination Termination {side}"))
 
                 # Assert that value are properly set
-                panel_label = f"Termination - {side} Side"
+                panel_label = f"TERMINATION - {side} SIDE"
                 self.assertPanelValue(panel_label, "Location", self.location.name)
                 self.assertPanelValue(panel_label, "Speed", port_speed)
                 self.assertPanelValue(panel_label, "Speed", upstream_speed)

nautobot/circuits/tests/integration/test_circuits_bulk_operations.py

@@ -1,7 +1,5 @@
 import uuid
 
-from django.test import tag
-
 from nautobot.circuits.models import Circuit, CircuitType, Provider
 from nautobot.core.testing.integration import (
     BulkOperationsTestCases,
@@ -9,7 +7,6 @@ from nautobot.core.testing.integration import (
 from nautobot.extras.models import Status
 
 
-@tag("fix_in_v3")
 class CircuitBulkOperationsTestCase(BulkOperationsTestCases.BulkOperationsTestCase):
     """
     Test circuits bulk edit / delete operations.

nautobot/circuits/views.py

@@ -60,7 +60,7 @@ class CircuitTypeUIViewSet(NautobotUIViewSet):
 
 class CircuitTerminationObjectFieldsPanel(ObjectFieldsPanel):
     def get_extra_context(self, context):
-        return {"termination": context["object"]}
+        return {"termination": context["object"], **super().get_extra_context(context)}
 
     def render_key(self, key, value, context):
         if key == "connected_endpoint":
@@ -226,7 +226,11 @@ class CircuitUIViewSet(NautobotUIViewSet):
             return True
 
         def get_extra_context(self, context):
-            return {"termination": context[self.context_object_key], "side": self.side}
+            return {
+                "termination": context[self.context_object_key],
+                "side": self.side,
+                **super().get_extra_context(context),
+            }
 
         def get_data(self, context):
             """

nautobot/cloud/filters.py

@@ -9,7 +9,7 @@ from nautobot.dcim.models import Manufacturer
 from nautobot.extras.filters import NautobotFilterSet
 from nautobot.extras.models import SecretsGroup
 from nautobot.extras.utils import FeatureQuery
-from nautobot.ipam.filters import PrefixFilter
+from nautobot.ipam.filter_mixins import PrefixFilter
 
 
 class CloudAccountFilterSet(NautobotFilterSet):

nautobot/cloud/navigation.py

@@ -4,12 +4,13 @@ from nautobot.core.apps import (
     NavMenuItem,
     NavMenuTab,
 )
+from nautobot.core.ui.choices import NavigationIconChoices, NavigationWeightChoices
 
 menu_items = (
     NavMenuTab(
         name="Cloud",
-        icon="cloud",
-        weight=150,
+        icon=NavigationIconChoices.CLOUD,
+        weight=NavigationWeightChoices.CLOUD,
         groups=(
             NavMenuGroup(
                 name="Cloud",

nautobot/core/api/schema.py

@@ -143,7 +143,7 @@ class NautobotAutoSchema(AutoSchema):
                             "name": "exclude_m2m",
                             "required": False,
                             "description": "Exclude many-to-many fields from the response",
-                            "schema": {"type": "boolean", "default": False},
+                            "schema": {"type": "boolean"},
                         }
                     )
                 # TODO: add "include" parameter to the schema where relevant - nautobot/nautobot#685

nautobot/core/api/serializers.py

@@ -64,6 +64,7 @@ class OptInFieldsMixin:
         - Removes all serializer fields specified in `Meta.opt_in_fields` list that aren't specified in the
           `include` query parameter. (applies to GET requests only)
         - If the `exclude_m2m` query parameter is truthy, remove all many-to-many serializer fields for performance.
+          If `exclude_m2m` is not provided, only `tags`, `content_types`, and `object_types` are included by default.
 
         As an example, if the serializer specifies that `opt_in_fields = ["computed_fields"]`
         but `computed_fields` is not specified in the `?include` query parameter, `computed_fields` will be popped
@@ -102,9 +103,13 @@ class OptInFieldsMixin:
 
             # If exclude_m2m is present and truthy, mark any many-to-many fields as write-only so they
             # don't get included in the response.
-            if is_truthy(params.get("exclude_m2m", "false")):
+            # If exclude_m2m is not present, we include a subset of many-to-many fields by default.
+            exclude_m2m = params.get("exclude_m2m", self.context.get("exclude_m2m", None))
+            if exclude_m2m is None or is_truthy(exclude_m2m):
                 for field_instance in fields.values():
                     if isinstance(field_instance, (serializers.ManyRelatedField, serializers.ListSerializer)):
+                        if exclude_m2m is None and field_instance.source in constants.DEFAULT_M2M_FIELDS:
+                            continue
                         field_instance.write_only = True
 
             self.__pruned_fields = fields

nautobot/core/api/urls.py

@@ -48,9 +48,11 @@ urlpatterns = [
     path("dcim/", include("nautobot.dcim.api.urls")),
     path("extras/", include("nautobot.extras.api.urls")),
     path("ipam/", include("nautobot.ipam.api.urls")),
+    path("load-balancers/", include("nautobot.load_balancers.api.urls")),
     path("tenancy/", include("nautobot.tenancy.api.urls")),
     path("users/", include("nautobot.users.api.urls")),
     path("virtualization/", include("nautobot.virtualization.api.urls")),
+    path("vpn/", include("nautobot.vpn.api.urls")),
     path("wireless/", include("nautobot.wireless.api.urls")),
     path("status/", StatusView.as_view(), name="api-status"),
     path("docs/", NautobotSpectacularSwaggerView.as_view(url_name="schema"), name="api_docs"),

nautobot/core/api/views.py

@@ -458,6 +458,10 @@ class APIRootView(AuthenticatedAPIRootView):
                         "ipam",
                         reverse("ipam-api:api-root", request=request, format=format),
                     ),
+                    (
+                        "load-balancers",
+                        reverse("load_balancers-api:api-root", request=request, format=format),
+                    ),
                     (
                         "plugins",
                         reverse("plugins-api:api-root", request=request, format=format),
@@ -479,6 +483,14 @@ class APIRootView(AuthenticatedAPIRootView):
                             format=format,
                         ),
                     ),
+                    (
+                        "vpn",
+                        reverse(
+                            "vpn-api:api-root",
+                            request=request,
+                            format=format,
+                        ),
+                    ),
                     (
                         "wireless",
                         reverse(

nautobot/core/apps/__init__.py

@@ -9,7 +9,6 @@ from django.db.models.signals import post_migrate
 from django.urls import reverse
 from django.urls.exceptions import NoReverseMatch
 from django.utils.http import urlencode
-from django.utils.module_loading import import_string
 from graphene.types import generic, String
 
 from nautobot.core.signals import nautobot_database_ready
@@ -31,7 +30,8 @@ from nautobot.core.ui.nav import (  # isort: skip  # noqa: F401
     NavMenuTab,
     NAV_CONTEXT_NAMES,
 )
-
+from nautobot.core.utils.module_loading import import_string_optional
+from nautobot.core.utils.patch_social_django import patch_django_storage
 from nautobot.extras.registry import registry
 
 logger = logging.getLogger(__name__)
@@ -60,17 +60,11 @@ class NautobotConfig(AppConfig):
         """
         Ready function initiates the import application.
         """
-        try:
-            homepage_layout = import_string(f"{self.name}.{self.homepage_layout}")
+        if homepage_layout := import_string_optional(f"{self.name}.{self.homepage_layout}"):
             register_homepage_panels(self.path, self.label, homepage_layout)
-        except ImportError:
-            pass
 
-        try:
-            menu_items = import_string(f"{self.name}.{self.menu_tabs}")
+        if menu_items := import_string_optional(f"{self.name}.{self.menu_tabs}"):
             register_menu_items(menu_items)
-        except ImportError:
-            pass
 
 
 def create_or_check_entry(grouping, record, key, path):
@@ -364,6 +358,13 @@ class CoreConfig(NautobotConfig):
             logger.warning("Maintenance mode enabled: disabling update of most recent login time")
             user_logged_in.disconnect(update_last_login, dispatch_uid="update_last_login")
 
+        # SECURITY
+        # Patch social_django to prevent account takeover vulnerability
+        from social_django.models import DjangoStorage
+
+        # TODO: When upgrading to 5.6.0 or later, remove the patch
+        patch_django_storage(DjangoStorage)
+
         post_migrate.connect(post_migrate_send_nautobot_database_ready, sender=self)
 
         super().ready()

nautobot/core/celery/__init__.py

@@ -12,7 +12,6 @@ from django.apps import apps
 from django.conf import settings
 from django.db.utils import OperationalError, ProgrammingError
 from django.utils.functional import SimpleLazyObject
-from django.utils.module_loading import import_string
 from kombu.serialization import register
 from prometheus_client import CollectorRegistry, multiprocess, start_http_server
 
@@ -21,8 +20,7 @@ from nautobot.core.branching import BranchContext
 from nautobot.core.celery.control import discard_git_repository, refresh_git_repository  # noqa: F401  # unused-import
 from nautobot.core.celery.encoders import NautobotKombuJSONEncoder
 from nautobot.core.celery.log import NautobotDatabaseHandler
-from nautobot.core.utils.module_loading import import_modules_privately
-from nautobot.extras.plugins.utils import import_object
+from nautobot.core.utils.module_loading import import_modules_privately, import_string_optional
 from nautobot.extras.registry import registry
 
 logger = logging.getLogger(__name__)
@@ -140,7 +138,7 @@ def _import_dynamic_jobs_from_apps():
                 del sys.modules[job.__module__]
 
         # Load app jobs
-        app_config.features["jobs"] = import_object(f"{app_config.__module__}.{app_config.jobs}")
+        app_config.features["jobs"] = import_string_optional(f"{app_config.__module__}.{app_config.jobs}")
 
 
 def add_nautobot_log_handler(logger_instance, log_format=None):
@@ -220,7 +218,7 @@ def nautobot_kombu_json_loads_hook(data):
         qual_name = data.pop("__nautobot_type__")
         branch_name = data.pop("__nautobot_branch__", None)
         logger.debug("Performing nautobot deserialization for type %s", qual_name)
-        cls = import_string(qual_name)  # fully qualified dotted import path
+        cls = import_string_optional(qual_name)  # fully qualified dotted import path
         if cls:
 
             def get_object():