nautobot 2.2.8__py3-none-any.whl → 2.3.0__py3-none-any.whl

nautobot/ipam/tests/test_api.py

@@ -15,7 +15,6 @@ from nautobot.dcim.choices import InterfaceTypeChoices
 from nautobot.dcim.models import Device, DeviceType, Interface, Location, LocationType, Manufacturer
 from nautobot.extras.models import Role, Status
 from nautobot.ipam import choices
-from nautobot.ipam.factory import VLANGroupFactory
 from nautobot.ipam.models import (
     IPAddress,
     IPAddressToInterface,
@@ -51,17 +50,17 @@ class NamespaceTest(APIViewTestCases.APIViewTestCase):
         location = Location.objects.first()
         cls.create_data = [
             {
-                "name": "Purple Monkey Namesapce 1",
+                "name": "Purple Monkey Namespace 1",
                 "description": "A perfectly cromulent namespace.",
                 "location": location.pk,
             },
             {
-                "name": "Purple Monkey Namesapce 2",
+                "name": "Purple Monkey Namespace 2",
                 "description": "A secondarily cromulent namespace.",
                 "location": location.pk,
             },
             {
-                "name": "Purple Monkey Namesapce 3",
+                "name": "Purple Monkey Namespace 3",
                 "description": "A third cromulent namespace.",
                 "location": location.pk,
             },
@@ -211,7 +210,9 @@ class VRFPrefixAssignmentTest(APIViewTestCases.APIViewTestCase):
 
     @classmethod
     def setUpTestData(cls):
-        cls.vrfs = VRF.objects.all()
+        cls.vrfs = (
+            VRF.objects.annotate(prefixes_count=Count("namespace__prefixes")).filter(prefixes_count__gte=2).distinct()
+        )
         cls.prefixes = Prefix.objects.all()
 
         VRFPrefixAssignment.objects.create(
@@ -233,15 +234,15 @@ class VRFPrefixAssignmentTest(APIViewTestCases.APIViewTestCase):
         cls.create_data = [
             {
                 "vrf": cls.vrfs[2].pk,
-                "prefix": cls.prefixes.filter(namespace=cls.vrfs[2].namespace)[0].pk,
+                "prefix": cls.prefixes.filter(namespace=cls.vrfs[2].namespace).exclude(vrfs=cls.vrfs[2])[0].pk,
             },
             {
                 "vrf": cls.vrfs[3].pk,
-                "prefix": cls.prefixes.filter(namespace=cls.vrfs[3].namespace)[0].pk,
+                "prefix": cls.prefixes.filter(namespace=cls.vrfs[3].namespace).exclude(vrfs=cls.vrfs[3])[0].pk,
             },
             {
                 "vrf": cls.vrfs[4].pk,
-                "prefix": cls.prefixes.filter(namespace=cls.vrfs[4].namespace)[0].pk,
+                "prefix": cls.prefixes.filter(namespace=cls.vrfs[4].namespace).exclude(vrfs=cls.vrfs[4])[0].pk,
             },
         ]
 
@@ -622,26 +623,33 @@ class PrefixLocationAssignmentTest(APIViewTestCases.APIViewTestCase):
 
     @classmethod
     def setUpTestData(cls):
-        cls.prefixes = Prefix.objects.filter(locations__isnull=False)
+        cls.prefixes = Prefix.objects.all()
         cls.locations = Location.objects.filter(location_type__content_types=ContentType.objects.get_for_model(Prefix))
-        locations_without_prefix = cls.locations.exclude(prefixes__in=[cls.prefixes[0], cls.prefixes[1]])
+
+        # Guarantees that at-least 3 locations do not have this prefix
+        for location in cls.locations[:3]:
+            location.prefixes.remove(cls.prefixes[0])
+        for location in cls.locations[3:6]:
+            location.prefixes.remove(cls.prefixes[1])
+        locations_without_prefix_0 = cls.locations.exclude(prefixes__in=[cls.prefixes[0]])
+        locations_without_prefix_1 = cls.locations.exclude(prefixes__in=[cls.prefixes[1]])
 
         cls.create_data = [
             {
                 "prefix": cls.prefixes[0].pk,
-                "location": locations_without_prefix[1].pk,
+                "location": locations_without_prefix_0[0].pk,
             },
             {
                 "prefix": cls.prefixes[0].pk,
-                "location": locations_without_prefix[2].pk,
+                "location": locations_without_prefix_0[1].pk,
             },
             {
                 "prefix": cls.prefixes[1].pk,
-                "location": locations_without_prefix[3].pk,
+                "location": locations_without_prefix_1[0].pk,
             },
             {
                 "prefix": cls.prefixes[1].pk,
-                "location": locations_without_prefix[4].pk,
+                "location": locations_without_prefix_1[1].pk,
             },
         ]
 
@@ -877,11 +885,12 @@ class IPAddressToInterfaceTest(APIViewTestCases.APIViewTestCase):
             status=devicestatus,
         )
         int_status = Status.objects.get_for_model(Interface).first()
+        int_role = Role.objects.get_for_model(Interface).first()
         int_type = InterfaceTypeChoices.TYPE_1GE_FIXED
         interfaces = [
-            Interface.objects.create(device=device, name="eth0", status=int_status, type=int_type),
+            Interface.objects.create(device=device, name="eth0", status=int_status, role=int_role, type=int_type),
             Interface.objects.create(device=device, name="eth1", status=int_status, type=int_type),
-            Interface.objects.create(device=device, name="eth2", status=int_status, type=int_type),
+            Interface.objects.create(device=device, name="eth2", status=int_status, role=int_role, type=int_type),
             Interface.objects.create(device=device, name="eth3", status=int_status, type=int_type),
         ]
 
@@ -890,8 +899,11 @@ class IPAddressToInterfaceTest(APIViewTestCases.APIViewTestCase):
         vm_status = Status.objects.get_for_model(VirtualMachine).first()
         virtual_machine = (VirtualMachine.objects.create(name="Virtual Machine 1", cluster=cluster, status=vm_status),)
         vm_int_status = Status.objects.get_for_model(VMInterface).first()
+        vm_int_role = Role.objects.get_for_model(VMInterface).first()
         vm_interfaces = [
-            VMInterface.objects.create(virtual_machine=virtual_machine[0], name="veth0", status=vm_int_status),
+            VMInterface.objects.create(
+                virtual_machine=virtual_machine[0], name="veth0", status=vm_int_status, role=vm_int_role
+            ),
             VMInterface.objects.create(virtual_machine=virtual_machine[0], name="veth1", status=vm_int_status),
         ]
 
@@ -942,7 +954,11 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
         return VLANGroup.objects.create(name="DELETE ME")
 
     def get_deletable_object_pks(self):
-        vlangroups = VLANGroupFactory.create_batch(size=3)
+        vlangroups = [
+            VLANGroup.objects.create(name="DELETE ME"),
+            VLANGroup.objects.create(name="ME TOO"),
+            VLANGroup.objects.create(name="AND ME"),
+        ]
         return [vg.pk for vg in vlangroups]
 
 
@@ -1063,6 +1079,9 @@ class VLANLocationAssignmentTest(APIViewTestCases.APIViewTestCase):
     def setUpTestData(cls):
         cls.vlans = VLAN.objects.filter(locations__isnull=False)
         cls.locations = Location.objects.filter(location_type__content_types=ContentType.objects.get_for_model(VLAN))
+        # make sure there are 4 locations without vlans 1 and 2 for the create_data below
+        for i in range(4):
+            cls.locations[i].vlans.set([])
         locations_without_vlans = cls.locations.exclude(vlans__in=[cls.vlans[0], cls.vlans[1]])
 
         cls.create_data = [

nautobot/ipam/tests/test_filters.py

@@ -167,6 +167,7 @@ class PrefixTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilt
     filterset = PrefixFilterSet
     tenancy_related_name = "prefixes"
     generic_filter_tests = (
+        ["cloud_networks", "cloud_networks__name"],
         ["date_allocated"],
         ["prefix_length"],
         ["rir", "rir__id"],
@@ -178,6 +179,24 @@ class PrefixTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilt
         ["type"],
     )
 
+    def test_filters_generic(self):
+        # We usually have type container and network prefixes present
+        # but we need a third value for test_filters_generic() to work.
+        # So this is to ensure we have type pool prefixes in our test data.
+        Prefix.objects.create(
+            prefix="192.0.2.0/29",
+            type=PrefixTypeChoices.TYPE_POOL,
+            namespace=Namespace.objects.first(),
+            status=Status.objects.get_for_model(Prefix).first(),
+        )
+        Prefix.objects.create(
+            prefix="192.0.2.0/30",
+            type=PrefixTypeChoices.TYPE_POOL,
+            namespace=Namespace.objects.first(),
+            status=Status.objects.get_for_model(Prefix).first(),
+        )
+        return super().test_filters_generic()
+
     def test_search(self):
         prefixes = Prefix.objects.all()[:2]
         test_values = [
@@ -954,9 +973,14 @@ class IPAddressToInterfaceTestCase(FilterTestCases.FilterTestCase):
         vm_status = Status.objects.get_for_model(VirtualMachine).first()
         virtual_machine = (VirtualMachine.objects.create(name="Virtual Machine 1", cluster=cluster, status=vm_status),)
         vm_int_status = Status.objects.get_for_model(VMInterface).first()
+        vm_int_role = Role.objects.get_for_model(VMInterface).first()
         vm_interfaces = [
-            VMInterface.objects.create(virtual_machine=virtual_machine[0], name="veth0", status=vm_int_status),
-            VMInterface.objects.create(virtual_machine=virtual_machine[0], name="veth1", status=vm_int_status),
+            VMInterface.objects.create(
+                virtual_machine=virtual_machine[0], name="veth0", status=vm_int_status, role=vm_int_role
+            ),
+            VMInterface.objects.create(
+                virtual_machine=virtual_machine[0], name="veth1", status=vm_int_status, role=vm_int_role
+            ),
         ]
 
         IPAddressToInterface.objects.create(ip_address=ip_addresses[0], interface=interfaces[0], vm_interface=None)

nautobot/ipam/tests/test_models.py

@@ -44,25 +44,30 @@ class IPAddressToInterfaceTest(TestCase):
             status=Status.objects.get_for_model(Device).first(),
         )
         int_status = Status.objects.get_for_model(Interface).first()
+        int_role = Role.objects.get_for_model(Interface).first()
         cls.test_int1 = Interface.objects.create(
             device=cls.test_device,
             name="int1",
             status=int_status,
+            role=int_role,
             type=dcim_choices.InterfaceTypeChoices.TYPE_1GE_FIXED,
         )
         cls.test_int2 = Interface.objects.create(
             device=cls.test_device,
             name="int2",
             status=int_status,
+            role=int_role,
             type=dcim_choices.InterfaceTypeChoices.TYPE_1GE_FIXED,
         )
         cluster_type = ClusterType.objects.create(name="Cluster Type 1")
         cluster = Cluster.objects.create(name="cluster1", cluster_type=cluster_type)
         vmint_status = Status.objects.get_for_model(VMInterface).first()
+        vmint_role = Role.objects.get_for_model(VMInterface).first()
         cls.test_vm = VirtualMachine.objects.create(
             name="vm1",
             cluster=cluster,
             status=Status.objects.get_for_model(VirtualMachine).first(),
+            role=vmint_role,
         )
         cls.test_vmint1 = VMInterface.objects.create(
             name="vmint1",
@@ -73,6 +78,7 @@ class IPAddressToInterfaceTest(TestCase):
             name="vmint2",
             virtual_machine=cls.test_vm,
             status=vmint_status,
+            role=vmint_role,
         )
 
     def test_removing_ip_addresses_containing_host_device_primary_ip_nullifies_host_device_primary_ip(self):
@@ -997,8 +1003,9 @@ class TestIPAddress(ModelTestCases.BaseModelTestCase):
     def test_duplicate_global_unique(self):
         """Test that duplicate IPs in the same Namespace raises an error."""
         IPAddress.objects.create(address="192.0.2.1/24", status=self.status, namespace=self.namespace)
-        with self.assertRaises(IntegrityError):
-            IPAddress.objects.create(address="192.0.2.1/24", status=self.status, namespace=self.namespace)
+        duplicate_ip = IPAddress(address="192.0.2.1/24", status=self.status, namespace=self.namespace)
+        with self.assertRaises(ValidationError):
+            duplicate_ip.full_clean()
 
     def test_multiple_nat_outside_list(self):
         """

nautobot/ipam/tests/test_querysets.py

@@ -97,7 +97,7 @@ class IPAddressQuerySet(TestCase):
         self.assertFalse(self.queryset._is_ambiguous_network_string("b2a"))
 
     def test__safe_parse_network_string(self):
-        fallback_ipv4 = netaddr.IPNetwork("0/32")
+        fallback_ipv4 = netaddr.IPNetwork("0.0.0.0/32")
         fallback_ipv6 = netaddr.IPNetwork("::/128")
 
         self.assertEqual(self.queryset._safe_parse_network_string("taco", 4), fallback_ipv4)

nautobot/ipam/tests/test_views.py

@@ -529,10 +529,11 @@ class IPAddressMergeTestCase(ModelViewTestCase):
         cls.devices = devices
 
         intf_status = Status.objects.get_for_model(Interface).first()
+        intf_role = Role.objects.get_for_model(Interface).first()
         cls.interfaces = (
-            Interface.objects.create(device=cls.devices[0], name="Interface 1", status=intf_status),
+            Interface.objects.create(device=cls.devices[0], name="Interface 1", status=intf_status, role=intf_role),
             Interface.objects.create(device=cls.devices[1], name="Interface 2", status=intf_status),
-            Interface.objects.create(device=cls.devices[2], name="Interface 3", status=intf_status),
+            Interface.objects.create(device=cls.devices[2], name="Interface 3", status=intf_status, role=intf_role),
         )
         cls.services = (
             Service.objects.create(

nautobot/ipam/urls.py

@@ -147,7 +147,7 @@ urlpatterns = [
         name="prefix_changelog",
         kwargs={"model": Prefix},
     ),
-    path(
+    path(  # 3.0 TODO: remove, no longer needed/used since 2.3
         "prefixes/<uuid:pk>/dynamic-groups/",
         ObjectDynamicGroupsView.as_view(),
         name="prefix_dynamicgroups",
@@ -203,7 +203,7 @@ urlpatterns = [
         name="ipaddress_changelog",
         kwargs={"model": IPAddress},
     ),
-    path(
+    path(  # 3.0 TODO: remove, no longer needed/used since 2.3
         "ip-addresses/<uuid:pk>/dynamic-groups/",
         ObjectDynamicGroupsView.as_view(),
         name="ipaddress_dynamicgroups",

nautobot/ipam/views.py

@@ -15,6 +15,7 @@ from django.views.generic import View
 from django_tables2 import RequestConfig
 import netaddr
 
+from nautobot.cloud.tables import CloudNetworkTable
 from nautobot.core.models.querysets import count_related
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.core.utils.permissions import get_permission_for_model
@@ -376,7 +377,7 @@ class RouteTargetBulkDeleteView(generic.BulkDeleteView):
 
 
 class RIRListView(generic.ObjectListView):
-    queryset = RIR.objects.annotate(assigned_prefix_count=count_related(Prefix, "rir"))
+    queryset = RIR.objects.all()
     filterset = filters.RIRFilterSet
     filterset_form = forms.RIRFilterForm
     table = tables.RIRTable
@@ -415,7 +416,7 @@ class RIRBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
 
 
 class RIRBulkDeleteView(generic.BulkDeleteView):
-    queryset = RIR.objects.annotate(assigned_prefix_count=count_related(Prefix, "rir"))
+    queryset = RIR.objects.all()
     filterset = filters.RIRFilterSet
     table = tables.RIRTable
 
@@ -430,7 +431,7 @@ class PrefixListView(generic.ObjectListView):
     filterset_form = forms.PrefixFilterForm
     table = tables.PrefixDetailTable
     template_name = "ipam/prefix_list.html"
-    queryset = Prefix.objects.annotate(location_count=count_related(Location, "prefixes"))
+    queryset = Prefix.objects.all()
     use_new_ui = True
 
 
@@ -448,21 +449,21 @@ class PrefixView(generic.ObjectView):
 
     def get_extra_context(self, request, instance):
         # Parent prefixes table
-        parent_prefixes = (
-            instance.ancestors()
-            .restrict(request.user, "view")
-            .select_related("parent", "namespace", "status", "vlan", "role")
-            .annotate(location_count=count_related(Location, "prefixes"))
-        )
-        parent_prefix_table = tables.PrefixTable(list(parent_prefixes))
+        parent_prefixes = instance.ancestors().restrict(request.user, "view")
+        parent_prefix_table = tables.PrefixTable(parent_prefixes)
         parent_prefix_table.exclude = ("namespace",)
 
         vrfs = instance.vrf_assignments.restrict(request.user, "view")
         vrf_table = tables.VRFPrefixAssignmentTable(vrfs, orderable=False)
 
+        cloud_networks = instance.cloud_networks.restrict(request.user, "view")
+        cloud_network_table = CloudNetworkTable(cloud_networks, orderable=False)
+        cloud_network_table.exclude = ("actions", "assigned_prefix_count", "circuit_count", "cloud_service_count")
+
         return {
             "vrf_table": vrf_table,
             "parent_prefix_table": parent_prefix_table,
+            "cloud_network_table": cloud_network_table,
             **super().get_extra_context(request, instance),
         }
 
@@ -708,9 +709,7 @@ class PrefixBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
 
 
 class PrefixBulkEditView(generic.BulkEditView):
-    queryset = Prefix.objects.select_related("status", "namespace", "tenant", "vlan", "role").annotate(
-        location_count=count_related(Location, "prefixes")
-    )
+    queryset = Prefix.objects.all()
     filterset = filters.PrefixFilterSet
     table = tables.PrefixTable
     form = forms.PrefixBulkEditForm
@@ -727,9 +726,7 @@ class PrefixBulkEditView(generic.BulkEditView):
 
 
 class PrefixBulkDeleteView(generic.BulkDeleteView):
-    queryset = Prefix.objects.select_related("status", "namespace", "tenant", "vlan", "role").annotate(
-        location_count=count_related(Location, "prefixes")
-    )
+    queryset = Prefix.objects.all()
     filterset = filters.PrefixFilterSet
     table = tables.PrefixTable
 
@@ -760,13 +757,8 @@ class IPAddressView(generic.ObjectView):
 
     def get_extra_context(self, request, instance):
         # Parent prefixes table
-        parent_prefixes = (
-            instance.ancestors()
-            .restrict(request.user, "view")
-            .select_related("status", "role", "tenant")
-            .annotate(location_count=count_related(Location, "prefixes"))
-        )
-        parent_prefixes_table = tables.PrefixTable(list(parent_prefixes), orderable=False)
+        parent_prefixes = instance.ancestors().restrict(request.user, "view")
+        parent_prefixes_table = tables.PrefixTable(parent_prefixes, orderable=False)
 
         # Related IP table
         related_ips = (
@@ -943,14 +935,8 @@ class IPAddressAssignView(view_mixins.GetReturnURLMixin, generic.ObjectView):
             ip_addresses = IPAddress.objects.restrict(request.user, "view").filter(pk__in=pks)
             interface.ip_addresses.add(*ip_addresses)
             return redirect(self.get_return_url(request))
-
-        return render(
-            request,
-            "ipam/ipaddress_assign.html",
-            {
-                "return_url": self.get_return_url(request),
-            },
-        )
+        messages.error(request, "Please select at least one IP Address from the table.")
+        return redirect(request.get_full_path())
 
 
 class IPAddressMergeView(view_mixins.GetReturnURLMixin, view_mixins.ObjectPermissionRequiredMixin, View):
@@ -1230,7 +1216,7 @@ class IPAddressToInterfaceUIViewSet(view_mixins.ObjectBulkCreateViewMixin):  # 3
 
 
 class VLANGroupListView(generic.ObjectListView):
-    queryset = VLANGroup.objects.annotate(vlan_count=count_related(VLAN, "vlan_group"))
+    queryset = VLANGroup.objects.all()
     filterset = filters.VLANGroupFilterSet
     filterset_form = forms.VLANGroupFilterForm
     table = tables.VLANGroupTable
@@ -1292,7 +1278,7 @@ class VLANGroupBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unus
 
 
 class VLANGroupBulkDeleteView(generic.BulkDeleteView):
-    queryset = VLANGroup.objects.select_related("location").annotate(vlan_count=count_related(VLAN, "vlan_group"))
+    queryset = VLANGroup.objects.all()
     filterset = filters.VLANGroupFilterSet
     table = tables.VLANGroupTable
 
@@ -1303,7 +1289,7 @@ class VLANGroupBulkDeleteView(generic.BulkDeleteView):
 
 
 class VLANListView(generic.ObjectListView):
-    queryset = VLAN.objects.annotate(location_count=count_related(Location, "vlans"))
+    queryset = VLAN.objects.all()
     filterset = filters.VLANFilterSet
     filterset_form = forms.VLANFilterForm
     table = tables.VLANDetailTable

nautobot/project-static/css/base.css

@@ -97,6 +97,7 @@ table.attr-table td:nth-child(1) {
 }
 .table-headings th {
     background-color: #f5f5f5;
+    white-space: nowrap;
 }
 td.min-width {
     width: 1%;
@@ -299,6 +300,7 @@ table.report th a {
 }
 .panel table {
     margin-bottom: 0;
+    overflow: hidden;
 }
 .panel .table th {
     border-bottom-width: 1px;
@@ -895,6 +897,7 @@ pre:has(code.hljs) {
 }
 pre code.hljs {
     padding: 11.5px; /* Same as Bootstrap 3 `pre` padding */
+    background-color: #f4f4f4; /* Reset Bootstrap 3 `pre` background-color in case it contains a `code` element already formatted by highlight.js */
 }
 code.hljs {
     padding: 2px 4px; /* Same as Bootstrap 3 `code` padding */
@@ -960,3 +963,21 @@ code.hljs {
     display: flex;
     padding-top: 10px;
 }
+
+/* Buttons inside dropdown menus */
+.dropdown-menu button {
+    background: none;
+    border: none;
+    display: block;
+    width: 100%;
+    text-align: left;
+    padding: 3px 20px;
+    cursor: pointer;
+    text-wrap: nowrap;
+}
+.dropdown-menu button:focus,
+.dropdown-menu button:hover {
+    color: #ffffff;
+    text-decoration: none;
+    background-color: #646464;
+}

nautobot/project-static/css/dark.css

@@ -190,6 +190,12 @@ html[data-theme="dark"] .navbar-nav>li>a:hover {          /* Navbar top level me
   color: rgb(224, 120, 7) !important;
 }
 
+html[data-theme="dark"] .dropdown-menu button:hover,      /* Navbar button item when hovering */
+html[data-theme="dark"] .dropdown-menu>li>button:hover {
+  color: rgb(51, 51, 51) !important;
+  background-color: rgb(196, 204, 210) !important;
+}
+
 html[data-theme="dark"] .dropdown-menu>li>a {             /* Navbar dropdown text links */
   color: rgb(51, 51, 51) !important;
 }
@@ -211,6 +217,11 @@ html[data-theme="dark"] pre {
   color: rgb(29, 40, 42);
 }
 
+html[data-theme="dark"] pre code.hljs {
+  /* We let the hljs handle the color so Syntax highlighting works, but we set the background to match the <pre> blocks.*/
+  background-color: rgb(29, 40, 42)
+}
+
 /* Breadcrumbs */
 html[data-theme="dark"] .breadcrumb>li+li:before {
   color: rgb(142, 142, 142);