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

nautobot/ipam/forms.py

@@ -72,10 +72,10 @@ IPADDRESS_MASK_LENGTH_CHOICES = add_blank_choice(
 #
 
 
-class NamespaceForm(LocatableModelFormMixin, NautobotModelForm):
+class NamespaceForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm):
     class Meta:
         model = Namespace
-        fields = ["name", "description", "location", "tags"]
+        fields = ["name", "description", "tenant", "location", "tags"]
 
 
 class NamespaceBulkEditForm(
@@ -84,18 +84,21 @@ class NamespaceBulkEditForm(
     NautobotBulkEditForm,
 ):
     pk = forms.ModelMultipleChoiceField(queryset=Namespace.objects.all(), widget=forms.MultipleHiddenInput())
+    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
     description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
 
     class Meta:
         model = Namespace
         nullable_fields = [
             "description",
+            "tenant",
             "location",
         ]
 
 
-class NamespaceFilterForm(LocatableModelFilterFormMixin, NautobotFilterForm):
+class NamespaceFilterForm(LocatableModelFilterFormMixin, NautobotFilterForm, TenancyFilterForm):
     model = Namespace
+    field_order = ["q", "name", "tenant_group", "tenant"]
     q = forms.CharField(required=False, label="Search")
     name = forms.CharField(required=False)
 

nautobot/ipam/migrations/0030_ipam__namespaces.py

@@ -10,6 +10,17 @@ import nautobot.extras.models.mixins
 import nautobot.ipam.models
 
 
+def create_default_namespace(apps, schema):
+    Namespace = apps.get_model("ipam", "Namespace")
+
+    namespace, _ = Namespace.objects.get_or_create(
+        name="Global", defaults={"description": "Default Global namespace. Created by Nautobot."}
+    )
+
+    # Populate the contextvars cache so that subsequent calls to get_default_namespace_pk() do not error out
+    nautobot.ipam.models.default_namespace_pk.set(namespace.pk)
+
+
 class Migration(migrations.Migration):
     dependencies = [
         ("extras", "0072_rename_model_fields"),
@@ -130,6 +141,8 @@ class Migration(migrations.Migration):
             name="ip_version",
             field=models.IntegerField(db_index=True, editable=False, null=True),
         ),
+        # We shouldn't mix data migrations with schema migrations, but we didn't catch this data dependency until much later
+        migrations.RunPython(create_default_namespace, migrations.RunPython.noop),
         migrations.AddField(
             model_name="prefix",
             name="namespace",

nautobot/ipam/migrations/0031_ipam___data_migrations.py

@@ -17,7 +17,10 @@ def reverse_it(apps, schema_editor):
     Interface = apps.get_model("dcim", "Interface")
     VMInterface = apps.get_model("virtualization", "VMInterface")
 
-    ns_global = Namespace.objects.get(name="Global")
+    # This may be overly defensive, but it doesn't hurt to be safe.
+    ns_global, _ = Namespace.objects.get_or_create(
+        name="Global", defaults={"description": "Default Global namespace. Created by Nautobot."}
+    )
     Prefix.objects.update(namespace=ns_global)
     VRF.objects.update(namespace=ns_global)
     Namespace.objects.exclude(name=ns_global.name).delete()

nautobot/ipam/migrations/0054_namespace_tenant.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.23 on 2025-08-30 13:10
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tenancy", "0009_update_all_charfields_max_length_to_255"),
+        ("ipam", "0053_alter_vrfdeviceassignment_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="namespace",
+            name="tenant",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="namespaces",
+                to="tenancy.tenant",
+            ),
+        ),
+    ]

nautobot/ipam/models.py

@@ -1,3 +1,4 @@
+import contextvars
 import logging
 import operator
 from typing import Optional
