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

nautobot/vpn/views.py

@@ -0,0 +1,437 @@
+"""Views for the vpn models."""
+
+import logging
+
+from django.core.exceptions import ValidationError
+from rest_framework.decorators import action
+from rest_framework.response import Response
+
+from nautobot.apps.ui import ObjectDetailContent, ObjectFieldsPanel, ObjectsTablePanel, SectionChoices
+from nautobot.apps.views import NautobotUIViewSet
+from nautobot.core.ui import object_detail
+from nautobot.extras.tables import DynamicGroupTable
+from nautobot.ipam.tables import PrefixTable
+
+from . import filters, forms, models, tables
+from .api import serializers
+
+logger = logging.getLogger(__name__)
+
+
+class VPNProfileUIViewSet(NautobotUIViewSet):
+    """ViewSet for VPNProfile."""
+
+    bulk_update_form_class = forms.VPNProfileBulkEditForm
+    filterset_class = filters.VPNProfileFilterSet
+    filterset_form_class = forms.VPNProfileFilterForm
+    form_class = forms.VPNProfileForm
+    lookup_field = "pk"
+    queryset = models.VPNProfile.objects.all()
+    serializer_class = serializers.VPNProfileSerializer
+    table_class = tables.VPNProfileTable
+
+    object_detail_content = ObjectDetailContent(
+        panels=[
+            ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields=[
+                    "name",
+                    "description",
+                    "keepalive_enabled",
+                    "keepalive_interval",
+                    "keepalive_retries",
+                    "nat_traversal",
+                    "extra_options",
+                    "secrets_group",
+                    "role",
+                    "tenant",
+                ],
+            ),
+            ObjectsTablePanel(
+                weight=100,
+                table_class=tables.VPNProfilePhase1PolicyAssignmentTable,
+                table_filter="vpn_profile",
+                section=SectionChoices.RIGHT_HALF,
+                exclude_columns=[],
+            ),
+            ObjectsTablePanel(
+                weight=200,
+                table_class=tables.VPNProfilePhase2PolicyAssignmentTable,
+                table_filter="vpn_profile",
+                section=SectionChoices.RIGHT_HALF,
+                exclude_columns=[],
+            ),
+        ],
+        extra_tabs=[
+            object_detail.DistinctViewTab(
+                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 100,
+                tab_id="vpn_vpns",
+                label="VPNs",
+                url_name="vpn:vpnprofile_vpns",
+                related_object_attribute="vpns",
+                hide_if_empty=True,
+                panels=(
+                    object_detail.ObjectsTablePanel(
+                        weight=100,
+                        section=SectionChoices.FULL_WIDTH,
+                        table_title="VPNs",
+                        table_class=tables.VPNTable,
+                        table_attribute="vpns",
+                        related_field_name="vpn_profile",
+                        select_related_fields=["role"],
+                        exclude_columns=["vpn_profile"],
+                        tab_id="vpns",
+                        enable_bulk_actions=True,
+                        include_paginator=True,
+                    ),
+                ),
+            ),
+            object_detail.DistinctViewTab(
+                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 200,
+                tab_id="vpn_tunnels",
+                label="VPN Tunnels",
+                url_name="vpn:vpnprofile_vpntunnels",
+                related_object_attribute="vpn_tunnels",
+                hide_if_empty=True,
+                panels=(
+                    object_detail.ObjectsTablePanel(
+                        weight=100,
+                        section=SectionChoices.FULL_WIDTH,
+                        table_title="VPN Tunnels",
+                        table_class=tables.VPNTunnelTable,
+                        table_attribute="vpn_tunnels",
+                        related_field_name="vpn_profile",
+                        select_related_fields=["endpoint_a", "endpoint_z", "role"],
+                        exclude_columns=["vpn_profile"],
+                        tab_id="vpn_tunnels",
+                        enable_bulk_actions=True,
+                        include_paginator=True,
+                    ),
+                ),
+            ),
+            object_detail.DistinctViewTab(
+                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 300,
+                tab_id="vpn_endpoints",
+                label="VPN Endpoints",
+                url_name="vpn:vpnprofile_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=tables.VPNTunnelEndpointTable,
+                        table_attribute="vpn_tunnel_endpoints",
+                        related_field_name="vpn_profile",
+                        select_related_fields=["source_interface", "role"],
+                        exclude_columns=["vpn_profile"],
+                        tab_id="vpn_endpoints",
+                        enable_bulk_actions=True,
+                        include_paginator=True,
+                    ),
+                ),
+            ),
+        ],
+    )
+
+    def get_extra_context(self, request, instance=None):
+        ctx = super().get_extra_context(request, instance)
+
+        if self.action in ["create", "update"]:
+            ctx["vpn_phase1_policies"] = forms.VPNProfilePh1FormSet(
+                instance=instance,
+                data=request.POST if request.method == "POST" else None,
+            )
+            ctx["vpn_phase2_policies"] = forms.VPNProfilePh2FormSet(
+                instance=instance,
+                data=request.POST if request.method == "POST" else None,
+            )
+        return ctx
+
+    @action(
+        detail=True,
+        url_path="vpn-vpns",
+        url_name="vpns",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["vpn.view_vpns"],
+    )
+    def vpn_vpns(self, request, *args, **kwargs):
+        return Response({})
+
+    @action(
+        detail=True,
+        url_path="vpn-tunnels",
+        url_name="vpntunnels",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["vpn.view_vpntunnels"],
+    )
+    def vpn_tunnels(self, request, *args, **kwargs):
+        return Response({})
+
+    @action(
+        detail=True,
+        url_path="vpn-endpoints",
+        url_name="vpnendpoints",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["vpn.view_vpntunnelendpoints"],
+    )
+    def vpn_endpoints(self, request, *args, **kwargs):
+        return Response({})
+
+    def form_save(self, form, **kwargs):
+        obj = super().form_save(form, **kwargs)
+        ctx = self.get_extra_context(self.request, obj)
+
+        vpn_phase1_policies = ctx.get("vpn_phase1_policies")
+        if vpn_phase1_policies.is_valid():
+            vpn_phase1_policies.save()
+        else:
+            logger.debug("PH1 Policies")
+            logger.error(vpn_phase1_policies.errors)
+            raise ValidationError(vpn_phase1_policies.errors)
+
+        vpn_phase2_policies = ctx.get("vpn_phase2_policies")
+        if vpn_phase2_policies.is_valid():
+            vpn_phase2_policies.save()
+        else:
+            logger.debug("PH2 Policies")
+            logger.error(vpn_phase1_policies.errors)
+            raise ValidationError(vpn_phase2_policies.errors)
+
+        return obj
+
+
+class VPNPhase1PolicyUIViewSet(NautobotUIViewSet):
+    """ViewSet for VPNPhase1Policy."""
+
+    bulk_update_form_class = forms.VPNPhase1PolicyBulkEditForm
+    filterset_class = filters.VPNPhase1PolicyFilterSet
+    filterset_form_class = forms.VPNPhase1PolicyFilterForm
+    form_class = forms.VPNPhase1PolicyForm
+    lookup_field = "pk"
+    queryset = models.VPNPhase1Policy.objects.all()
+    serializer_class = serializers.VPNPhase1PolicySerializer
+    table_class = tables.VPNPhase1PolicyTable
+
+    object_detail_content = ObjectDetailContent(
+        panels=[
+            ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields=[
+                    "name",
+                    "description",
+                    "ike_version",
+                    "aggressive_mode",
+                    "encryption_algorithm",
+                    "integrity_algorithm",
+                    "dh_group",
+                    "lifetime_seconds",
+                    "lifetime_kb",
+                    "authentication_method",
+                    "tenant",
+                ],
+            ),
+        ],
+    )
+
+
+class VPNPhase2PolicyUIViewSet(NautobotUIViewSet):
+    """ViewSet for VPNPhase2Policy."""
+
+    bulk_update_form_class = forms.VPNPhase2PolicyBulkEditForm
+    filterset_class = filters.VPNPhase2PolicyFilterSet
+    filterset_form_class = forms.VPNPhase2PolicyFilterForm
+    form_class = forms.VPNPhase2PolicyForm
+    lookup_field = "pk"
+    queryset = models.VPNPhase2Policy.objects.all()
+    serializer_class = serializers.VPNPhase2PolicySerializer
+    table_class = tables.VPNPhase2PolicyTable
+
+    object_detail_content = ObjectDetailContent(
+        panels=[
+            ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields=[
+                    "name",
+                    "description",
+                    "encryption_algorithm",
+                    "integrity_algorithm",
+                    "pfs_group",
+                    "lifetime",
+                    "tenant",
+                ],
+            ),
+        ],
+    )
+
+
+class VPNUIViewSet(NautobotUIViewSet):
+    """ViewSet for VPN."""
+
+    bulk_update_form_class = forms.VPNBulkEditForm
+    filterset_class = filters.VPNFilterSet
+    filterset_form_class = forms.VPNFilterForm
+    form_class = forms.VPNForm
+    lookup_field = "pk"
+    queryset = models.VPN.objects.all()
+    serializer_class = serializers.VPNSerializer
+    table_class = tables.VPNTable
+
+    object_detail_content = ObjectDetailContent(
+        panels=[
+            ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields=["vpn_profile", "name", "description", "vpn_id", "role", "tenant"],
+            ),
+            ObjectsTablePanel(
+                weight=200,
+                table_class=tables.VPNTunnelTable,
+                table_filter="vpn",
+                section=SectionChoices.FULL_WIDTH,
+                exclude_columns=[],
+            ),
+        ],
+    )
+
+
+class VPNTunnelUIViewSet(NautobotUIViewSet):
+    """ViewSet for VPNTunnel."""
+
+    bulk_update_form_class = forms.VPNTunnelBulkEditForm
+    filterset_class = filters.VPNTunnelFilterSet
+    filterset_form_class = forms.VPNTunnelFilterForm
+    form_class = forms.VPNTunnelForm
+    lookup_field = "pk"
+    queryset = models.VPNTunnel.objects.all()
+    serializer_class = serializers.VPNTunnelSerializer
+    table_class = tables.VPNTunnelTable
+
+    object_detail_content = ObjectDetailContent(
+        panels=[
+            ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields=[
+                    "name",
+                    "description",
+                    "vpn",
+                    "vpn_profile",
+                    "tunnel_id",
+                    "encapsulation",
+                    "role",
+                    "status",
+                    "tenant",
+                ],
+            ),
+            ObjectsTablePanel(
+                weight=100,
+                label="A",
+                table_class=tables.VPNTunnelEndpointTable,
+                table_filter="endpoint_a_vpn_tunnels",
+                table_title="Tunnel Endpoint",
+                section=SectionChoices.RIGHT_HALF,
+                exclude_columns=[
+                    "protected_prefixes_count",
+                    "tenant",
+                ],
+                add_button_route=None,
+            ),
+            ObjectsTablePanel(
+                weight=200,
+                label="Z",
+                table_class=tables.VPNTunnelEndpointTable,
+                table_filter="endpoint_z_vpn_tunnels",
+                table_title="Tunnel Endpoint",
+                section=SectionChoices.RIGHT_HALF,
+                exclude_columns=[
+                    "protected_prefixes_count",
+                    "tenant",
+                ],
+                add_button_route=None,
+            ),
+        ],
+    )
+
+
+class VPNTunnelEndpointUIViewSet(NautobotUIViewSet):
+    """ViewSet for VPNTunnelEndpoint."""
+
+    bulk_update_form_class = forms.VPNTunnelEndpointBulkEditForm
+    filterset_class = filters.VPNTunnelEndpointFilterSet
+    filterset_form_class = forms.VPNTunnelEndpointFilterForm
+    form_class = forms.VPNTunnelEndpointForm
+    lookup_field = "pk"
+    queryset = models.VPNTunnelEndpoint.objects.all()
+    serializer_class = serializers.VPNTunnelEndpointSerializer
+    table_class = tables.VPNTunnelEndpointTable
+
+    object_detail_content = ObjectDetailContent(
+        panels=[
+            ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields=[
+                    "name",
+                    "vpn_profile",
+                    "device",
+                    "source_interface",
+                    "source_ipaddress",
+                    "source_fqdn",
+                    "tunnel_interface",
+                    "role",
+                    "tenant",
+                ],
+            ),
+            ObjectsTablePanel(
+                weight=100,
+                table_class=tables.VPNTunnelTable,
+                table_filter="endpoint_a",
+                table_title="A Endpoint Tunnels",
+                section=SectionChoices.RIGHT_HALF,
+                exclude_columns=[
+                    "description",
+                    "endpoint_a",
+                    "tenant",
+                    "actions",
+                ],
+                add_button_route=None,
+            ),
+            ObjectsTablePanel(
+                weight=200,
+                table_class=tables.VPNTunnelTable,
+                table_filter="endpoint_z",
+                table_title="Z Endpoint Tunnels",
+                section=SectionChoices.RIGHT_HALF,
+                exclude_columns=[
+                    "description",
+                    "endpoint_z",
+                    "tenant",
+                    "actions",
+                ],
+                add_button_route=None,
+            ),
+            ObjectsTablePanel(
+                weight=100,
+                table_title="Protected Prefixes",
+                table_class=PrefixTable,
+                table_filter="vpn_tunnel_endpoints",
+                section=SectionChoices.FULL_WIDTH,
+                exclude_columns=[],
+                add_button_route=None,
+            ),
+            ObjectsTablePanel(
+                weight=200,
+                table_title="Protected Prefixes from Dynamic Group",
+                table_class=DynamicGroupTable,
+                table_filter="vpn_tunnel_endpoints",
+                section=SectionChoices.FULL_WIDTH,
+                exclude_columns=[],
+                add_button_route=None,
+            ),
+        ],
+    )

