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

nautobot/vpn/tests/test_api.py

@@ -318,24 +318,19 @@ class VPNTunnelEndpointAPITest(APIViewTestCases.APIViewTestCase):
 
         cls.create_data = [
             {
-                "device": interfaces[0].device.pk,
                 "source_interface": interfaces[0].pk,
                 "vpn_profile": models.VPNProfile.objects.first().pk,
             },
             {
-                "device": interfaces[1].device.pk,
                 "source_interface": interfaces[1].pk,
                 "vpn_profile": models.VPNProfile.objects.first().pk,
             },
             {
-                "device": interfaces[2].device.pk,
                 "source_interface": interfaces[2].pk,
                 "vpn_profile": models.VPNProfile.objects.first().pk,
             },
         ]
 
         cls.update_data = {
-            "device": interfaces[2].device.pk,
-            "source_interface": interfaces[2].pk,
             "vpn_profile": models.VPNProfile.objects.last().pk,
         }

nautobot/vpn/tests/test_forms.py

@@ -275,7 +275,6 @@ class VPNTunnelEndpointFormTest(FormTestCases.BaseFormTestCase):
         """Test specifying all fields."""
         interfaces = Interface.objects.filter(device__isnull=False, vpn_tunnel_endpoints_src_int__isnull=True)
         data = {
-            "device": interfaces[0].device,
             "source_interface": interfaces[0],
             "vpn_profile": models.VPNProfile.objects.first(),
             "protected_prefixes": [Prefix.objects.first()],
@@ -288,7 +287,7 @@ class VPNTunnelEndpointFormTest(FormTestCases.BaseFormTestCase):
     def test_specifying_required_fields_success(self):
         """Test specifying only required fields."""
 
-        data = {"source_fqdn": "To Cloud"}
+        data = {"source_fqdn": "cloud.com"}
         form = self.form_class(data=data)
         self.assertTrue(form.is_valid())
         self.assertTrue(form.save())

nautobot/vpn/tests/test_models.py

@@ -3,7 +3,8 @@
 from django.core.exceptions import ValidationError
 
 from nautobot.apps.testing import ModelTestCases
-from nautobot.dcim.models import Interface
+from nautobot.dcim.models import Device, Interface, Module
+from nautobot.ipam.models import IPAddress
 from nautobot.vpn import models
 
 
@@ -64,20 +65,69 @@ class TestVPNTunnelEndpointModel(ModelTestCases.BaseModelTestCase):
 
     model = models.VPNTunnelEndpoint
 
+    def test_clean(self):
+        """Test model constraints."""
+        with self.subTest("Test source_ipaddress conflicts with source_fqdn"):
+            endpoint = models.VPNTunnelEndpoint(source_ipaddress=IPAddress.objects.first(), source_fqdn="cloud.com")
+            with self.assertRaises(ValidationError):
+                endpoint.clean()
+
+        with self.subTest("Test at least one required field is missing"):
+            endpoint = models.VPNTunnelEndpoint()
+            with self.assertRaises(ValidationError):
+                endpoint.clean()
+
+        with self.subTest("Test Interface without device"):
+            endpoint = models.VPNTunnelEndpoint(
+                source_interface=Interface(
+                    name="Ethernet",
+                    module=Module(),
+                ),
+            )
+            with self.assertRaises(ValidationError):
+                endpoint.clean()
+
+        with self.subTest("Test source_ipaddress is assigned to source_interface"):
+            endpoint = models.VPNTunnelEndpoint(
+                source_interface=Interface.objects.filter(device__isnull=False).first(),
+                source_ipaddress=IPAddress.objects.filter(interfaces__isnull=True).first(),
+            )
+            with self.assertRaises(ValidationError):
+                endpoint.clean()
+
+        with self.subTest("Test source_interface and tunnel_interface are assigned to the same device"):
+            source_int = Interface.objects.filter(device__isnull=False).first()
+            tunnel_int = Interface(
+                name="Tunnel0",
+                device=Device.objects.exclude(id=source_int.device.id).first(),
+                status=source_int.status,
+                type="tunnel",
+            )
+            endpoint = models.VPNTunnelEndpoint(
+                device=source_int.device, source_interface=source_int, tunnel_interface=tunnel_int
+            )
+            with self.assertRaises(ValidationError):
+                endpoint.clean()
+
     def test_name(self):
         """Test dynamic name property."""
-        with self.subTest("Test name contains interface name and device name."):
-            endpoint = models.VPNTunnelEndpoint.objects.filter(source_interface__isnull=False).first()
+        endpoint = models.VPNTunnelEndpoint.objects.filter(source_interface__isnull=False).first()
+        ip = IPAddress.objects.filter(interface_assignments__isnull=True).last()
+        ip.interfaces.add(endpoint.source_interface)
+        endpoint.source_ipaddress = ip
+        endpoint.save()
+
+        with self.subTest("Test name contains interface name, device name and IP address"):
             self.assertIn(endpoint.source_interface.name, endpoint.name)
             self.assertIn(endpoint.source_interface.device.name, endpoint.name)
+            self.assertIn(endpoint.source_ipaddress.host, endpoint.name)
 
-        with self.subTest("Test name contains interface name, device name and IP address."):
+        with self.subTest("Test name contains interface name and device name"):
             endpoint = models.VPNTunnelEndpoint.objects.filter(
-                source_interface__isnull=False, source_ipaddress__isnull=False
+                source_interface__isnull=False, source_ipaddress__isnull=True
             ).first()
             self.assertIn(endpoint.source_interface.name, endpoint.name)
             self.assertIn(endpoint.source_interface.device.name, endpoint.name)
-            self.assertIn(endpoint.source_ipaddress.host, endpoint.name)
 
         with self.subTest("Test name is fqdn"):
             endpoint = (
@@ -87,7 +137,7 @@ class TestVPNTunnelEndpointModel(ModelTestCases.BaseModelTestCase):
 
     def test_save(self):
         """Test save adds dynamic fields."""
-        interface = Interface.objects.filter(vpn_tunnel_endpoints_src_int__isnull=True).first()
+        interface = Interface.objects.filter(vpn_tunnel_endpoints_src_int__isnull=True, device__isnull=False).first()
         new_endpoint = models.VPNTunnelEndpoint.objects.create(source_interface=interface)
 
         with self.subTest("Test device field is saved"):

nautobot/vpn/tests/test_views.py

@@ -1,11 +1,12 @@
 """Unit tests for vpn views."""
 
+from django.contrib.contenttypes.models import ContentType
 from django.test import override_settings
 from django.urls import reverse
 
 from nautobot.apps.testing import ViewTestCases
 from nautobot.dcim.models import Interface
-from nautobot.extras.models import Status
+from nautobot.extras.models import DynamicGroup, Status
 from nautobot.ipam.models import Prefix
 from nautobot.vpn import choices, models
 
@@ -266,16 +267,34 @@ class VPNTunnelEndpointViewTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         interfaces = Interface.objects.filter(device__isnull=False, vpn_tunnel_endpoints_src_int__isnull=True)
 
         cls.form_data = {
-            "device": interfaces.first().device.pk,
             "source_interface": interfaces.first().pk,
             "vpn_profile": models.VPNProfile.objects.first().pk,
             "protected_prefixes": [Prefix.objects.first().pk],
         }
 
         cls.update_data = {
-            "device": interfaces.last().device.pk,
             "source_interface": interfaces.last().pk,
             "protected_prefixes": [Prefix.objects.last().pk],
         }
 
         cls.bulk_edit_data = {"vpn_profile": models.VPNProfile.objects.last().pk}
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_protected_prefixes(self):
+        self.add_permissions("ipam.view_prefix")
+        endpoint = models.VPNTunnelEndpoint.objects.filter(protected_prefixes__isnull=False).first()
+
+        url = reverse("vpn:vpntunnelendpoint_protectedprefixes", kwargs={"pk": endpoint.pk})
+        response = self.client.get(url)
+        self.assertHttpStatus(response, 200)
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_protected_dynamic_groups(self):
+        self.add_permissions("extras.view_dynamicgroup")
+        endpoint = models.VPNTunnelEndpoint.objects.filter(protected_prefixes_dg__isnull=True).first()
+        dg_ct = ContentType.objects.get_for_model(DynamicGroup)
+        endpoint.protected_prefixes_dg.add(DynamicGroup.objects.create(name="DG for Prefixes", content_type=dg_ct))
+
+        url = reverse("vpn:vpntunnelendpoint_protecteddynamicgroups", kwargs={"pk": endpoint.pk})
+        response = self.client.get(url)
+        self.assertHttpStatus(response, 200)

nautobot/vpn/views.py

@@ -8,6 +8,7 @@ from rest_framework.response import Response
 
 from nautobot.apps.ui import ObjectDetailContent, ObjectFieldsPanel, ObjectsTablePanel, SectionChoices
 from nautobot.apps.views import NautobotUIViewSet
+from nautobot.core.templatetags import helpers
 from nautobot.core.ui import object_detail
 from nautobot.extras.tables import DynamicGroupTable
 from nautobot.ipam.tables import PrefixTable
@@ -42,10 +43,10 @@ class VPNProfileUIViewSet(NautobotUIViewSet):
                     "keepalive_interval",
                     "keepalive_retries",
                     "nat_traversal",
-                    "extra_options",
                     "secrets_group",
                     "role",
                     "tenant",
+                    "extra_options",
                 ],
             ),
             ObjectsTablePanel(
@@ -54,6 +55,9 @@ class VPNProfileUIViewSet(NautobotUIViewSet):
                 table_filter="vpn_profile",
                 section=SectionChoices.RIGHT_HALF,
                 exclude_columns=[],
+                show_table_config_button=False,
+                related_list_url_name="vpn:vpnphase1policy_list",
+                related_field_name="vpn_profiles",
             ),
             ObjectsTablePanel(
                 weight=200,
@@ -61,6 +65,9 @@ class VPNProfileUIViewSet(NautobotUIViewSet):
                 table_filter="vpn_profile",
                 section=SectionChoices.RIGHT_HALF,
                 exclude_columns=[],
+                show_table_config_button=False,
+                related_list_url_name="vpn:vpnphase2policy_list",
+                related_field_name="vpn_profiles",
             ),
         ],
         extra_tabs=[
@@ -155,7 +162,7 @@ class VPNProfileUIViewSet(NautobotUIViewSet):
         url_path="vpn-vpns",
         url_name="vpns",
         custom_view_base_action="view",
-        custom_view_additional_permissions=["vpn.view_vpns"],
+        custom_view_additional_permissions=["vpn.view_vpn"],
     )
     def vpn_vpns(self, request, *args, **kwargs):
         return Response({})
