nautobot 2.4.5__py3-none-any.whl → 2.4.6__py3-none-any.whl

nautobot/ipam/tests/test_api.py

@@ -163,16 +163,6 @@ class VRFDeviceAssignmentTest(APIViewTestCases.APIViewTestCase):
             virtual_machine=cls.test_vm,
             rd="65000:4",
         )
-        VRFDeviceAssignment.objects.create(
-            vrf=cls.vrfs[0],
-            virtual_device_context=cls.vdcs[0],
-            name="VRFDeviceAssignment 1",
-            rd="65000:5",
-        )
-        VRFDeviceAssignment.objects.create(
-            vrf=cls.vrfs[0],
-            virtual_device_context=cls.vdcs[1],
-        )
 
         cls.update_data = {
             "name": "VRFDeviceAssignment 2",
@@ -207,21 +197,30 @@ class VRFDeviceAssignmentTest(APIViewTestCases.APIViewTestCase):
 
     def test_creating_invalid_vrf_device_assignments(self):
         # Add object-level permission
-        self.add_permissions("ipam.add_vrfdeviceassignment")
+        self.add_permissions(
+            "ipam.add_vrfdeviceassignment",
+            "dcim.view_device",
+            "dcim.view_virtualdevicecontext",
+            "ipam.view_vrf",
+            "virtualization.view_virtualmachine",
+        )
+        existing_vrf_device = VRFDeviceAssignment.objects.filter(device__isnull=False).first()
+        existing_vrf_vm = VRFDeviceAssignment.objects.filter(virtual_machine__isnull=False).first()
+        existing_vrf_vdc = VRFDeviceAssignment.objects.filter(virtual_device_context__isnull=False).first()
         duplicate_create_data = [
             {
-                "vrf": self.vrfs[0].pk,
-                "device": self.devices[1].pk,
+                "vrf": existing_vrf_device.vrf.pk,
+                "device": existing_vrf_device.device.pk,
                 "rd": "65000:6",
             },
             {
-                "vrf": self.vrfs[1].pk,
-                "virtual_machine": self.test_vm.pk,
+                "vrf": existing_vrf_vm.vrf.pk,
+                "virtual_machine": existing_vrf_vm.virtual_machine.pk,
                 "rd": "65000:6",
             },
             {
-                "vrf": self.vrfs[0].pk,
-                "virtual_device_context": self.vdcs[1].pk,
+                "vrf": existing_vrf_vdc.vrf.pk,
+                "virtual_device_context": existing_vrf_vdc.virtual_device_context.pk,
                 "rd": "65000:6",
             },
         ]
@@ -311,7 +310,7 @@ class VRFPrefixAssignmentTest(APIViewTestCases.APIViewTestCase):
             "vrf": self.vrfs[0].pk,
             "prefix": None,
         }