@@ -48,6 +49,9 @@ __all__ = (
 logger = logging.getLogger(__name__)
 
 
+default_namespace_pk = contextvars.ContextVar("default_namespace_pk", default=None)
+
+
 @extras_features(
     "custom_links",
     "custom_validators",
@@ -68,6 +72,13 @@ class Namespace(PrimaryModel):
         blank=True,
         null=True,
     )
+    tenant = models.ForeignKey(
+        to="tenancy.Tenant",
+        on_delete=models.PROTECT,
+        related_name="namespaces",
+        blank=True,
+        null=True,
+    )
 
     @property
     def ip_addresses(self):
@@ -80,9 +91,17 @@ class Namespace(PrimaryModel):
     def __str__(self):
         return self.name
 
+    def delete(self, *args, **kwargs):
+        if self.name == "Global":
+            default_namespace_pk.set(None)
+        super().delete(*args, **kwargs)
+
 
 def get_default_namespace():
-    """Return the Global namespace."""
+    """Return the Global namespace.
+
+    Because this has no access to historical models, this MUST NOT be called during migrations.
+    """
     obj, _ = Namespace.objects.get_or_create(
         name="Global", defaults={"description": "Default Global namespace. Created by Nautobot."}
     )
@@ -91,7 +110,15 @@ def get_default_namespace():
 
 def get_default_namespace_pk():
     """Return the PK of the Global namespace for use in default value for foreign keys."""
-    return get_default_namespace().pk
+    pk = default_namespace_pk.get()
+    if pk is None:
+        # MUST NEVER HAPPEN DURING MIGRATIONS, because get_default_namespace() doesn't use historical models.
+        # This is accommodated in migration ipam__0030 to directly set default_namespace_pk *from* the historical model
+        # but any other migrations using this function may need to implement similar workarounds.
+        pk = get_default_namespace().pk
+        default_namespace_pk.set(pk)
+
+    return pk
 
 
 @extras_features(

nautobot/ipam/navigation.py

@@ -4,12 +4,13 @@ from nautobot.core.apps import (
     NavMenuItem,
     NavMenuTab,
 )
+from nautobot.core.ui.choices import NavigationIconChoices, NavigationWeightChoices
 
 menu_items = (
     NavMenuTab(
         name="IPAM",
-        icon="ip",
-        weight=300,
+        icon=NavigationIconChoices.IPAM,
+        weight=NavigationWeightChoices.IPAM,
         groups=(
             NavMenuGroup(
                 name="IP Addresses",

nautobot/ipam/signals.py

@@ -5,6 +5,7 @@ from django.db.models.signals import m2m_changed, pre_delete, pre_save
 from django.dispatch import receiver
 
 from nautobot.ipam.models import (
+    IPAddress,
     IPAddressToInterface,
     Prefix,
     PrefixLocationAssignment,
@@ -136,3 +137,73 @@ def assert_locations_content_types(sender, instance, action, reverse, model, pk_
             raise ValidationError(
                 {key: f"{instance} is a {instance.location_type} and may not have {label} associated to it."}
             )
+
+
+def _validate_interface_ipaddress_assignments(sender, instance, pk_set, interface_field):
+    """
+    Helper function to validate IPAddressToInterface instances on Interface and VMInterface objects after M2M operations.
+
+    For example:
+        * interface.ip_addresses.add(ip_address)
+        * vm_interface.ip_addresses.add(ip_address)
+
+    Args:
+        sender: The through model class (IPAddressToInterface)
+        instance: The interface instance (Interface or VMInterface)
+        pk_set: Set of IP address PKs being modified
+        interface_field: Field name to filter on ('interface' or 'vm_interface')
+    """
+    # Get the through model instances that were just created
+    filter_kwargs = {interface_field: instance, "ip_address_id__in": pk_set}
+    through_instances = sender.objects.filter(**filter_kwargs)
+
+    # Validate each through model instance
+    for through_instance in through_instances:
+        through_instance.full_clean()
+
+
+def _validate_ipaddress_interface_assignments(sender, instance, pk_set, interface_model):
+    """
+    Helper function to validate IPAddressToInterface instances on IPAddress objects after M2M operations.
+
+    For example:
+        * ip_address.interfaces.add(interface)
+        * ip_address.vm_interfaces.add(vm_interface)
+
+    Args:
+        sender: The through model class (IPAddressToInterface)
+        instance: The interface instance (Interface or VMInterface)
+        pk_set: Set of IP address PKs being modified
+        interface_model: Field name to filter on ('interface' or 'vm_interface')
+    """
+    filter_kwargs = {"ip_address": instance, interface_model + "_id__in": pk_set}
+    through_instances = sender.objects.filter(**filter_kwargs)
+    for through_instance in through_instances:
+        through_instance.full_clean()
+
+
+@receiver(m2m_changed, sender=IPAddressToInterface)
+def validate_interface_ip_assignments(sender, instance, action, pk_set, **kwargs):
+    """
+    Validate IPAddressToInterface instances after M2M operations.
+
+    Handles both physical Interface and VMInterface IP assignments.
+    Since Django's M2M add() with through_defaults bypasses save() methods,
+    we validate the through model instances via signal handler.
+    """
+    from nautobot.dcim.models import Interface
+    from nautobot.virtualization.models import VMInterface
+
+    if action == "post_add" and pk_set:
+        # Route to appropriate validation based on instance type
+        if isinstance(instance, Interface):
+            _validate_interface_ipaddress_assignments(sender, instance, pk_set, "interface")
+        elif isinstance(instance, VMInterface):
+            _validate_interface_ipaddress_assignments(sender, instance, pk_set, "vm_interface")
+        elif isinstance(instance, IPAddress):
+            interface_model = kwargs["model"]
+
+            if interface_model == Interface:
+                _validate_ipaddress_interface_assignments(sender, instance, pk_set, "interface")
+            elif interface_model == VMInterface:
+                _validate_ipaddress_interface_assignments(sender, instance, pk_set, "vm_interface")

nautobot/ipam/tables.py

@@ -205,11 +205,12 @@ VLANGROUP_ADD_VLAN = """
 class NamespaceTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()
+    tenant = TenantColumn()
     tags = TagColumn(url_name="ipam:namespace_list")
 
     class Meta(BaseTable.Meta):
         model = Namespace
-        fields = ("pk", "name", "description", "location")
+        fields = ("pk", "name", "description", "tenant", "location")
 
 
 #
@@ -369,7 +370,7 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
     tenant = TenantColumn()
     namespace = tables.Column(linkify=True)
     vlan = tables.Column(linkify=True, verbose_name="VLAN")
-    rir = tables.Column(linkify=True)
+    rir = tables.Column(linkify=True, verbose_name="RIR")
     children = tables.Column(accessor="descendants_count", orderable=False)
     date_allocated = tables.DateTimeColumn()
     location_count = LinkedCountColumn(
@@ -378,6 +379,11 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
     cloud_networks_count = LinkedCountColumn(
         viewname="cloud:cloudnetwork_list", url_params={"prefixes": "pk"}, verbose_name="Cloud Networks"
     )
+    tunnel_endpoints_count = LinkedCountColumn(
+        viewname="vpn:vpntunnelendpoint_list",
+        url_params={"protected_prefixes": "pk"},
+        verbose_name="VPN Tunnel Endpoints",
+    )
     actions = ButtonsColumn(Prefix)
 
     class Meta(BaseTable.Meta):
@@ -393,6 +399,7 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "tenant",
             "location_count",
             "cloud_networks_count",
+            "tunnel_endpoints_count",
             "vlan",
             "role",
             "rir",
@@ -415,7 +422,7 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "actions",
         )
         row_attrs = {
-            "class": lambda record: "success" if not record.present_in_database else "",
+            "class": lambda record: "table-success" if not record.present_in_database else "",
         }
 
 
@@ -449,6 +456,7 @@ class PrefixDetailTable(PrefixTable):
             "role",
             "description",
             "tags",
+            "actions",
         )
         default_columns = (
             "pk",
@@ -463,6 +471,7 @@ class PrefixDetailTable(PrefixTable):
             "vlan",
             "role",
             "description",
+            "actions",
         )
 
 
@@ -499,6 +508,7 @@ class IPAddressTable(StatusTableMixin, RoleTableMixin, BaseTable):
         distinct=True,
         verbose_name="Virtual Machines",
     )
+    actions = ButtonsColumn(Prefix)
 
     class Meta(BaseTable.Meta):
         model = IPAddress
@@ -516,9 +526,10 @@ class IPAddressTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "interface_parent_count",
             "vm_interface_count",
             "vm_interface_parent_count",
+            "actions",
         )
         row_attrs = {
-            "class": lambda record: "success" if not isinstance(record, IPAddress) else "",
+            "class": lambda record: "table-success" if not isinstance(record, IPAddress) else "",
         }
 
 
@@ -545,6 +556,7 @@ class IPAddressDetailTable(IPAddressTable):
             "dns_name",
             "description",
             "tags",
+            "actions",
         )
         default_columns = (
             "pk",
@@ -557,6 +569,7 @@ class IPAddressDetailTable(IPAddressTable):
             "assigned",
             "dns_name",
             "description",
+            "actions",
         )
 
 
@@ -651,7 +664,7 @@ class IPAddressInterfaceTable(InterfaceTable):
             "connection",
         ]
         row_attrs = {
-            "style": cable_status_color_css,
+            "class": cable_status_color_css,
             "data-name": lambda record: record.name,
         }
 
@@ -744,7 +757,7 @@ class VLANTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "description",
         )
         row_attrs = {
-            "class": lambda record: "success" if not isinstance(record, VLAN) else "",
+            "class": lambda record: "table-success" if not isinstance(record, VLAN) else "",
         }
 
 

nautobot/ipam/templates/ipam/inc/toggle_available.html

@@ -1,11 +1,11 @@
 {% load helpers %}
-{% if show_available is not None %}
-    <div class="btn-group" role="group">
-        <a href="{{ request.path }}{% legacy_querystring request show_available='true' %}" class="btn btn-secondary btn-sm{% if show_available %} active disabled{% endif %}">
-            <span class="mdi mdi-eye-outline"></span> Show available
-        </a>
-        <a href="{{ request.path }}{% legacy_querystring request show_available='false' %}" class="btn btn-secondary btn-sm{% if not show_available %} active disabled{% endif %}">
-            <span class="mdi mdi-eye-off-outline"></span> Hide available
-        </a>
-    </div>
-{% endif %}
+<div class="btn-group" role="group">
+    <a href="{% django_querystring show_available='true' %}"
+       class="btn btn-primary{% if show_available %} bg-primary nb-text-body-bg{% endif %}">
+        <span class="mdi mdi-eye-outline"></span> Show {{ label }}
+    </a>
+    <a href="{% django_querystring show_available='false' %}"
+       class="btn btn-primary{% if not show_available %} bg-primary nb-text-body-bg{% endif %}">
+        <span class="mdi mdi-eye-off-outline"></span> Hide {{ label }}
+    </a>
+</div>

nautobot/ipam/templates/ipam/inc/vlangroup_header.html

@@ -1,3 +1,4 @@
+{# TODO: this file is unused as far as I can tell - remove it? #}
 <div class="float-end">
     {% if perms.ipam.add_vlan and first_available_vlan %}
         <a href="{% url 'ipam:vlan_add' %}?vid={{ first_available_vlan }}&group={{ object.pk }}{% if object.location %}&location={{ object.location.pk }}{% endif %}" class="btn btn-success">

nautobot/ipam/templates/ipam/ipaddress.html

@@ -136,6 +136,20 @@
                     {% endif %}
                 </td>
             </tr>
+            <tr>
+                <td>VPN Endpoints</td>
+                <td>
+                    {% if object.vpn_tunnel_endpoints_src_ip.exists %}
+                        <ul class="list-unstyled">
+                            {% for endpoint in object.vpn_tunnel_endpoints_src_ip.all %}
+                                <li>{{ endpoint|hyperlinked_object }}</li>
+                            {% endfor %}
+                        </ul>
+                    {% else %}
+                        <span class="text-secondary">None</span>
+                    {% endif %}
+                </td>
+            </tr>
         </table>
     </div>
 {% endblock content_right_page %}

nautobot/ipam/templates/ipam/ipaddress_merge.html

@@ -16,8 +16,8 @@
 {% block content %}
     <form action="" method="post" enctype="multipart/form-data" class="h-100 vstack">
         {% csrf_token %}
-        <div class="row align-content-start flex-fill">
-            <div class="col-lg-10 offset-md-1">
+        <div class="row justify-content-center align-content-start flex-fill">
+            <div class="col-lg-10">
                 <div class="card border-info">
                     <div class="card-header bg-info-subtle border-info fw-medium text-body"><strong>Confirm Merging IP Addresses</strong></div>
                     <div class="card-body">
@@ -26,7 +26,7 @@
                     </div>
                 </div>
             </div>
-            <div class="col-lg-10 offset-md-1">
+            <div class="col-lg-10">
                 <div class="card">
                     <div class="table-responsive">
                         <table class="table table-hover nb-table-headings">

nautobot/ipam/templates/ipam/ipaddresstointerface_retrieve.html

@@ -1,4 +1,5 @@
 {% extends 'generic/object_retrieve.html' %}
+{# TODO: this file is unused as far as I can tell. Remove it? #}
 {% load helpers %}
 {% load render_table from django_tables2 %}
 

nautobot/ipam/templates/ipam/namespace_ip_addresses.html

@@ -1,4 +1,4 @@
-{% extends 'ipam/namespace_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block title %}{{ block.super }} - IP Addresses{% endblock %}
 

nautobot/ipam/templates/ipam/namespace_prefixes.html

@@ -1,4 +1,4 @@
-{% extends 'ipam/namespace_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block title %}{{ block.super }} - Prefixes{% endblock %}
 

nautobot/ipam/templates/ipam/namespace_update.html

@@ -0,0 +1,15 @@
+{% extends 'generic/object_create.html' %}
+{% load form_helpers %}
+
+{% block form %}
+    <div class="card">
+        <div class="card-header"><strong>Namespace</strong></div>
+        <div class="card-body">
+            {% render_field form.name %}
+            {% render_field form.description %}
+            {% render_field form.location %}
+        </div>
+    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
+    {% include 'inc/extras_features_edit_form_fields.html' %}
+{% endblock %}

nautobot/ipam/templates/ipam/namespace_vrfs.html

@@ -1,4 +1,4 @@
-{% extends 'ipam/namespace_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block title %}{{ block.super }} - VRFs{% endblock %}
 

nautobot/ipam/templates/ipam/prefix_delete.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_delete.html' %}
+{% extends 'generic/object_destroy.html' %}
 
 {% block message_extra %}
     <p>Note: This will <strong>not</strong> delete any child prefixes or IP addresses.</p>

nautobot/ipam/templates/ipam/prefix_list.html

@@ -2,19 +2,20 @@
 {% load helpers %}
 
 {% block buttons %}
-    <div class="btn-group" role="group">
-        <div class="dropdown">
-            <button class="btn btn-secondary dropdown-toggle" type="button" id="max_length" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                Max Length{% if "prefix_length__lte" in request.GET %}: {{ request.GET.prefix_length__lte }}{% endif %}
-                <span class="mdi mdi-chevron-down"></span>
-            </button>
-            <ul class="dropdown-menu" aria-labelledby="max_length">
-                {% for i in "4,8,12,16,20,24,28,32,40,48,56,64"|split %}
-                    <li><a href="{% url 'ipam:prefix_list' %}{% legacy_querystring request prefix_length__lte=i page=1 %}">
+    <div class="dropdown">
+        <button class="btn btn-secondary dropdown-toggle" type="button" id="max_length" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+            Max Length{% if "prefix_length__lte" in request.GET %}: {{ request.GET.prefix_length__lte }}{% endif %}
+            <span class="mdi mdi-chevron-down"></span>
+        </button>
+        <ul class="dropdown-menu" aria-labelledby="max_length">
+            {% for i in "4,8,12,16,20,24,28,32,40,48,56,64"|split %}
+                <li>
+                    <a class="dropdown-item"
+                       href="{% url 'ipam:prefix_list' %}{% legacy_querystring request prefix_length__lte=i page=1 %}">
                         {{ i }} {% if request.GET.prefix_length__lte == i %}<span class="mdi mdi-check-bold"></span>{% endif %}
-                    </a></li>
-                {% endfor %}
-            </ul>
-        </div>
+                    </a>
+                </li>
+            {% endfor %}
+        </ul>
     </div>
 {% endblock %}

nautobot/ipam/templates/ipam/vlan_interfaces.html

@@ -1,4 +1,4 @@
-{% extends 'ipam/vlan.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block content %}
     <div class="row">

nautobot/ipam/templates/ipam/vlan_vminterfaces.html

@@ -1,4 +1,4 @@
-{% extends 'ipam/vlan.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block content %}
     <div class="row">

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