nautobot 2.4.21__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/dcim/views.py

@@ -31,7 +31,7 @@ from rest_framework.response import Response
 
 from nautobot.circuits.models import Circuit
 from nautobot.cloud.tables import CloudAccountTable
-from nautobot.core.choices import ButtonColorChoices
+from nautobot.core.choices import ButtonActionColorChoices
 from nautobot.core.exceptions import AbortTransaction
 from nautobot.core.forms import BulkRenameForm, ConfirmationForm, ImportForm, restrict_form_fields
 from nautobot.core.models.querysets import count_related
@@ -91,7 +91,8 @@ from nautobot.ipam.tables import (
 )
 from nautobot.ipam.utils import render_ip_with_nat
 from nautobot.virtualization.models import VirtualMachine
-from nautobot.virtualization.tables import VirtualMachineTable
+from nautobot.virtualization.tables import ClusterTable, VirtualMachineTable
+from nautobot.vpn.tables import VPNTunnelEndpointTable
 from nautobot.wireless.forms import ControllerManagedDeviceGroupWirelessNetworkFormSet
 from nautobot.wireless.tables import (
     BaseControllerManagedDeviceGroupWirelessNetworkAssignmentTable,
@@ -307,13 +308,13 @@ class LocationRackGroupsPanel(object_detail.Panel):
             """
             <tr>
                 <td style="padding-left: {}px">
-                    <i class="mdi mdi-folder-open"></i>
+                    <span class="mdi mdi-folder-open"></span>
                     <a href="{}">{}</a>
                 </td>
                 <td>{}</td>
-                <td class="text-right noprint">
-                    <a href="{}" class="btn btn-xs btn-primary" title="View elevations">
-                        <i class="mdi mdi-server"></i>
+                <td class="float-end d-print-none">
+                    <a href="{}" class="btn btn-sm btn-primary" title="View elevations">
+                        <span class="mdi mdi-server"></span>
                     </a>
                 </td>
             </tr>
@@ -924,7 +925,7 @@ class DeviceTypeFieldsPanel(object_detail.ObjectFieldsPanel):
                     image.url,
                     image.name,
                 )
-            return format_html('<span class="text-muted">&mdash;</span>')
+            return format_html('<span class="text-secondary">&mdash;</span>')
 
         return super().render_value(key, value, context)
 
@@ -1224,7 +1225,7 @@ class DeviceTypeUIViewSet(NautobotUIViewSet):
         extra_buttons=(
             object_detail.DropdownButton(
                 weight=100,
-                color=ButtonColorChoices.BLUE,
+                color=ButtonActionColorChoices.ADD,
                 label="Add Components",
                 attributes={"id": "device-type-add-components-button"},
                 icon="mdi-plus-thick",
@@ -2145,6 +2146,7 @@ class ModuleBayTemplateUIViewSet(
     serializer_class = serializers.ModuleBayTemplateSerializer
     table_class = tables.ModuleBayTemplateTable
     create_template_name = "dcim/device_component_add.html"
+    object_detail_content = None
 
     def get_selected_objects_parents_name(self, selected_objects):
         selected_object = selected_objects.first()
@@ -2304,7 +2306,6 @@ class DeviceUIViewSet(NautobotUIViewSet):
         queryset = super().get_queryset()
         if self.detail:  # TODO: change to self.action == "retrieve" as a part of addressing NAUTOBOT-1051
             queryset = queryset.select_related(
-                "cluster__cluster_group",
                 "controller_managed_device_group__controller",
                 "device_redundancy_group",
                 "device_type__device_family",
@@ -2319,7 +2320,7 @@ class DeviceUIViewSet(NautobotUIViewSet):
                 "status",
                 "tenant__tenant_group",
                 "virtual_chassis",
-            ).prefetch_related("images", "software_image_files")
+            ).prefetch_related("clusters", "images", "software_image_files")
         if self.action == "config_context":
             queryset = queryset.annotate_config_context_data()
         return queryset
@@ -2382,7 +2383,7 @@ class DeviceUIViewSet(NautobotUIViewSet):
                 if instance.rack is not None and value is not None:
                     return format_html("U{} / {}", value, instance.get_face_display())
                 if instance.rack is not None and instance.device_type.u_height:
-                    return mark_safe('<span class="label label-warning">Not racked</span>')
+                    return mark_safe('<span class="badge bg-warning">Not racked</span>')
                 return helpers.HTML_NONE
             if key == "device_redundancy_group" and value is not None:
                 instance = get_obj_from_context(context, self.context_object_key)
@@ -2544,7 +2545,7 @@ class DeviceUIViewSet(NautobotUIViewSet):
         extra_buttons=(
             object_detail.DropdownButton(
                 weight=100,
-                color=ButtonColorChoices.BLUE,
+                color=ButtonActionColorChoices.ADD,
                 label="Add Components",
                 attributes={"id": "device-add-components-button"},
                 icon="mdi-plus-thick",
@@ -2675,7 +2676,6 @@ class DeviceUIViewSet(NautobotUIViewSet):
                     "device_redundancy_group",
                     "controller_managed_device_group",
                     "controller_managed_device_group__controller",
-                    "cluster",
                     "software_version",
                 ],
                 key_transforms={"controller_managed_device_group__controller": "Managed By Controller"},
@@ -2683,7 +2683,7 @@ class DeviceUIViewSet(NautobotUIViewSet):
                     "primary_ip4": [render_ip_with_nat],
                     "primary_ip6": [render_ip_with_nat],
                 },
-                hide_if_unset=["controller_managed_device_group__controller", "cluster"],
+                hide_if_unset=["controller_managed_device_group__controller"],
             ),
             DevicePowerUtilizationPanel(
                 weight=100,
@@ -2700,6 +2700,15 @@ class DeviceUIViewSet(NautobotUIViewSet):
                 exclude_columns=["related_object_type", "related_object_name"],
                 show_table_config_button=False,
             ),
+            object_detail.ObjectsTablePanel(
+                weight=250,
+                section=SectionChoices.RIGHT_HALF,
+                table_title="Clusters",
+                table_class=ClusterTable,
+                table_filter="devices",
+                show_table_config_button=False,
+                exclude_columns=["device_count"],
+            ),
             object_detail.ObjectsTablePanel(
                 weight=300,
                 section=SectionChoices.RIGHT_HALF,
@@ -3028,29 +3037,52 @@ class DeviceUIViewSet(NautobotUIViewSet):
                     ),
                 ),
             ),
-            DeviceNAPALMTab(
+            object_detail.DistinctViewTab(
                 weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 1200,
+                tab_id="vpn_endpoints",
+                label="VPN Endpoints",
+                url_name="dcim:device_vpnendpoints",
+                related_object_attribute="vpn_tunnel_endpoints",
+                hide_if_empty=True,
+                panels=(
+                    object_detail.ObjectsTablePanel(
+                        weight=100,
+                        section=SectionChoices.FULL_WIDTH,
+                        table_title="VPN Endpoints",
+                        table_class=VPNTunnelEndpointTable,
+                        table_attribute="vpn_tunnel_endpoints",
+                        related_field_name="device",
+                        select_related_fields=["source_interface", "role"],
+                        exclude_columns=["device"],
+                        tab_id="vpn_endpoints",
+                        enable_bulk_actions=True,
+                        include_paginator=True,
+                    ),
+                ),
+            ),
+            DeviceNAPALMTab(
+                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 1300,
                 tab_id="status",
                 label="Status",
                 url_name="dcim:device_status",
                 required_permissions=["dcim.napalm_read_device"],
             ),
             DeviceNAPALMTab(
-                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 1300,
+                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 1400,
                 tab_id="lldp_neighbors",
                 label="LLDP Neighbors",
                 url_name="dcim:device_lldp_neighbors",
                 required_permissions=["dcim.napalm_read_device"],
             ),
             DeviceNAPALMTab(
-                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 1400,
+                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 1500,
                 tab_id="config",
                 label="Configuration",
                 url_name="dcim:device_config",
                 required_permissions=["dcim.napalm_read_device"],
             ),
             object_detail.DistinctViewTab(
-                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 1500,
+                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 1600,
                 tab_id="config_context",
                 label="Config Context",
                 url_name="dcim:device_configcontext",
@@ -3077,6 +3109,16 @@ class DeviceUIViewSet(NautobotUIViewSet):
 
         return extra_context
 
+    @action(
+        detail=True,
+        url_path="vpn-endpoints",
+        url_name="vpnendpoints",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["vpn.view_vpntunnelendpoint"],
+    )
+    def vpn_endpoints(self, request, *args, **kwargs):
+        return Response({})
+
     @action(
         detail=True,
         url_path="dynamic-groups",
@@ -3433,7 +3475,9 @@ class ModuleUIViewSet(BulkComponentCreateUIViewSetMixin, NautobotUIViewSet):
             .select_related("cable")
             .prefetch_related("_path__destination")
         )
-        consoleport_table = tables.DeviceModuleConsolePortTable(data=consoleports, user=request.user, orderable=False)
+        consoleport_table = tables.DeviceModuleConsolePortTable(
+            data=consoleports, user=request.user, configurable=True, orderable=False
+        )
         if request.user.has_perm("dcim.change_consoleport") or request.user.has_perm("dcim.delete_consoleport"):
             consoleport_table.columns.show("pk")
 
@@ -3459,7 +3503,7 @@ class ModuleUIViewSet(BulkComponentCreateUIViewSetMixin, NautobotUIViewSet):
             .prefetch_related("_path__destination")
         )
         consoleserverport_table = tables.DeviceModuleConsoleServerPortTable(
-            data=consoleserverports, user=request.user, orderable=False, parent_module=instance
+            data=consoleserverports, user=request.user, orderable=False, configurable=True, parent_module=instance
         )
         if request.user.has_perm("dcim.change_consoleserverport") or request.user.has_perm(
             "dcim.delete_consoleserverport"
@@ -3488,7 +3532,7 @@ class ModuleUIViewSet(BulkComponentCreateUIViewSetMixin, NautobotUIViewSet):
             .prefetch_related("_path__destination")
         )
         powerport_table = tables.DeviceModulePowerPortTable(
-            data=powerports, user=request.user, orderable=False, parent_module=instance
+            data=powerports, user=request.user, orderable=False, configurable=True, parent_module=instance
         )
         if request.user.has_perm("dcim.change_powerport") or request.user.has_perm("dcim.delete_powerport"):
             powerport_table.columns.show("pk")
@@ -3515,7 +3559,7 @@ class ModuleUIViewSet(BulkComponentCreateUIViewSetMixin, NautobotUIViewSet):
             .prefetch_related("_path__destination")
         )
         poweroutlet_table = tables.DeviceModulePowerOutletTable(
-            data=poweroutlets, user=request.user, orderable=False, parent_module=instance
+            data=poweroutlets, user=request.user, orderable=False, configurable=True, parent_module=instance
         )
         if request.user.has_perm("dcim.change_poweroutlet") or request.user.has_perm("dcim.delete_poweroutlet"):
             poweroutlet_table.columns.show("pk")
@@ -3546,7 +3590,7 @@ class ModuleUIViewSet(BulkComponentCreateUIViewSetMixin, NautobotUIViewSet):
             .select_related("lag", "cable")
         )
         interface_table = tables.DeviceModuleInterfaceTable(
-            data=interfaces, user=request.user, orderable=False, parent_module=instance
+            data=interfaces, user=request.user, orderable=False, configurable=True, parent_module=instance
         )
         if request.user.has_perm("dcim.change_interface") or request.user.has_perm("dcim.delete_interface"):
             interface_table.columns.show("pk")
@@ -3569,7 +3613,7 @@ class ModuleUIViewSet(BulkComponentCreateUIViewSetMixin, NautobotUIViewSet):
         instance = self.get_object()
         frontports = instance.front_ports.restrict(request.user, "view").select_related("cable", "rear_port")
         frontport_table = tables.DeviceModuleFrontPortTable(
-            data=frontports, user=request.user, orderable=False, parent_module=instance
+            data=frontports, user=request.user, orderable=False, configurable=True, parent_module=instance
         )
         if request.user.has_perm("dcim.change_frontport") or request.user.has_perm("dcim.delete_frontport"):
             frontport_table.columns.show("pk")
@@ -3592,7 +3636,7 @@ class ModuleUIViewSet(BulkComponentCreateUIViewSetMixin, NautobotUIViewSet):
         instance = self.get_object()
         rearports = instance.rear_ports.restrict(request.user, "view").select_related("cable")
         rearport_table = tables.DeviceModuleRearPortTable(
-            data=rearports, user=request.user, orderable=False, parent_module=instance
+            data=rearports, user=request.user, orderable=False, configurable=True, parent_module=instance
         )
         if request.user.has_perm("dcim.change_rearport") or request.user.has_perm("dcim.delete_rearport"):
             rearport_table.columns.show("pk")
@@ -3616,7 +3660,9 @@ class ModuleUIViewSet(BulkComponentCreateUIViewSetMixin, NautobotUIViewSet):
         modulebays = instance.module_bays.restrict(request.user, "view").prefetch_related(
             "installed_module__status", "installed_module"
         )
-        modulebay_table = tables.ModuleModuleBayTable(data=modulebays, user=request.user, orderable=False)
+        modulebay_table = tables.ModuleModuleBayTable(
+            data=modulebays, user=request.user, orderable=False, configurable=True
+        )
         if request.user.has_perm("dcim.change_modulebay") or request.user.has_perm("dcim.delete_modulebay"):
             modulebay_table.columns.show("pk")
 
@@ -4480,14 +4526,6 @@ class ModuleBayUIViewSet(ModuleBayCommonViewSetMixin, NautobotUIViewSet):
         context = super().get_extra_context(request, instance)
 
         if instance:
-            # Set breadcrumbs always
-            context.update(
-                {
-                    "device_breadcrumb_url": "dcim:device_modulebays",
-                    "module_breadcrumb_url": "dcim:module_modulebays",
-                }
-            )
-
             # Add installed module context
             context["installed_module_data"] = self._get_installed_module_context(instance)
 
@@ -4874,7 +4912,6 @@ class ConsoleConnectionsListView(ConnectionsListView):
         return {
             "title": "Console Connections",
             "list_url": "dcim:console_connections_list",
-            "search_form": None,  # ConsoleConnectionFilterSet do not support q filter
         }
 
 
@@ -4894,7 +4931,6 @@ class PowerConnectionsListView(ConnectionsListView):
         return {
             "title": "Power Connections",
             "list_url": "dcim:power_connections_list",
-            "search_form": None,  # PowerConnectionFilterSet do not support q filter
         }
 
 
@@ -4940,7 +4976,6 @@ class InterfaceConnectionsListView(ConnectionsListView):
         return {
             "title": "Interface Connections",
             "list_url": "dcim:interface_connections_list",
-            "search_form": None,  # InterfaceConnectionFilterSet do not support q filter
         }
 
 
@@ -5330,7 +5365,7 @@ class PowerFeedUIViewSet(NautobotUIViewSet):
         """
 
         type_class = instance.get_type_class()
-        return format_html('<span class="label label-{}">{}</span>', type_class, instance.get_type_display())
+        return format_html('<span class="badge bg-{}">{}</span>', type_class, instance.get_type_display())
 
     def _get_connected_target(self, instance):
         """Return (label, value) for the connected row."""
@@ -5403,7 +5438,7 @@ class PowerFeedUIViewSet(NautobotUIViewSet):
                 + f"?return_url={instance.get_absolute_url()}"
             )
             connect_link = format_html(
-                '<a href="{}" class="btn btn-primary btn-sm pull-right">'
+                '<a href="{}" class="btn btn-primary btn-sm float-end">'
                 '<span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect</a>',
                 connect_url,
             )