@@ -165,7 +172,7 @@ class VPNProfileUIViewSet(NautobotUIViewSet):
         url_path="vpn-tunnels",
         url_name="vpntunnels",
         custom_view_base_action="view",
-        custom_view_additional_permissions=["vpn.view_vpntunnels"],
+        custom_view_additional_permissions=["vpn.view_vpntunnel"],
     )
     def vpn_tunnels(self, request, *args, **kwargs):
         return Response({})
@@ -175,7 +182,7 @@ class VPNProfileUIViewSet(NautobotUIViewSet):
         url_path="vpn-endpoints",
         url_name="vpnendpoints",
         custom_view_base_action="view",
-        custom_view_additional_permissions=["vpn.view_vpntunnelendpoints"],
+        custom_view_additional_permissions=["vpn.view_vpntunnelendpoint"],
     )
     def vpn_endpoints(self, request, *args, **kwargs):
         return Response({})
@@ -233,6 +240,11 @@ class VPNPhase1PolicyUIViewSet(NautobotUIViewSet):
                     "authentication_method",
                     "tenant",
                 ],
+                value_transforms={
+                    "encryption_algorithm": [helpers.label_list],
+                    "integrity_algorithm": [helpers.label_list],
+                    "dh_group": [helpers.label_list],
+                },
             ),
         ],
     )