-        self.add_permissions("ipam.add_vrfprefixassignment")
+        self.add_permissions("ipam.add_vrfprefixassignment", "ipam.view_prefix", "ipam.view_vrf")
         response = self.client.post(self._get_list_url(), duplicate_create_data, format="json", **self.header)
         self.assertContains(
             response, "The fields vrf, prefix must make a unique set.", status_code=status.HTTP_400_BAD_REQUEST
@@ -420,7 +419,16 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         """
         Tests for the 2.0/2.1 REST API of Prefixes.
         """
-        self.add_permissions("ipam.view_prefix", "ipam.add_prefix", "ipam.change_prefix")
+        self.add_permissions(
+            "dcim.view_location",
+            "ipam.view_prefix",
+            "ipam.add_prefix",
+            "ipam.change_prefix",
+            "ipam.view_ipaddress",
+            "ipam.view_namespace",
+            "ipam.view_rir",
+            "extras.view_status",
+        )
 
         with self.subTest("valid GET"):
             prefix = Prefix.objects.annotate(location_count=Count("locations")).filter(location_count=1).first()
@@ -516,7 +524,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         else:
             self.fail("Suitable prefix fixture not found")
         url = reverse("ipam-api:prefix-available-prefixes", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.add_prefix")
+        self.add_permissions("ipam.add_prefix", "ipam.view_namespace", "extras.view_status", "extras.add_customfield")
 
         # Create four available prefixes with individual requests
         child_prefix_length = prefix.prefix_length + 2
@@ -566,7 +574,9 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
             self.fail("Suitable prefix fixture not found")
 
         url = reverse("ipam-api:prefix-available-prefixes", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix", "ipam.add_prefix")
+        self.add_permissions(
+            "ipam.view_prefix", "ipam.add_prefix", "extras.view_status", "extras.add_customfield", "ipam.view_namespace"
+        )
 
         # Try to create five prefixes (only four are available)
         child_prefix_length = prefix.prefix_length + 2
@@ -626,7 +636,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
             description="This is the Prefix created for whole network.",
         )
         url = reverse("ipam-api:prefix-available-prefixes", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix")
+        self.add_permissions("ipam.view_prefix", "ipam.view_namespace", "extras.view_status")
         self.add_permissions(
             "ipam.add_prefix", constraints={"description__startswith": "This is the Prefix created for"}
         )
@@ -683,9 +693,10 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
             description="This is the Prefix created for whole network.",
         )
         url = reverse("ipam-api:prefix-available-prefixes", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix")
+        self.add_permissions("ipam.view_prefix", "ipam.view_namespace", "extras.view_status")
         self.add_permissions(
-            "ipam.add_prefix", constraints={"description__startswith": "This is the Prefix created for"}
+            "ipam.add_prefix",
+            constraints={"description__startswith": "This is the Prefix created for"},
         )
 
         # Test invalid request
@@ -812,7 +823,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
             namespace=self.namespace,
         )
         url = reverse("ipam-api:prefix-available-ips", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix", "ipam.add_ipaddress", "extras.view_status")
+        self.add_permissions("ipam.view_prefix", "ipam.add_ipaddress", "ipam.view_namespace", "extras.view_status")
 
         data = {
             "status": self.status.pk,
@@ -839,7 +850,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         cf = CustomField.objects.create(key="ipcf", label="IP Custom Field", type="text")
         cf.content_types.add(ContentType.objects.get_for_model(IPAddress))
         url = reverse("ipam-api:prefix-available-ips", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix", "ipam.add_ipaddress", "extras.view_status")
+        self.add_permissions("ipam.view_prefix", "ipam.view_namespace", "ipam.add_ipaddress", "extras.view_status")
 
         # Create all six available IPs with individual requests
         for i in range(1, 7):
@@ -875,7 +886,13 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         cf = CustomField.objects.create(key="ipcf", label="IP Custom Field", type="text")
         cf.content_types.add(ContentType.objects.get_for_model(IPAddress))
         url = reverse("ipam-api:prefix-available-ips", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix", "ipam.add_ipaddress", "extras.view_status")
+        self.add_permissions(
+            "ipam.view_prefix",
+            "ipam.add_ipaddress",
+            "ipam.view_namespace",
+            "extras.view_customfield",
+            "extras.view_status",
+        )
 
         # Try to create seven IPs (only six are available)
         data = [
@@ -906,7 +923,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
             description="This is the Prefix created for whole network.",
         )
         url = reverse("ipam-api:prefix-available-ips", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix", "ipam.view_ipaddress")
+        self.add_permissions("ipam.view_prefix", "ipam.view_ipaddress", "ipam.view_namespace", "extras.view_status")
         self.add_permissions(
             "ipam.add_ipaddress", constraints={"description__startswith": "This is the IP created for"}
         )
@@ -959,7 +976,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
             description="This is a Prefix created for whole network.",
         )
         url = reverse("ipam-api:prefix-available-ips", kwargs={"pk": prefix.pk})
-        self.add_permissions("ipam.view_prefix", "ipam.view_ipaddress")
+        self.add_permissions("ipam.view_prefix", "ipam.view_ipaddress", "ipam.view_namespace", "extras.view_status")
         self.add_permissions(
             "ipam.add_ipaddress", constraints={"description__startswith": "This is the IP created for"}
         )
@@ -1183,7 +1200,7 @@ class IPAddressTest(APIViewTestCases.APIViewTestCase):
 
     def test_create_requires_parent_or_namespace(self):
         """Test that missing parent/namespace fields result in an error."""
-        self.add_permissions("ipam.add_ipaddress")
+        self.add_permissions("ipam.add_ipaddress", "extras.view_status")
         data = {
             "address": "192.168.0.10/32",
             "status": self.statuses[0].pk,
@@ -1214,7 +1231,7 @@ class IPAddressTest(APIViewTestCases.APIViewTestCase):
     def test_create_multiple_outside_nat_success(self):
         """Validate NAT inside address can tie to multiple NAT outside addresses."""
         # Create the two outside NAT IP Addresses tied back to the single inside NAT address
-        self.add_permissions("ipam.add_ipaddress", "ipam.view_ipaddress")
+        self.add_permissions("ipam.add_ipaddress", "ipam.view_ipaddress", "ipam.view_namespace", "extras.view_status")
         nat_inside = IPAddress.objects.filter(nat_outside_list__isnull=True).first()
         # Create NAT outside with above address IP as inside NAT
         ip1 = self.client.post(
@@ -1251,7 +1268,9 @@ class IPAddressTest(APIViewTestCases.APIViewTestCase):
         self.assertEqual(response.data["nat_outside_list"][1]["address"], "192.168.0.20/24")
 
     def test_creating_ipaddress_with_an_invalid_parent(self):
-        self.add_permissions("ipam.add_ipaddress")
+        self.add_permissions(
+            "ipam.add_ipaddress", "extras.view_status", "ipam.view_prefix", "ipam.view_ipaddress", "ipam.view_namespace"
+        )
         prefixes = (
             Prefix.objects.create(prefix="10.0.0.0/8", status=self.statuses[0], namespace=self.namespace),
             Prefix.objects.create(prefix="192.168.0.0/25", status=self.statuses[0], namespace=self.namespace),
@@ -1403,6 +1422,8 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
             "ipam.view_vlangroup",
             "ipam.view_vlan",
             "ipam.add_vlan",
+            "extras.view_status",
+            "extras.view_customfield",
         )
 
         # Create all nine available VLANs with individual requests
@@ -1445,6 +1466,7 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
             "ipam.view_vlangroup",
             "ipam.view_vlan",
             "ipam.add_vlan",
+            "extras.view_status",
         )
 
         # Try to create ten VLANs (only nine are available)
@@ -1492,6 +1514,7 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
             "ipam.view_vlangroup",
             "ipam.view_vlan",
             "ipam.add_vlan",
+            "extras.view_status",
         )
 
         # Try to create VLANs with specified VLAN IDs. Also, explicitly (and redundantly) specify a VLAN Group.
@@ -1562,6 +1585,7 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
         self.add_permissions(
             "ipam.view_vlangroup",
             "ipam.view_vlan",
+            "extras.view_status",
         )
         self.add_permissions("ipam.add_vlan", constraints={"description__startswith": "This is the VLAN created for"})
 
@@ -1609,6 +1633,7 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
         self.add_permissions(
             "ipam.view_vlangroup",
             "ipam.view_vlan",
+            "extras.view_status",
         )
         self.add_permissions("ipam.add_vlan", constraints={"description__startswith": "This is the VLAN created for"})
 
@@ -1714,9 +1739,14 @@ class VLANTest(APIViewTestCases.APIViewTestCase):
     def test_vlan_2_1_api_version_response(self):
         """Assert location can be used in VLAN API create/retrieve."""
 
-        self.add_permissions("ipam.view_vlan")
-        self.add_permissions("ipam.add_vlan")
-        self.add_permissions("ipam.change_vlan")
+        self.add_permissions(
+            "dcim.view_location",
+            "ipam.view_vlan",
+            "ipam.add_vlan",
+            "ipam.change_vlan",
+            "ipam.view_vlangroup",
+            "extras.view_status",
+        )
         with self.subTest("Assert GET"):
             vlan = VLAN.objects.annotate(locations_count=Count("locations")).filter(locations_count=1).first()
             url = reverse("ipam-api:vlan-detail", kwargs={"pk": vlan.pk})
@@ -1878,7 +1908,7 @@ class ServiceTest(APIViewTestCases.APIViewTestCase):
 
         Ref: https://github.com/nautobot/nautobot/issues/265
         """
-        self.add_permissions("ipam.add_service")
+        self.add_permissions("ipam.add_service", "dcim.view_device")
         url = reverse("ipam-api:service-list")
         device = self.devices[0]
 

nautobot/ipam/tests/test_filters.py

@@ -1108,16 +1108,6 @@ class VRFDeviceAssignmentTestCase(FilterTestCases.FilterTestCase):
             virtual_machine=cls.test_vm_2,
             rd="65000:4",
         )
-        VRFDeviceAssignment.objects.create(
-            vrf=cls.vrfs[0],
-            virtual_device_context=cls.vdcs[0],
-            name="VRFDeviceAssignment 1",
-            rd="65000:5",
-        )
-        VRFDeviceAssignment.objects.create(
-            vrf=cls.vrfs[0],
-            virtual_device_context=cls.vdcs[1],
-        )
 
 
 class VLANGroupTestCase(FilterTestCases.FilterTestCase):

nautobot/ipam/tests/test_views.py

@@ -6,6 +6,7 @@ from django.db.models import Count
 from django.test import override_settings
 from django.urls import reverse
 from django.utils.html import strip_tags
+from django.utils.http import urlencode
 from django.utils.timezone import make_aware
 from netaddr import IPNetwork
 
@@ -145,6 +146,25 @@ class RIRTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
         # Ensure that we have at least one RIR with no prefixes that can be used for the "delete_object" tests.
         RIR.objects.create(name="RIR XYZ")
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_list_objects_with_permission(self):
+        """Test rendering of LinkedCountColumn for related fields without display_field override."""
+        response = super().test_list_objects_with_permission()
+        response_body = extract_page_body(response.content.decode(response.charset))
+
+        prefix_list_url = reverse(get_route_for_model(Prefix, "list"))
+
+        for rir in self._get_queryset().all():
+            if str(rir.pk) in response_body:
+                count = rir.prefixes.count()
+                if count > 1:
+                    self.assertBodyContains(
+                        response,
+                        f'<a href="{prefix_list_url}?{urlencode({"rir": rir.name})}" class="badge">{count}</a>',
+                    )
+                elif count == 1:
+                    self.assertBodyContains(response, hyperlinked_object(rir.prefixes.first()))
+
 
 class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.ListObjectsViewTestCase):
     model = Prefix
@@ -194,7 +214,7 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
     def test_list_objects_with_permission(self):
-        """Test rendering of LinkedCountColumn for related fields."""
+        """Test rendering of LinkedCountColumn for related fields with display_field override."""
         response = super().test_list_objects_with_permission()
         response_body = extract_page_body(response.content.decode(response.charset))
 
@@ -208,7 +228,7 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
                         response, f'<a href="{locations_list_url}?prefixes={prefix.pk}" class="badge">{count}</a>'
                     )
                 elif count == 1:
-                    self.assertBodyContains(response, hyperlinked_object(prefix.locations.first()))
+                    self.assertBodyContains(response, hyperlinked_object(prefix.locations.first(), "name"))
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_empty_queryset(self):
@@ -1239,3 +1259,25 @@ class ServiceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         }
         response = self.client.post(**request)
         self.assertBodyContains(response, "A service must be associated with either a device or a virtual machine.")
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_port_bulk_edit_invalid(self):
+        self.add_permissions("ipam.change_service")
+        url = self._get_url("bulk_edit")
+        pk_list = list(self._get_queryset().values_list("pk", flat=True)[:3])
+
+        data = {
+            "pk": pk_list,
+            "protocol": ServiceProtocolChoices.PROTOCOL_UDP,
+            "ports": "[106,107]",  # String representation of the list
+            "description": "New description",
+            "_apply": True,
+        }
+
+        response = self.client.post(url, data)
+        response_content = response.content.decode(response.charset)
+        self.assertHttpStatus(response, 200)
+        self.assertInHTML(
+            ' <strong class="panel-title">Ports</strong>: <ul class="errorlist"><li>invalid literal for int() with base 10: &#x27;[106&#x27;</li></ul>',
+            response_content,
+        )

nautobot/ipam/urls.py

@@ -7,7 +7,6 @@ from . import views
 from .models import (
     IPAddress,
     Prefix,
-    Service,
     VLAN,
     VLANGroup,
 )
@@ -17,27 +16,12 @@ app_name = "ipam"
 router = NautobotUIViewSetRouter()
 router.register("ip-address-to-interface", views.IPAddressToInterfaceUIViewSet)
 router.register("namespaces", views.NamespaceUIViewSet)
+router.register("rirs", views.RIRUIViewSet)
 router.register("route-targets", views.RouteTargetUIViewSet)
+router.register("services", views.ServiceUIViewSet)
 router.register("vrfs", views.VRFUIViewSet)
-router.register("rirs", views.RIRUIViewSet)
 
 urlpatterns = [
-    # Namespaces
-    path(
-        "namespaces/<uuid:pk>/ip-addresses/",
-        views.NamespaceIPAddressesView.as_view(),
-        name="namespace_ipaddresses",
-    ),
-    path(
-        "namespaces/<uuid:pk>/prefixes/",
-        views.NamespacePrefixesView.as_view(),
-        name="namespace_prefixes",
-    ),
-    path(
-        "namespaces/<uuid:pk>/vrfs/",
-        views.NamespaceVRFsView.as_view(),
-        name="namespace_vrfs",
-    ),
     # Prefixes
     path("prefixes/", views.PrefixListView.as_view(), name="prefix_list"),
     path("prefixes/add/", views.PrefixEditView.as_view(), name="prefix_add"),
@@ -222,35 +206,6 @@ urlpatterns = [
         name="vlan_notes",
         kwargs={"model": VLAN},
     ),
-    # Services
-    path("services/", views.ServiceListView.as_view(), name="service_list"),
-    path("services/add/", views.ServiceEditView.as_view(), name="service_add"),
-    path("services/import/", views.ServiceBulkImportView.as_view(), name="service_import"),  # 3.0 TODO: remove, unused
-    path("services/edit/", views.ServiceBulkEditView.as_view(), name="service_bulk_edit"),
-    path(
-        "services/delete/",
-        views.ServiceBulkDeleteView.as_view(),
-        name="service_bulk_delete",
-    ),
-    path("services/<uuid:pk>/", views.ServiceView.as_view(), name="service"),
-    path("services/<uuid:pk>/edit/", views.ServiceEditView.as_view(), name="service_edit"),
-    path(
-        "services/<uuid:pk>/delete/",
-        views.ServiceDeleteView.as_view(),
-        name="service_delete",
-    ),
-    path(
-        "services/<uuid:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="service_changelog",
-        kwargs={"model": Service},
-    ),
-    path(
-        "services/<uuid:pk>/notes/",
-        ObjectNotesView.as_view(),
-        name="service_notes",
-        kwargs={"model": Service},
-    ),
 ]
 
 urlpatterns += router.urls