nautobot 2.4.21__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/ipam/templates/ipam/vlan_update.html

@@ -2,9 +2,9 @@
 {% load form_helpers %}
 
 {% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>VLAN</strong></div>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>VLAN</strong></div>
+        <div class="card-body">
             {% render_field form.vid %}
             {% render_field form.name %}
             {% render_field form.status %}
@@ -12,9 +12,9 @@
             {% render_field form.description %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Assignment</strong></div>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>Assignment</strong></div>
+        <div class="card-body">
             {% render_field form.locations %}
             {% render_field form.vlan_group %}
         </div>

nautobot/ipam/templates/ipam/vlan_vminterfaces.html

@@ -2,7 +2,7 @@
 
 {% block content %}
     <div class="row">
-        <div class="col-md-12">
+        <div class="col-lg-12">
             {% include 'utilities/obj_table.html' with table=members_table table_template='panel_table.html' heading='Virtual Machine Interfaces' parent=vlan %}
         </div>
     </div>

nautobot/ipam/templates/ipam/vrf_edit.html

@@ -2,9 +2,9 @@
 {% load form_helpers %}
 
 {% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>VRF</strong></div>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>VRF</strong></div>
+        <div class="card-body">
             {% render_field form.name %}
             {% render_field form.namespace %}
             {% render_field form.rd %}
@@ -12,27 +12,27 @@
             {% render_field form.description %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Devices</strong></div>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>Devices</strong></div>
+        <div class="card-body">
             {% render_field form.devices %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Virtual Machines</strong></div>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>Virtual Machines</strong></div>
+        <div class="card-body">
             {% render_field form.virtual_machines %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Prefixes</strong></div>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>Prefixes</strong></div>
+        <div class="card-body">
             {% render_field form.prefixes %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Route Targets</strong></div>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>Route Targets</strong></div>
+        <div class="card-body">
             {% render_field form.import_targets %}
             {% render_field form.export_targets %}
         </div>

nautobot/ipam/tests/integration/test_prefixes.py

@@ -1,26 +1,19 @@
 import netaddr
 
-from nautobot.core.testing.integration import SeleniumTestCase
+from nautobot.core.testing.integration import ObjectDetailsMixin, SeleniumTestCase
 from nautobot.extras.models import Status
 from nautobot.ipam.choices import PrefixTypeChoices
 from nautobot.ipam.models import Namespace, Prefix
 
 
-class PrefixHierarchyTest(SeleniumTestCase):
+class PrefixHierarchyTest(SeleniumTestCase, ObjectDetailsMixin):
     """
     This test case tests the indented Prefix hierarchy displayed in the Prefix list view.
     """
 
     def setUp(self):
         super().setUp()
-
-        self.user.is_superuser = True
-        self.user.save()
-        self.login(self.user.username, self.password)
-
-    def tearDown(self):
-        self.logout()
-        super().tearDown()
+        self.login_as_superuser()
 
     def test_child_relationship_visible(self):
         """
@@ -43,10 +36,9 @@ class PrefixHierarchyTest(SeleniumTestCase):
 
         # Navigate to Namespace Prefixes list view
         self.browser.visit(self.live_server_url)
-        self.browser.links.find_by_partial_text("IPAM").click()
-        self.browser.links.find_by_partial_text("Namespaces").click()
+        self.click_navbar_entry("IPAM", "Namespaces")
         self.browser.links.find_by_text(namespace.name).click()
-        self.browser.find_by_xpath("//ul[@id='tabs']//a[contains(., 'Prefixes')]").click()
+        self.switch_tab("Prefixes")
 
         self.assertEqual(len(self.browser.find_by_tag("tr")[1].find_by_text("10.0.0.0/16")), 1)  # 10.0.0.0/16 is first
         self.assertEqual(len(self.browser.find_by_tag("tr")[2].find_by_text("10.0.0.0/24")), 1)  # 10.0.0.0/24 is second

nautobot/ipam/tests/migration/test_migrations.py

@@ -508,3 +508,92 @@ class IPAMDataMigration0031TestCase(MigratorTestCase):
             for ip in IPAddress.objects.iterator():
                 self.assertLessEqual(netaddr.IPAddress(ip.parent.network), netaddr.IPAddress(ip.host))
                 self.assertGreaterEqual(netaddr.IPAddress(ip.parent.broadcast), netaddr.IPAddress(ip.host))
+
+
+class NamespaceTenantCircularDependencyTestCase(MigratorTestCase):
+    """Test that our 3-phase migration approach resolves circular dependencies and supports rollback."""
+
+    migrate_from = ("ipam", "0029_ip_address_to_interface_uniqueness_constraints")  # Before namespace creation
+    migrate_to = ("ipam", "0054_namespace_tenant")  # After our complete sequence
+
+    def prepare(self):
+        """Create minimal data to test namespace-tenant migration sequence."""
+        # Create basic tenancy data in old state
+        TenantGroup = self.old_state.apps.get_model("tenancy", "TenantGroup")
+        Tenant = self.old_state.apps.get_model("tenancy", "Tenant")
+
+        self.tenant_group = TenantGroup.objects.create(name="Test Group")
+        self.tenant1 = Tenant.objects.create(name="Test Tenant 1", tenant_group=self.tenant_group)
+        self.tenant2 = Tenant.objects.create(name="Test Tenant 2", tenant_group=self.tenant_group)
+
+    def test_forward_migration_resolves_circular_dependency(self):
+        """Test that fresh database creation works with tenant on Namespace."""
+        Namespace = self.new_state.apps.get_model("ipam", "Namespace")
+        VRF = self.new_state.apps.get_model("ipam", "VRF")
+        Prefix = self.new_state.apps.get_model("ipam", "Prefix")
+
+        # Verify Global namespace exists
+        global_namespace = Namespace.objects.get(name="Global")
+        self.assertIsNotNone(global_namespace)
+
+        # Verify tenant field exists on Namespace
+        self.assertTrue(hasattr(global_namespace, "tenant"))
+
+        # Verify VRF and Prefix have namespace defaults working
+        vrf_field = VRF._meta.get_field("namespace")
+        prefix_field = Prefix._meta.get_field("namespace")
+        self.assertIsNotNone(vrf_field.default)
+        self.assertIsNotNone(prefix_field.default)
+
+    def test_namespace_tenant_field_added(self):
+        """Test that tenant field was properly added to Namespace model."""
+        Namespace = self.new_state.apps.get_model("ipam", "Namespace")
+
+        # Create a namespace with tenant assignment
+        test_namespace = Namespace.objects.create(
+            name="Test Namespace", tenant_id=self.tenant1.pk, description="Test namespace with tenant"
+        )
+
+        # Verify tenant field exists and works
+        self.assertEqual(test_namespace.tenant_id, self.tenant1.pk)
+        self.assertEqual(test_namespace.name, "Test Namespace")
+
+        # Verify tenant relationship works
+        retrieved_namespace = Namespace.objects.get(name="Test Namespace")
+        self.assertEqual(retrieved_namespace.tenant_id, self.tenant1.pk)
+
+
+class NamespaceTenantRollbackTestCase(MigratorTestCase):
+    """Test rolling back the namespace-tenant feature works safely."""
+
+    # For rollback testing: migrate_from is AFTER our changes, migrate_to is BEFORE
+    migrate_from = ("ipam", "0054_namespace_tenant")  # After our complete sequence
+    migrate_to = ("ipam", "0052_alter_ipaddress_index_together_and_more")  # Before our changes
+
+    def prepare(self):
+        """Create namespace data in the 'after' state to test rollback."""
+        # Create tenancy data first
+        TenantGroup = self.old_state.apps.get_model("tenancy", "TenantGroup")
+        Tenant = self.old_state.apps.get_model("tenancy", "Tenant")
+
+        self.tenant_group = TenantGroup.objects.create(name="Test Tenant Group")
+        self.tenant1 = Tenant.objects.create(name="Test Tenant 1", tenant_group=self.tenant_group)
+
+        # Create namespace with tenant assignment in the 'after' state
+        Namespace = self.old_state.apps.get_model("ipam", "Namespace")
+        self.test_namespace = Namespace.objects.create(
+            name="Test Namespace", tenant_id=self.tenant1.pk, description="Test namespace for rollback"
+        )
+
+    def test_rollback_migration_preserves_data_integrity(self):
+        """Test that rolling back preserves namespace data but removes tenant field."""
+        # In the rolled-back state, tenant field should be gone
+        Namespace = self.new_state.apps.get_model("ipam", "Namespace")
+        rolled_back_namespace = Namespace.objects.get(pk=self.test_namespace.pk)
+
+        # Verify core fields preserved
+        self.assertEqual(rolled_back_namespace.name, "Test Namespace")
+        self.assertEqual(rolled_back_namespace.description, "Test namespace for rollback")
+
+        # Verify tenant field no longer exists (rolled back)
+        self.assertFalse(hasattr(rolled_back_namespace, "tenant"))

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.",
@@ -124,7 +131,13 @@ class VRFDeviceAssignmentTest(APIViewTestCases.APIViewTestCase):
 
     @classmethod
     def setUpTestData(cls):
-        cls.vrfs = VRF.objects.all()
+        cls.vrfs = (
+            VRF.objects.create(name="Test VRF 1", rd="65000:1", namespace=Namespace.objects.first()),
+            VRF.objects.create(name="Test VRF 2", rd="65000:2", namespace=Namespace.objects.first()),
+            VRF.objects.create(name="Test VRF 3", rd="65000:3", namespace=Namespace.objects.first()),
+            VRF.objects.create(name="Test VRF 4", rd="65000:4", namespace=Namespace.objects.first()),
+            VRF.objects.create(name="Test VRF 5", rd="65000:5", namespace=Namespace.objects.first()),
+        )
         cls.devices = Device.objects.all()
         cls.vdcs = VirtualDeviceContext.objects.all()
         locations = Location.objects.filter(location_type__name="Campus")
@@ -188,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 = {
@@ -1613,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

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"))
@@ -312,12 +310,16 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
         # This validates that both parent prefix and child prefix IPAddresses are present in parent prefix IPAddresses list
         self.assertIn("5.5.10.1/23", strip_tags(content))
         self.assertIn("5.5.10.4/23", strip_tags(content))
-        ip_address_tab = (
-            f'<li role="presentation" class="active"><a href="{url}">IP Addresses <span class="badge">2</span></a></li>'
-        )
+        ip_address_tab = f'<li class="nav-item" role="presentation"><a class="nav-link active" aria-current="page" href="{url}" aria-controls="ip-addresses" role="tab">IP Addresses <span class="badge bg-primary">2</span></a></li>'
         self.assertInHTML(ip_address_tab, content)
         # Checks if the button is in the content.
-        self.assertInHTML("""<span class="mdi mdi-plus-thick" aria-hidden="true"></span>Add an IP Address""", content)
+        add_ip_link = (
+            reverse("ipam:ipaddress_add")
+            + "?"
+            + urlencode({"address": "5.5.10.2/23", "namespace": str(self.namespace.pk)})
+        )
+        add_ip_button = f'<a href="{add_ip_link}" class="btn btn-primary"><span class="mdi mdi-plus-thick" aria-hidden="true"></span>Add an IP Address</a>'
+        self.assertInHTML(add_ip_button, content)
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_prefix_child_prefixes_table_list(self):
@@ -341,8 +343,8 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
         content = extract_page_body(response.content.decode(response.charset))
         # This validates that both parent prefix and child prefix IPAddresses are present in parent prefix IPAddresses list
         self.assertIn("5.5.10.0/30", strip_tags(content))
-        ip_address_tab = f'<li role="presentation" class="active"><a href="{url}">Child Prefixes <span class="badge">1</span></a></li>'
-        self.assertInHTML(ip_address_tab, content)
+        prefixes_tab = f'<li role="presentation" class="nav-item"><a class="nav-link active" href="{url}" aria-controls="prefixes" role="tab" aria-current="page">Child Prefixes <span class="badge bg-primary">1</span></a></li>'
+        self.assertInHTML(prefixes_tab, content)
         # Checks if the button is in the content.
         self.assertInHTML("""<span class="mdi mdi-plus-thick" aria-hidden="true"></span>Add Child Prefix""", content)
 
@@ -752,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)
@@ -1203,6 +1206,6 @@ class ServiceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         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>',
+            ' <strong>Ports</strong>: <ul class="errorlist"><li>invalid literal for int() with base 10: &#x27;[106&#x27;</li></ul>',
             response_content,
         )

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())