@@ -5416,9 +5451,9 @@ class PowerFeedUIViewSet(NautobotUIViewSet):
         Render the Path Status as a label based on the path status (active or not).
         """
         path_status = (
-            '<span class="label label-success">Reachable</span>'
+            '<span class="badge bg-success">Reachable</span>'
             if getattr(instance, "path", None) and instance.path.is_active
-            else '<span class="label label-danger">Not Reachable</span>'
+            else '<span class="badge bg-danger">Not Reachable</span>'
         )
         return format_html(path_status)  # Safely render HTML
 
@@ -5508,6 +5543,7 @@ class InterfaceRedundancyGroupAssociationUIViewSet(ObjectEditViewMixin, ObjectDe
     form_class = forms.InterfaceRedundancyGroupAssociationForm
     template_name = "dcim/interfaceredundancygroupassociation_create.html"
     lookup_field = "pk"
+    object_detail_content = None
 
 
 class ModuleFamilyUIViewSet(NautobotUIViewSet):

nautobot/extras/api/serializers.py

@@ -1,6 +1,7 @@
 import logging
 
 from django.conf import settings
+from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
 from drf_spectacular.utils import extend_schema_field
@@ -19,6 +20,7 @@ from nautobot.core.api import (
     ValidatedModelSerializer,
 )
 from nautobot.core.api.exceptions import SerializerNotFound
+from nautobot.core.api.fields import GroupField
 from nautobot.core.api.serializers import PolymorphicProxySerializer
 from nautobot.core.api.utils import (
     get_nested_serializer_depth,
@@ -45,6 +47,11 @@ from nautobot.extras.choices import (
 )
 from nautobot.extras.datasources import get_datasource_content_choices
 from nautobot.extras.models import (
+    ApprovalWorkflow,
+    ApprovalWorkflowDefinition,
+    ApprovalWorkflowStage,
+    ApprovalWorkflowStageDefinition,
+    ApprovalWorkflowStageResponse,
     ComputedField,
     ConfigContext,
     ConfigContextSchema,
@@ -104,6 +111,80 @@ from .fields import MultipleChoiceJSONField
 
 logger = logging.getLogger(__name__)
 
+#
+# Approval Workflows
+#
+
+
+class ApprovalWorkflowDefinitionSerializer(NautobotModelSerializer):
+    """ApprovalWorkflowDefinition Serializer."""
+
+    model_content_type = ContentTypeField(
+        queryset=ContentType.objects.filter(FeatureQuery("approval_workflows").get_query()).order_by(
+            "app_label", "model"
+        ),
+    )
+
+    class Meta:
+        """Meta attributes."""
+
+        model = ApprovalWorkflowDefinition
+        fields = "__all__"
+
+
+class ApprovalWorkflowStageDefinitionSerializer(NautobotModelSerializer):
+    """ApprovalWorkflowStageDefinition Serializer."""
+
+    approver_group = GroupField(
+        queryset=Group.objects.all(),
+        help_text="The group that will be assigned to approve this stage.",
+    )
+
+    class Meta:
+        """Meta attributes."""
+
+        model = ApprovalWorkflowStageDefinition
+        fields = "__all__"
+
+
+class ApprovalWorkflowSerializer(NautobotModelSerializer):
+    """ApprovalWorkflow Serializer."""
+
+    object_under_review_content_type = ContentTypeField(
+        queryset=ContentType.objects.filter(FeatureQuery("approval_workflows").get_query()).order_by(
+            "app_label", "model"
+        ),
+    )
+    decision_date = serializers.DateTimeField(read_only=True, allow_null=True)
+
+    class Meta:
+        """Meta attributes."""
+
+        model = ApprovalWorkflow
+        fields = "__all__"
+
+
+class ApprovalWorkflowStageSerializer(NautobotModelSerializer):
+    """ApprovalWorkflowStage Serializer."""
+
+    decision_date = serializers.DateTimeField(read_only=True, allow_null=True)
+
+    class Meta:
+        """Meta attributes."""
+
+        model = ApprovalWorkflowStage
+        fields = "__all__"
+
+
+class ApprovalWorkflowStageResponseSerializer(ValidatedModelSerializer):
+    """ApprovalWorkflowStageResponse Serializer."""
+
+    class Meta:
+        """Meta attributes."""
+
+        model = ApprovalWorkflowStageResponse
+        fields = "__all__"
+
 
 #
 # Computed Fields
@@ -513,6 +594,7 @@ class GraphQLQueryInputSerializer(serializers.Serializer):
 
 class GraphQLQueryOutputSerializer(serializers.Serializer):
     data = serializers.DictField(default={})
+    errors = serializers.ListField(default=None)
 
 
 #
@@ -569,25 +651,6 @@ class JobSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
         model = Job
         fields = "__all__"
 
-    def validate(self, attrs):
-        # note no validation for on creation of jobs because we do not support user creation of Job records via API
-        if self.instance:
-            has_sensitive_variables = attrs.get("has_sensitive_variables", self.instance.has_sensitive_variables)
-            approval_required = attrs.get("approval_required", self.instance.approval_required)
-
-            if approval_required and has_sensitive_variables:
-                error_message = "A job with sensitive variables cannot also be marked as requiring approval"
-                errors = {}
-
-                if "approval_required" in attrs:
-                    errors["approval_required"] = [error_message]
-                if "has_sensitive_variables" in attrs:
-                    errors["has_sensitive_variables"] = [error_message]
-
-                raise serializers.ValidationError(errors)
-
-        return super().validate(attrs)
-
 
 class JobQueueSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
     class Meta:
@@ -628,6 +691,7 @@ class ScheduledJobSerializer(BaseModelSerializer):
     # queue is added to maintain backward compatibility with versions pre v2.4.
     queue = serializers.CharField(read_only=True, required=False)
     time_zone = TimeZoneSerializerField(required=False)
+    associated_approval_workflows = ApprovalWorkflowSerializer(many=True, read_only=True)
 
     class Meta:
         model = ScheduledJob

nautobot/extras/api/urls.py

@@ -4,6 +4,13 @@ from . import views
 
 router = OrderedDefaultRouter(view_name="Extras")
 
+# Approval Workflows
+router.register("approval-workflow-definitions", views.ApprovalWorkflowDefinitionViewSet)
+router.register("approval-workflows", views.ApprovalWorkflowViewSet)
+router.register("approval-workflow-stage-definitions", views.ApprovalWorkflowStageDefinitionViewSet)
+router.register("approval-workflow-stages", views.ApprovalWorkflowStageViewSet)
+router.register("approval-workflow-stage-responses", views.ApprovalWorkflowStageResponseViewSet)
+
 # Computed Fields
 router.register("computed-fields", views.ComputedFieldViewSet)