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

nautobot/ipam/tests/test_api.py

@@ -40,6 +40,7 @@ from nautobot.ipam.models import (
     VRFDeviceAssignment,
     VRFPrefixAssignment,
 )
+from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import Cluster, ClusterType, VirtualMachine, VMInterface
 
 
@@ -57,22 +58,28 @@ class NamespaceTest(APIViewTestCases.APIViewTestCase):
     @classmethod
     def setUpTestData(cls):
         location = Location.objects.first()
+        tenant = Tenant.objects.first()
         cls.create_data = [
             {
                 "name": "Purple Monkey Namespace 1",
-                "description": "A perfectly cromulent namespace.",
+                "description": "A namespace with a tenant and location.",
                 "location": location.pk,
+                "tenant": tenant.pk,
             },
             {
                 "name": "Purple Monkey Namespace 2",
-                "description": "A secondarily cromulent namespace.",
-                "location": location.pk,
+                "description": "A namespace with a tenant and no location.",
+                "tenant": tenant.pk,
             },
             {
                 "name": "Purple Monkey Namespace 3",
-                "description": "A third cromulent namespace.",
+                "description": "A namespace with no tenant but with a location.",
                 "location": location.pk,
             },
+            {
+                "name": "Purple Monkey Namespace 4",
+                "description": "A namespace with no tenant and no location.",
+            },
         ]
         cls.bulk_update_data = {
             "description": "A perfectly new description.",
@@ -194,7 +201,7 @@ class VRFDeviceAssignmentTest(APIViewTestCases.APIViewTestCase):
             },
             {
                 "vrf": cls.vrfs[4].pk,
-                "virtual_device_context": cls.vdcs[0].pk,
+                "virtual_device_context": cls.vdcs[1].pk,
             },
         ]
         cls.bulk_update_data = {
@@ -1619,7 +1626,7 @@ class IPAddressTest(APIViewTestCases.APIViewTestCase):
         self.assertHttpStatus(ip2, status.HTTP_201_CREATED)
 
         response = self.client.get(
-            self._get_detail_url(nat_inside) + "?depth=1",
+            self._get_detail_url(nat_inside) + "?depth=1&exclude_m2m=false",
             **self.header,
         )
         self.assertHttpStatus(response, status.HTTP_200_OK)

nautobot/ipam/tests/test_filters.py

@@ -17,6 +17,7 @@ from nautobot.ipam.choices import PrefixTypeChoices, ServiceProtocolChoices
 from nautobot.ipam.filters import (
     IPAddressFilterSet,
     IPAddressToInterfaceFilterSet,
+    NamespaceFilterSet,
     PrefixFilterSet,
     PrefixLocationAssignmentFilterSet,
     RIRFilterSet,
@@ -54,6 +55,15 @@ from nautobot.virtualization.models import (
 )
 
 
+class NamespaceTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilterTestCaseMixin):
+    """Namespace FilterSet tests"""
+
+    queryset = Namespace.objects.all()
+    filterset = NamespaceFilterSet
+    tenancy_related_name = "namespaces"
+    generic_filter_tests = (("name",),)
+
+
 class VRFTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilterTestCaseMixin):
     """VRF Filterset tests
 

nautobot/ipam/tests/test_forms.py

@@ -1,8 +1,8 @@
 """Test IPAM forms."""
 
 from django.forms import Form
-from django.test import TestCase
 
+from nautobot.core.testing import TestCase
 from nautobot.core.testing.forms import FormTestCases
 from nautobot.extras.models import Status
 from nautobot.ipam import forms, models

nautobot/ipam/tests/test_models.py

@@ -5,9 +5,9 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db import connection, IntegrityError
 from django.db.models import ProtectedError
-from django.test import TestCase
 import netaddr
 
+from nautobot.core.testing import TestCase
 from nautobot.core.testing.models import ModelTestCases
 from nautobot.dcim import choices as dcim_choices
 from nautobot.dcim.models import Device, DeviceType, Interface, Location, LocationType, Module, ModuleBay, ModuleType
@@ -172,6 +172,48 @@ class IPAddressToInterfaceTest(TestCase):
             IPAddressToInterface.objects.create(vm_interface=None, interface=None, ip_address=ip_addr)
         self.assertIn("Must associate to either an Interface or a VMInterface.", str(cm.exception))
 
+    def test_m2m_save_signal_prevents_iface_ipaddress_and_vminterface_through_defaults(self):
+        """Test that the m2m save signal prevents a VMInterface from using the same IPAddressToInterface instance as an Interface."""
+        ip_addr = IPAddress.objects.create(address="192.0.2.1/24", status=self.status, namespace=self.namespace)
+        with self.assertRaises(ValidationError) as cm:
+            self.test_int1.ip_addresses.add(ip_addr, through_defaults={"vm_interface": self.test_vmint1})
+
+        self.assertIn(
+            "Cannot use a single instance to associate to both an Interface and a VMInterface.", str(cm.exception)
+        )
+
+    def test_m2m_save_signal_prevents_vminterface_ipaddress_and_interface_through_defaults(self):
+        """Test that the m2m save signal prevents an Interface from using the same IPAddressToInterface instance as a VMInterface."""
+        ip_addr = IPAddress.objects.create(address="192.0.2.1/24", status=self.status, namespace=self.namespace)
+        with self.assertRaises(ValidationError) as cm:
+            self.test_vmint1.ip_addresses.add(ip_addr, through_defaults={"interface": self.test_int1})
+
+        self.assertIn(
+            "Cannot use a single instance to associate to both an Interface and a VMInterface.", str(cm.exception)
+        )
+
+    def test_m2m_save_signal_prevents_ipaddress_interface_and_vminterface_through_defaults(self):
+        """Test that the m2m save signal prevents an Interface being added to an IPAddress with a VMInterface through_defaults."""
+        ip_addr = IPAddress.objects.create(address="192.0.2.1/24", status=self.status, namespace=self.namespace)
+
+        with self.assertRaises(ValidationError) as cm:
+            ip_addr.interfaces.add(self.test_int1, through_defaults={"vm_interface": self.test_vmint1})
+
+        self.assertIn(
+            "Cannot use a single instance to associate to both an Interface and a VMInterface.", str(cm.exception)
+        )
+
+    def test_m2m_save_signal_prevents_ipaddress_vminterface_and_interface_through_defaults(self):
+        """Test that the m2m save signal prevents a VMInterface being added to an IPAddress with an Interface through_defaults."""
+        ip_addr = IPAddress.objects.create(address="192.0.2.1/24", status=self.status, namespace=self.namespace)
+
+        with self.assertRaises(ValidationError) as cm:
+            ip_addr.vm_interfaces.add(self.test_vmint1, through_defaults={"interface": self.test_int1})
+
+        self.assertIn(
+            "Cannot use a single instance to associate to both an Interface and a VMInterface.", str(cm.exception)
+        )
+
     def test_primary_ip_retained_when_deleted_from_device_or_module_interface(self):
         """Test primary_ip4 remains set when the same IP is assigned to multiple interfaces and deleted from one."""
 

nautobot/ipam/tests/test_tables.py

@@ -1,6 +1,5 @@
-from django.test import TestCase
-
 from nautobot.core.models.querysets import count_related
+from nautobot.core.testing import TestCase
 from nautobot.dcim.models.locations import Location
 from nautobot.ipam.models import Prefix
 from nautobot.ipam.tables import PrefixTable

nautobot/ipam/tests/test_utils.py

@@ -1,7 +1,7 @@
-from django.test import TestCase
 import netaddr
 
 from nautobot.core.forms.utils import parse_numeric_range
+from nautobot.core.testing import TestCase
 from nautobot.extras.models import Status
 from nautobot.ipam.models import IPAddress, Namespace, Prefix, VLAN, VLANGroup
 from nautobot.ipam.utils import add_available_ipaddresses, add_available_vlans

nautobot/ipam/tests/test_views.py

@@ -51,17 +51,7 @@ from nautobot.users.models import ObjectPermission
 from nautobot.virtualization.models import Cluster, ClusterType, VirtualMachine
 
 
-class NamespaceTestCase(
-    ViewTestCases.GetObjectViewTestCase,
-    ViewTestCases.GetObjectChangelogViewTestCase,
-    ViewTestCases.GetObjectNotesViewTestCase,
-    ViewTestCases.CreateObjectViewTestCase,
-    ViewTestCases.EditObjectViewTestCase,
-    ViewTestCases.DeleteObjectViewTestCase,
-    ViewTestCases.ListObjectsViewTestCase,
-    ViewTestCases.BulkEditObjectsViewTestCase,
-    ViewTestCases.BulkDeleteObjectsViewTestCase,
-):
+class NamespaceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Namespace
     custom_action_required_permissions = {
         "ipam:namespace_vrfs": ["ipam.view_namespace", "ipam.view_vrf"],
@@ -72,11 +62,18 @@ class NamespaceTestCase(
     @classmethod
     def setUpTestData(cls):
         locations = Location.objects.get_for_model(Namespace)
+        tenants = Tenant.objects.all()[:2]
 
-        cls.form_data = {"name": "Namespace X", "location": locations[0].pk, "description": "A new Namespace"}
+        cls.form_data = {
+            "name": "Namespace X",
+            "location": locations[0].pk,
+            "tenant": tenants[0].pk,
+            "description": "A new Namespace",
+        }
 
         cls.bulk_edit_data = {
             "description": "New description",
+            "tenant": tenants[1].pk,
             "location": locations[1].pk,
         }
 
@@ -165,7 +162,7 @@ class RIRTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
                 if count > 1:
                     self.assertBodyContains(
                         response,
-                        f'<a href="{prefix_list_url}?{urlencode({"rir": rir.name})}" class="badge">{count}</a>',
+                        f'<a href="{prefix_list_url}?{urlencode({"rir": rir.name})}" class="badge bg-primary">{count}</a>',
                     )
                 elif count == 1:
                     self.assertBodyContains(response, hyperlinked_object(rir.prefixes.first()))
@@ -250,7 +247,8 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
                 count = prefix.locations.count()
                 if count > 1:
                     self.assertBodyContains(
-                        response, f'<a href="{locations_list_url}?prefixes={prefix.pk}" class="badge">{count}</a>'
+                        response,
+                        f'<a href="{locations_list_url}?prefixes={prefix.pk}" class="badge bg-primary">{count}</a>',
                     )
                 elif count == 1:
                     self.assertBodyContains(response, hyperlinked_object(prefix.locations.first(), "name"))
@@ -756,6 +754,7 @@ class IPAddressMergeTestCase(ModelViewTestCase):
         self.add_permissions("ipam.change_ipaddress")
         num_ips_before = IPAddress.objects.all().count()
         ips = IPAddress.objects.all().exclude(pk__in=[self.dup_ip_1.pk, self.dup_ip_2.pk, self.dup_ip_3.pk])
+        self.assertGreaterEqual(len(ips), 6)
         ip_ct = ContentType.objects.get_for_model(IPAddress)
         locations = Location.objects.all()
         location_ct = ContentType.objects.get_for_model(Location)

nautobot/ipam/ui.py

@@ -10,29 +10,12 @@ from nautobot.core.ui.object_detail import (
     Button,
     KeyValueTablePanel,
     ObjectFieldsPanel,
-    ObjectsTablePanel,
 )
 from nautobot.core.views.utils import get_obj_from_context
 
 logger = logging.getLogger(__name__)
 
 
-# TODO: can be removed as a part of NAUTOBOT-1051
-class PrefixChildTablePanel(ObjectsTablePanel):
-    def should_render(self, context: Context):
-        if not super().should_render(context):
-            return False
-        return context.get("active_tab") == "prefixes"
-
-
-# TODO: can be removed as a part of NAUTOBOT-1051
-class IPAddressTablePanel(ObjectsTablePanel):
-    def should_render(self, context: Context):
-        if not super().should_render(context):
-            return False
-        return context.get("active_tab") == "ip-addresses"
-
-
 class AddChildPrefixButton(Button):
     """Custom button to add a child prefix inside a Prefix detail view."""
 

nautobot/ipam/utils/migrations.py

@@ -146,7 +146,9 @@ def process_vrfs(apps):
     Namespace = apps.get_model("ipam", "Namespace")
     VRF = apps.get_model("ipam", "VRF")
 
-    global_ns = Namespace.objects.get(name=GLOBAL_NS)
+    global_ns, _ = Namespace.objects.get_or_create(
+        name=GLOBAL_NS, defaults={"description": "Default Global namespace. Created by Nautobot."}
+    )
     vrfs = VRF.objects.all().order_by("name", "rd")
     unique_non_empty_vrfs = vrfs.filter(enforce_unique=True).exclude(ip_addresses__isnull=True, prefixes__isnull=True)
     # At the point in the migration where we iterate through vrfs in global_ns_vrfs, every vrf that
@@ -257,6 +259,11 @@ def process_ip_addresses(apps):
                 broadcast = new_parent_cidr[-1]
                 # This can result in duplicate Prefixes being created in the global_ns but that will be
                 # cleaned up subsequently in `process_prefix_duplicates`.
+                if orphaned_ip.vrf and orphaned_ip.vrf.namespace:
+                    prefix_namespace = orphaned_ip.vrf.namespace
+                else:
+                    prefix_namespace = global_ns
+
                 new_parent = Prefix.objects.create(
                     ip_version=orphaned_ip.ip_version,
                     network=network,
@@ -264,7 +271,7 @@ def process_ip_addresses(apps):
                     tenant=orphaned_ip.tenant,
                     vrf=orphaned_ip.vrf,
                     prefix_length=prefix_length,
-                    namespace=orphaned_ip.vrf.namespace if orphaned_ip.vrf else global_ns,
+                    namespace=prefix_namespace,
                     description=DESCRIPTION,
                 )
             orphaned_ip.parent = new_parent
@@ -296,6 +303,13 @@ def process_prefix_duplicates(apps):
     Prefix = apps.get_model("ipam", "Prefix")
     global_namespace = Namespace.objects.get(name=GLOBAL_NS)
 
+    # First, assign any remaining prefixes with null namespace to Global namespace
+    null_namespace_prefixes = Prefix.objects.filter(namespace__isnull=True)
+    if null_namespace_prefixes.exists():
+        if "test" not in sys.argv:
+            print(f">>> Assigning {null_namespace_prefixes.count()} prefixes with null namespace to Global namespace")
+        null_namespace_prefixes.update(namespace=global_namespace)
+
     namespaces = list(Namespace.objects.all())
     # Always start with the Global Namespace.
     namespaces.remove(global_namespace)

nautobot/ipam/utils/testing.py

@@ -5,8 +5,6 @@ import random
 from django.apps import apps
 from netaddr import IPNetwork
 
-from nautobot.ipam.models import get_default_namespace_pk
-
 # Calculate the probabilities to use for the maybe_subdivide() function defined below.
 
 # Frequency of IPv4 (leaf, network) Prefixes by each given mask length in a "realistic" data set.
@@ -129,7 +127,15 @@ def create_prefixes_and_ips(initial_subnet: str, apps=apps, seed="Nautobot"):  #
 
     all_tenants = list(Tenant.objects.all())
     if hasattr(VRF, "namespace"):
-        all_vrfs = list(VRF.objects.filter(namespace_id=get_default_namespace_pk()))
+        # Simulate mid-migration state: create Global namespace and assign all VRFs to it
+        # This creates more realistic test conditions for namespace-aware migration logic
+        Namespace = apps.get_model("ipam", "Namespace")
+        global_ns, _ = Namespace.objects.get_or_create(
+            name="Global", defaults={"description": "Default Global namespace. Created by Nautobot."}
+        )
+        # Pre-assign all VRFs to Global namespace to simulate early migration state
+        VRF.objects.all().update(namespace=global_ns)
+        all_vrfs = list(VRF.objects.filter(namespace_id=global_ns.pk))
     else:
         all_vrfs = list(VRF.objects.all())
 

nautobot/ipam/views.py

@@ -44,6 +44,7 @@ from nautobot.extras.models import Role, SavedView, Status, Tag
 from nautobot.ipam.api import serializers
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import VirtualMachine, VMInterface
+from nautobot.vpn.tables import VPNTunnelEndpointTable
 
 from . import filters, forms, tables, ui
 from .models import (
@@ -423,6 +424,25 @@ class PrefixUIViewSet(NautobotUIViewSet):
                 paginate=False,
                 show_table_config_button=False,
             ),
+            object_detail.ObjectsTablePanel(
+                section=SectionChoices.RIGHT_HALF,
+                weight=300,
+                table_class=VPNTunnelEndpointTable,
+                table_attribute="vpn_tunnel_endpoints",
+                table_title="VPN Tunnel Endpoints",
+                exclude_columns=[
+                    "vpn_profile",
+                    "destination_ipaddress",
+                    "destination_fqdn",
+                    "protected_prefixes_dg_count",
+                    "protected_prefixes_count",
+                    "actions",
+                ],
+                related_field_name="vpn_tunnel_endpoints",
+                add_button_route=None,
+                paginate=False,
+                show_table_config_button=False,
+            ),
         ],
         extra_tabs=[
             object_detail.DistinctViewTab(
@@ -432,13 +452,13 @@ class PrefixUIViewSet(NautobotUIViewSet):
                 related_object_attribute="default_descendants",
                 url_name="ipam:prefix_prefixes",
                 panels=(
-                    ui.PrefixChildTablePanel(
+                    object_detail.ObjectsTablePanel(
                         section=SectionChoices.FULL_WIDTH,
                         weight=100,
                         context_table_key="prefix_table",
                         add_button_route=None,
                         include_paginator=True,
-                        header_extra_content_template_path="ipam/inc/prefix_header_extra_content_table.html",
+                        related_field_name="within",
                     ),
                 ),
             ),
@@ -449,18 +469,24 @@ class PrefixUIViewSet(NautobotUIViewSet):
                 related_object_attribute="all_ips",
                 url_name="ipam:prefix_ipaddresses",
                 panels=[
-                    ui.IPAddressTablePanel(
+                    object_detail.ObjectsTablePanel(
                         section=SectionChoices.FULL_WIDTH,
                         weight=100,
                         context_table_key="ip_table",
                         add_button_route=None,
                         include_paginator=True,
-                        header_extra_content_template_path="ipam/inc/prefix_header_extra_content_table.html",
+                        related_field_name="prefix",
                     ),
                 ],
             ),
         ],
         extra_buttons=[
+            object_detail.Button(
+                weight=100,
+                label="Available",
+                render_on_tab_id="prefixes",
+                template_path="ipam/inc/toggle_available.html",
+            ),
             ui.AddChildPrefixButton(
                 weight=200,
                 label="Add Child Prefix",
@@ -470,8 +496,14 @@ class PrefixUIViewSet(NautobotUIViewSet):
                 required_permissions=["ipam.add_prefix"],
                 render_on_tab_id="prefixes",
             ),
+            object_detail.Button(
+                weight=100,
+                label="Available",
+                render_on_tab_id="ip-addresses",
+                template_path="ipam/inc/toggle_available.html",
+            ),
             ui.AddIPAddressButton(
-                weight=300,
+                weight=200,
                 label="Add an IP Address",
                 link_name="ipam:ipaddress_add",
                 color=ButtonActionColorChoices.SUBMIT,
@@ -516,7 +548,9 @@ class PrefixUIViewSet(NautobotUIViewSet):
 
         prefix_table = tables.PrefixDetailTable(
             child_prefixes,
+            configurable=True,
             exclude=["namespace"],
+            user=request.user,
             data_transform_callback=data_transform_callback,
         )
         if request.user.has_perm("ipam.change_prefix") or request.user.has_perm("ipam.delete_prefix"):
@@ -547,6 +581,7 @@ class PrefixUIViewSet(NautobotUIViewSet):
                 "active_tab": "prefixes",
                 "view_action": "prefixes",
                 "show_available": request.GET.get("show_available", "true") == "true",
+                "badge_count_override": child_prefixes.count(),
             }
         )
 
@@ -568,7 +603,11 @@ class PrefixUIViewSet(NautobotUIViewSet):
         )
 
         ip_table = tables.IPAddressTable(
-            ipaddresses, exclude=["parent__namespace"], data_transform_callback=data_transform_callback
+            ipaddresses,
+            configurable=True,
+            exclude=["parent__namespace"],
+            user=request.user,
+            data_transform_callback=data_transform_callback,
         )
         if request.user.has_perm("ipam.change_ipaddress") or request.user.has_perm("ipam.delete_ipaddress"):
             ip_table.columns.show("pk")
@@ -597,6 +636,7 @@ class PrefixUIViewSet(NautobotUIViewSet):
                 "active_tab": "ip-addresses",
                 "view_action": "ip_addresses",
                 "show_available": request.GET.get("show_available", "true") == "true",
+                "badge_count_override": ipaddresses.count(),
             }
         )