@@ -264,6 +276,11 @@ class VPNPhase2PolicyUIViewSet(NautobotUIViewSet):
                     "lifetime",
                     "tenant",
                 ],
+                value_transforms={
+                    "encryption_algorithm": [helpers.label_list],
+                    "integrity_algorithm": [helpers.label_list],
+                    "pfs_group": [helpers.label_list],
+                },
             ),
         ],
     )
@@ -415,23 +432,64 @@ class VPNTunnelEndpointUIViewSet(NautobotUIViewSet):
                 ],
                 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,
+        ],
+        extra_tabs=[
+            object_detail.DistinctViewTab(
+                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 100,
+                tab_id="protected_prefixes",
+                label="Protected Prefixes",
+                url_name="vpn:vpntunnelendpoint_protectedprefixes",
+                related_object_attribute="protected_prefixes",
+                hide_if_empty=True,
+                panels=(
+                    object_detail.ObjectsTablePanel(
+                        section=SectionChoices.FULL_WIDTH,
+                        weight=100,
+                        table_class=PrefixTable,
+                        table_filter="vpn_tunnel_endpoints",
+                        tab_id="protected_prefixes",
+                        include_paginator=True,
+                    ),
+                ),
             ),
-            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,
+            object_detail.DistinctViewTab(
+                weight=object_detail.Tab.WEIGHT_CHANGELOG_TAB + 200,
+                tab_id="protected_dynamic_groups",
+                label="Protected Prefixes from Dynamic Group",
+                url_name="vpn:vpntunnelendpoint_protecteddynamicgroups",
+                related_object_attribute="protected_prefixes_dg",
+                hide_if_empty=True,
+                panels=(
+                    object_detail.ObjectsTablePanel(
+                        section=SectionChoices.FULL_WIDTH,
+                        weight=100,
+                        table_class=DynamicGroupTable,
+                        table_filter="vpn_tunnel_endpoints",
+                        tab_id="protected_dynamic_groups",
+                        include_paginator=True,
+                        enable_related_link=False,
+                    ),
+                ),
             ),
         ],
     )