nautobot/wireless/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="Wireless",
-        icon="wifi",
-        weight=250,
+        icon=NavigationIconChoices.WIRELESS,
+        weight=NavigationWeightChoices.WIRELESS,
         groups=(
             NavMenuGroup(
                 name="Wireless",

nautobot/wireless/tests/integration/test_radio_profile.py

@@ -1,4 +1,3 @@
-from django.test import tag
 from django.urls import reverse
 
 from nautobot.core.testing.integration import SeleniumTestCase
@@ -10,7 +9,6 @@ class RadioProfileTestCase(SeleniumTestCase):
     Perform set of Radio Profile tests using Selenium.
     """
 
-    @tag("fix_in_v3")
     def test_radio_profile_bulk_edit(self):
         """
         This test goes through the process of creating a radio profile and performing bulk edit.
@@ -37,6 +35,4 @@ class RadioProfileTestCase(SeleniumTestCase):
         self.browser.find_by_xpath("//button[@name='_apply']", wait_time=5).click()
 
         job_result = JobResult.objects.filter(name="Bulk Edit Objects").first()
-        self.assertEqual(
-            self.browser.url, self.live_server_url + reverse("extras:jobresult", args=[job_result.pk]) + "?tab=main"
-        )
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("extras:jobresult", args=[job_result.pk]))

nautobot/wireless/tests/test_api.py

@@ -37,7 +37,7 @@ class SupportedDataRateTest(APIViewTestCases.APIViewTestCase):
 
 class RadioProfileTest(APIViewTestCases.APIViewTestCase):
     model = models.RadioProfile
-    choices_fields = ["frequency", "regulatory_domain"]
+    choices_fields = ["channel_width", "frequency", "regulatory_domain"]
 
     @classmethod
     def setUpTestData(cls):

{nautobot-3.0.0a2.dist-info → nautobot-3.0.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nautobot
-Version: 3.0.0a2
+Version: 3.0.0a3
 Summary: Source of truth and network automation platform.
 License: Apache-2.0
 Keywords: Nautobot
@@ -21,20 +21,20 @@ Provides-Extra: mysql
 Provides-Extra: napalm
 Provides-Extra: remote-storage
 Provides-Extra: sso
-Requires-Dist: Django (>=4.2.24,<4.3.0)
+Requires-Dist: Django (>=4.2.25,<4.3.0)
 Requires-Dist: GitPython (>=3.1.45,<3.2.0)
 Requires-Dist: Jinja2 (>=3.1.6,<3.2.0)
 Requires-Dist: Markdown (>=3.8.2,<3.9.0)
-Requires-Dist: Pillow (>=11.0,<12.0)
-Requires-Dist: PyYAML (>=6.0.2,<6.1.0)
+Requires-Dist: Pillow (>=12.0.0,<12.1.0)
+Requires-Dist: PyYAML (>=6.0.3,<6.1.0)
 Requires-Dist: celery (>=5.5.3,<5.6.0)
-Requires-Dist: cryptography (>=45.0.7,<45.1.0)
+Requires-Dist: cryptography (>=46.0.3,<46.1.0)
 Requires-Dist: django-ajax-tables (>=1.1.1,<1.2.0)
 Requires-Dist: django-auth-ldap (>=5.2.0,<5.3.0) ; extra == "all" or extra == "ldap"
 Requires-Dist: django-celery-beat (>=2.7.0,<2.8.0)
 Requires-Dist: django-celery-results (>=2.6.0,<2.7.0)
 Requires-Dist: django-constance (>=4.3.2,<4.4.0)
-Requires-Dist: django-cors-headers (>=4.7.0,<4.8.0)
+Requires-Dist: django-cors-headers (>=4.9.0,<4.10.0)
 Requires-Dist: django-db-file-storage (>=0.5.6.1,<0.6.0.0)
 Requires-Dist: django-extensions (>=4.1,<4.2)
 Requires-Dist: django-filter (>=25.1,<25.2)
@@ -44,15 +44,15 @@ Requires-Dist: django-prometheus (>=2.4.1,<2.5.0)
 Requires-Dist: django-redis (>=6.0.0,<6.1.0)
 Requires-Dist: django-silk (>=5.4.3,<5.5.0)
 Requires-Dist: django-storages (>=1.14.6,<1.15.0) ; extra == "all" or extra == "remote-storage"
-Requires-Dist: django-structlog[celery] (>=9.1.1,<10.0.0)
+Requires-Dist: django-structlog[celery] (>=10.0.0,<10.1.0)
 Requires-Dist: django-tables2 (>=2.7.5,<2.8.0)
 Requires-Dist: django-taggit (>=6.1.0,<6.2.0)
 Requires-Dist: django-timezone-field (>=7.1,<7.2)
-Requires-Dist: django-tree-queries (>=0.20.0,<0.21.0)
+Requires-Dist: django-tree-queries (>=0.21.2,<0.22.0)
 Requires-Dist: django-webserver (>=1.2.0,<1.3.0)
-Requires-Dist: djangorestframework (>=3.15.2,<3.17.0)
+Requires-Dist: djangorestframework (>=3.16.1,<3.17.0)
 Requires-Dist: drf-spectacular[sidecar] (>=0.28.0,<0.29.0)
-Requires-Dist: emoji (>=2.14.1,<2.15.0)
+Requires-Dist: emoji (>=2.15.0,<2.16.0)
 Requires-Dist: graphene-django (>=3.2.3,<3.3.0)
 Requires-Dist: graphene-django-optimizer (>=0.10.0,<0.11.0)
 Requires-Dist: jsonschema (>=4.7.0,<5.0.0)
@@ -61,14 +61,14 @@ Requires-Dist: mysqlclient (>=2.2.7,<2.3.0) ; extra == "all" or extra == "mysql"
 Requires-Dist: napalm (>=4.1.0,<6.0.0) ; extra == "all" or extra == "napalm"
 Requires-Dist: netaddr (>=1.3.0,<1.4.0)
 Requires-Dist: netutils (>=1.14.0,<2.0.0)
-Requires-Dist: nh3 (>=0.3.0,<0.4.0)
+Requires-Dist: nh3 (>=0.3.1,<0.4.0)
 Requires-Dist: packaging (>=23.1)
-Requires-Dist: prometheus-client (>=0.22.1,<0.23.0)
-Requires-Dist: psycopg2-binary (>=2.9.10,<2.10.0)
+Requires-Dist: prometheus-client (>=0.23.1,<0.24.0)
+Requires-Dist: psycopg2-binary (>=2.9.11,<2.10.0)
 Requires-Dist: python-slugify (>=8.0.4,<8.1.0)
 Requires-Dist: pyuwsgi (>=2.0.30,<2.1.0)
 Requires-Dist: social-auth-app-django (>=5.4.3,<5.5.0)
-Requires-Dist: social-auth-core[saml] (>=4.7.0,<4.8.0) ; extra == "all" or extra == "sso"
+Requires-Dist: social-auth-core[saml] (>=4.8.1,<4.9.0) ; extra == "all" or extra == "sso"
 Requires-Dist: svgwrite (>=1.4.3,<1.5.0)
 Project-URL: Documentation, https://docs.nautobot.com
 Project-URL: Homepage, https://nautobot.com