+
+    @action(
+        detail=True,
+        url_path="protected-prefixes",
+        url_name="protectedprefixes",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["ipam.view_prefix"],
+    )
+    def protected_prefixes(self, request, *args, **kwargs):
+        return Response({})
+
+    @action(
+        detail=True,
+        url_path="protected-dynamic-groups",
+        url_name="protecteddynamicgroups",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["extras.view_dynamicgroup"],
+    )
+    def protected_dynamic_groups(self, request, *args, **kwargs):
+        return Response({})

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nautobot
-Version: 3.0.0a3
+Version: 3.0.0rc1
 Summary: Source of truth and network automation platform.
 License: Apache-2.0
 Keywords: Nautobot
@@ -21,7 +21,7 @@ Provides-Extra: mysql
 Provides-Extra: napalm
 Provides-Extra: remote-storage
 Provides-Extra: sso
-Requires-Dist: Django (>=4.2.25,<4.3.0)
+Requires-Dist: Django (>=4.2.26,<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)
@@ -33,7 +33,7 @@ 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-constance (>=4.3.3,<4.4.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)
@@ -61,7 +61,7 @@ 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.1,<0.4.0)
+Requires-Dist: nh3 (>=0.3.2,<0.4.0)
 Requires-Dist: packaging (>=23.1)
 Requires-Dist: prometheus-client (>=0.23.1,<0.24.0)
 Requires-Dist: psycopg2-binary (>=2.9.11,<2.10.0)