nautobot 2.0.0a3__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/ipam/navigation.py

@@ -1,230 +1,85 @@
-from nautobot.core.apps import NavMenuAddButton, NavMenuGroup, NavMenuItem, NavMenuImportButton, NavMenuTab
+from nautobot.core.apps import NavMenuGroup, NavMenuItem, NavMenuTab
 
 
 menu_items = (
     NavMenuTab(
-        name="IPAM",
-        weight=300,
+        name="Networks",
         groups=(
             NavMenuGroup(
-                name="Namespaces",
-                weight=50,
-                items=(
-                    NavMenuItem(
-                        link="ipam:namespace_list",
-                        name="Namespaces",
-                        weight=100,
-                        permissions=[
-                            "ipam.view_namespace",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="ipam:namespace_add",
-                                permissions=[
-                                    "ipam.add_namespace",
-                                ],
-                            ),
-                        ),
-                    ),
-                ),
-            ),
-            NavMenuGroup(
-                name="IP Addresses",
+                name="IP Management",
                 weight=100,
                 items=(
                     NavMenuItem(
-                        link="ipam:ipaddress_list",
                         name="IP Addresses",
                         weight=100,
-                        permissions=[
-                            "ipam.view_ipaddress",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="ipam:ipaddress_add",
-                                permissions=[
-                                    "ipam.add_ipaddress",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="ipam:ipaddress_import",
-                                permissions=[
-                                    "ipam.add_ipaddress",
-                                ],
-                            ),
-                        ),
+                        link="ipam:ipaddress_list",
+                        permissions=["ipam.view_ipaddress"],
                     ),
-                ),
-            ),
-            NavMenuGroup(
-                name="Prefixes",
-                weight=200,
-                items=(
                     NavMenuItem(
-                        link="ipam:prefix_list",
                         name="Prefixes",
-                        weight=100,
-                        permissions=[
-                            "ipam.view_prefix",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="ipam:prefix_add",
-                                permissions=[
-                                    "ipam.add_prefix",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="ipam:prefix_import",
-                                permissions=[
-                                    "ipam.add_prefix",
-                                ],
-                            ),
-                        ),
+                        weight=200,
+                        link="ipam:prefix_list",
+                        permissions=["ipam.view_prefix"],
                     ),
                     NavMenuItem(
-                        link="ipam:rir_list",
                         name="RIRs",
-                        weight=200,
-                        permissions=[
-                            "ipam.view_rir",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="ipam:rir_add",
-                                permissions=[
-                                    "ipam.add_rir",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="ipam:rir_import",
-                                permissions=[
-                                    "ipam.add_rir",
-                                ],
-                            ),
-                        ),
+                        weight=300,
+                        link="ipam:rir_list",
+                        permissions=["ipam.view_rir"],
                     ),
                 ),
             ),
             NavMenuGroup(
-                name="VRFs",
-                weight=400,
+                name="Layer 2 / Switching",
+                weight=200,
                 items=(
                     NavMenuItem(
-                        link="ipam:vrf_list",
-                        name="VRFs",
+                        name="VLANs",
                         weight=100,
-                        permissions=[
-                            "ipam.view_vrf",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="ipam:vrf_add",
-                                permissions=[
-                                    "ipam.add_vrf",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="ipam:vrf_import",
-                                permissions=[
-                                    "ipam.add_vrf",
-                                ],
-                            ),
-                        ),
+                        link="ipam:vlan_list",
+                        permissions=["ipam.view_vlan"],
                     ),
                     NavMenuItem(
-                        link="ipam:routetarget_list",
-                        name="Route Targets",
+                        name="VLAN Groups",
                         weight=200,
-                        permissions=[
-                            "ipam.view_routetarget",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="ipam:routetarget_add",
-                                permissions=[
-                                    "ipam.add_routetarget",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="ipam:routetarget_import",
-                                permissions=[
-                                    "ipam.add_routetarget",
-                                ],
-                            ),
-                        ),
+                        link="ipam:vlangroup_list",
+                        permissions=["ipam.view_vlangroup"],
                     ),
                 ),
             ),
             NavMenuGroup(
-                name="VLANs",
-                weight=500,
+                name="Layer 3 / Routing",
+                weight=300,
                 items=(
                     NavMenuItem(
-                        link="ipam:vlan_list",
-                        name="VLANs",
+                        name="Namespaces",
                         weight=100,
-                        permissions=[
-                            "ipam.view_vlan",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="ipam:vlan_add",
-                                permissions=[
-                                    "ipam.add_vlan",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="ipam:vlan_import",
-                                permissions=[
-                                    "ipam.add_vlan",
-                                ],
-                            ),
-                        ),
+                        link="ipam:namespace_list",
+                        permissions=["ipam.namespace_vrf"],
                     ),
                     NavMenuItem(
-                        link="ipam:vlangroup_list",
-                        name="VLAN Groups",
+                        name="VRFs",
                         weight=200,
-                        permissions=[
-                            "ipam.view_vlangroup",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="ipam:vlangroup_add",
-                                permissions=[
-                                    "ipam.add_vlangroup",
-                                ],
-                            ),
-                            NavMenuImportButton(
-                                link="ipam:vlangroup_import",
-                                permissions=[
-                                    "ipam.add_vlangroup",
-                                ],
-                            ),
-                        ),
+                        link="ipam:vrf_list",
+                        permissions=["ipam.view_vrf"],
+                    ),
+                    NavMenuItem(
+                        name="Route Targets",
+                        weight=300,
+                        link="ipam:routetarget_list",
+                        permissions=["ipam.view_routetarget"],
                     ),
                 ),
             ),
             NavMenuGroup(
                 name="Services",
-                weight=600,
+                weight=400,
                 items=(
                     NavMenuItem(
-                        link="ipam:service_list",
                         name="Services",
                         weight=100,
-                        permissions=[
-                            "ipam.view_service",
-                        ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="ipam:service_import",
-                                permissions=[
-                                    "ipam.add_service",
-                                ],
-                            ),
-                        ),
+                        link="ipam:service_list",
+                        permissions=["ipam.view_service"],
                     ),
                 ),
             ),

nautobot/ipam/querysets.py

@@ -252,7 +252,7 @@ class PrefixQuerySet(BaseNetworkQuerySet):
         """
         if prefix:
             _prefix = netaddr.IPNetwork(prefix)
-            if str(_prefix) != prefix:
+            if str(_prefix) != str(prefix):
                 raise self.model.DoesNotExist()
             last_ip = self._get_last_ip(_prefix)
             kwargs["prefix_length"] = _prefix.prefixlen
@@ -327,47 +327,48 @@ class PrefixQuerySet(BaseNetworkQuerySet):
         except netaddr.AddrFormatError as err:
             raise ValidationError({"cidr": f"{value} does not appear to be an IPv4 or IPv6 network."}) from err
 
-    def get_closest_parent(self, cidr, namespace, prefix_length=0):
+    def get_closest_parent(self, cidr, namespace, max_prefix_length=0):
         """
         Return the closest matching parent Prefix for a `cidr` even if it doesn't exist in the database.
 
         Args:
             cidr (str): IPv4/IPv6 CIDR string
             namespace (Namespace): Namespace instance
-            prefix_length (int): Maximum prefix length depth for closest parent lookup
+            max_prefix_length (int): Maximum prefix length depth for closest parent lookup
         """
         # Validate that it's a real CIDR
         cidr = self._validate_cidr(cidr)
-        broadcast = cidr.broadcast or cidr.ip
+        broadcast = str(cidr.broadcast or cidr.ip)
         ip_version = cidr.version
 
         try:
-            prefix_length = int(prefix_length)
+            max_prefix_length = int(max_prefix_length)
         except ValueError:
-            raise ValidationError({"prefix_length": f"Invalid prefix_length: {prefix_length}."})
+            raise ValidationError({"max_prefix_length": f"Invalid prefix_length: {max_prefix_length}."})
 
         # Walk the supernets backwrds from smallest to largest prefix.
         try:
-            supernets = cidr.supernet(prefixlen=prefix_length)
+            supernets = cidr.supernet(prefixlen=max_prefix_length)
         except ValueError as err:
-            raise ValidationError({"prefix_length": str(err)})
+            raise ValidationError({"max_prefix_length": str(err)})
         else:
             supernets.reverse()
 
         # Enumerate all unique networks and prefixes
         networks = {str(s.network) for s in supernets}
-        prefix_lengths = {s.prefixlen for s in supernets}
-        del supernets  # Free the memory because DevOps.
+        del supernets  # Free the memory because it could be quite large.
 
         # Prepare the queryset filter
         lookup_kwargs = {
             "network__in": networks,
-            "prefix_length__in": prefix_lengths,
+            # TODO(jathan): This might be flawed if an IPAddress has a prefix_length that excludes it from a
+            # parent that should otherwise contain it. If we encounter issues in the future for
+            # identifying closest parent prefixes, this might be a starting point.
+            "prefix_length__lte": cidr.prefixlen,
+            "broadcast__gte": broadcast,
             "ip_version": ip_version,
-            "broadcast__gte": str(broadcast),
+            "namespace": namespace,
         }
-        if namespace is not None:
-            lookup_kwargs["namespace"] = namespace
 
         # Search for possible ancestors by network/prefix, returning them in reverse order, so that
         # we can choose the first one.
@@ -443,7 +444,7 @@ class IPAddressQuerySet(BaseNetworkQuerySet):
         masked_hosts = [bytes(netaddr.IPNetwork(val).ip) for val in networks if "/" in val]
         masked_prefixes = [netaddr.IPNetwork(val).prefixlen for val in networks if "/" in val]
         unmasked_hosts = [bytes(netaddr.IPNetwork(val).ip) for val in networks if "/" not in val]
-        return self.filter(Q(host__in=masked_hosts, prefix_length__in=masked_prefixes) | Q(host__in=unmasked_hosts))
+        return self.filter(Q(host__in=masked_hosts, mask_length__in=masked_prefixes) | Q(host__in=unmasked_hosts))
 
     def get(self, *args, address=None, **kwargs):
         """
@@ -451,10 +452,8 @@ class IPAddressQuerySet(BaseNetworkQuerySet):
         """
         if address:
             address = netaddr.IPNetwork(address)
-            last_ip = self._get_last_ip(address)
-            kwargs["prefix_length"] = address.prefixlen
+            kwargs["mask_length"] = address.prefixlen
             kwargs["host"] = address.ip
-            kwargs["broadcast"] = last_ip
         return super().get(*args, **kwargs)
 
     def filter(self, *args, address=None, **kwargs):
@@ -463,10 +462,8 @@ class IPAddressQuerySet(BaseNetworkQuerySet):
         """
         if address:
             address = netaddr.IPNetwork(address)
-            last_ip = self._get_last_ip(address)
-            kwargs["prefix_length"] = address.prefixlen
+            kwargs["mask_length"] = address.prefixlen
             kwargs["host"] = address.ip
-            kwargs["broadcast"] = last_ip
         return super().filter(*args, **kwargs)
 
     def filter_address_or_pk_in(self, addresses, pk_values=None):
@@ -478,11 +475,9 @@ class IPAddressQuerySet(BaseNetworkQuerySet):
         q = Q()
         for _address in addresses:
             _address = netaddr.IPNetwork(_address)
-            last_ip = self._get_last_ip(_address)
-            prefix_length = _address.prefixlen
+            mask_length = _address.prefixlen
             host = _address.ip
-            broadcast = last_ip
-            q |= Q(prefix_length=prefix_length, host=host, broadcast=broadcast)
+            q |= Q(mask_length=mask_length, host=host)
 
         if pk_values is not None:
             q |= Q(pk__in=pk_values)

nautobot/ipam/signals.py

@@ -1,12 +1,12 @@
 from django.core.exceptions import ValidationError
-from django.db.models.signals import pre_save, m2m_changed
+from django.db.models.signals import m2m_changed, pre_delete, pre_save
 from django.dispatch import receiver
 
-from nautobot.ipam.models import VRF
+from nautobot.ipam.models import IPAddressToInterface, VRF, VRFDeviceAssignment, VRFPrefixAssignment
 
 
-@receiver(pre_save, sender=VRF.devices.through)
-@receiver(pre_save, sender=VRF.prefixes.through)
+@receiver(pre_save, sender=VRFDeviceAssignment)
+@receiver(pre_save, sender=VRFPrefixAssignment)
 def ipam_object_saved(sender, instance, raw=False, **kwargs):
     """
     Forcibly call `full_clean()` when a new IPAM intermediate model is manually saved to prevent
@@ -17,7 +17,7 @@ def ipam_object_saved(sender, instance, raw=False, **kwargs):
     instance.full_clean()
 
 
-@receiver(m2m_changed, sender=VRF.prefixes.through)
+@receiver(m2m_changed, sender=VRFPrefixAssignment)
 def vrf_prefix_associated(sender, instance, action, reverse, model, pk_set, **kwargs):
     """
     Disallow adding Prefixes if the namespace doesn't match.
@@ -29,7 +29,7 @@ def vrf_prefix_associated(sender, instance, action, reverse, model, pk_set, **kw
             raise ValidationError({"prefixes": "Prefix must match namespace of VRF"})
 
 
-@receiver(m2m_changed, sender=VRF.devices.through)
+@receiver(m2m_changed, sender=VRFDeviceAssignment)
 def vrf_device_associated(sender, instance, action, reverse, model, pk_set, **kwargs):
     """
     Assert validation on m2m when devices are associated with a VRF.
@@ -44,3 +44,46 @@ def vrf_device_associated(sender, instance, action, reverse, model, pk_set, **kw
         else:
             for assignment in instance.vrf_assignments.iterator():
                 assignment.validated_save()
+
+
+@receiver(pre_delete, sender=IPAddressToInterface)
+def ip_address_to_interface_pre_delete(instance, raw=False, **kwargs):
+    if raw:
+        return
+
+    # Check if the removed IPAddressToInterface instance contains an IPAddress
+    # that is the primary_v{version} of the host machine.
+
+    if getattr(instance, "interface"):
+        host = instance.interface.device
+        other_assignments_exist = (
+            IPAddressToInterface.objects.filter(interface__device=host, ip_address=instance.ip_address)
+            .exclude(id=instance.id)
+            .exists()
+        )
+    else:
+        host = instance.vm_interface.virtual_machine
+        other_assignments_exist = (
+            IPAddressToInterface.objects.filter(vm_interface__virtual_machine=host, ip_address=instance.ip_address)
+            .exclude(id=instance.id)
+            .exists()
+        )
+
+    # Only nullify the primary_ip field if no other interfaces/vm_interfaces have the ip_address
+    if not other_assignments_exist and instance.ip_address == host.primary_ip4:
+        host.primary_ip4 = None
+    elif not other_assignments_exist and instance.ip_address == host.primary_ip6:
+        host.primary_ip6 = None
+    host.save()
+
+
+@receiver(pre_save, sender=IPAddressToInterface)
+def ip_address_to_interface_assignment_created(sender, instance, raw=False, **kwargs):
+    """
+    Forcibly call `full_clean()` when a new `IPAddressToInterface` object
+    is manually created to prevent inadvertantly creating invalid IPAddressToInterface.
+    """
+    if raw:
+        return
+
+    instance.full_clean()

nautobot/ipam/tables.py

@@ -263,14 +263,21 @@ class VRFDeviceAssignmentTable(BaseTable):
     """Table for displaying VRF Device Assignments with RD."""
 
     vrf = tables.Column(verbose_name="VRF", linkify=lambda record: record.vrf.get_absolute_url(), accessor="vrf.name")
-    device = tables.Column(linkify=lambda record: record.device.get_absolute_url(), accessor="device.name")
+    device = tables.Column(
+        linkify=lambda record: record.device.get_absolute_url(), accessor="device.name", verbose_name="Device"
+    )
+    virtual_machine = tables.Column(
+        linkify=lambda record: record.virtual_machine.get_absolute_url(),
+        accessor="virtual_machine.name",
+        verbose_name="Virtual Machine",
+    )
     rd = tables.Column(verbose_name="VRF RD")
     tenant = TenantColumn(accessor="vrf.tenant")
 
     class Meta(BaseTable.Meta):
         model = VRFDeviceAssignment
         orderable = False
-        fields = ("vrf", "device", "rd", "tenant")
+        fields = ("vrf", "device", "virtual_machine", "rd", "tenant")
 
 
 class VRFPrefixAssignmentTable(BaseTable):
@@ -442,7 +449,7 @@ class PrefixDetailTable(PrefixTable):
 class IPAddressTable(StatusTableMixin, RoleTableMixin, BaseTable):
     pk = ToggleColumn()
     address = tables.TemplateColumn(
-        template_code=IPADDRESS_COPY_LINK, verbose_name="IP Address", order_by=("host", "prefix_length")
+        template_code=IPADDRESS_COPY_LINK, verbose_name="IP Address", order_by=("host", "mask_length")
     )
     # vrf = tables.TemplateColumn(template_code=VRF_LINK, verbose_name="VRF")
     tenant = TenantColumn()

nautobot/ipam/templates/ipam/namespace_ipaddresses.html

@@ -0,0 +1,11 @@
+{% extends 'ipam/namespace_retrieve.html' %}
+
+{% block title %}{{ block.super }} - IP Addresses{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-12">
+            {% include 'utilities/obj_table.html' with table=ip_address_table table_template='panel_table.html' heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
+        </div>
+    </div>
+{% endblock %}

nautobot/ipam/templates/ipam/namespace_prefixes.html

@@ -0,0 +1,11 @@
+{% extends 'ipam/namespace_retrieve.html' %}
+
+{% block title %}{{ block.super }} - Prefixes{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-12">
+            {% include 'utilities/obj_table.html' with table=prefix_table table_template='panel_table.html' heading='Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
+        </div>
+    </div>
+{% endblock %}

nautobot/ipam/templates/ipam/namespace_retrieve.html

@@ -23,7 +23,20 @@
         </div>
 {% endblock content_left_page %}
 
-{% block content_full_width_page %}
-    {% include "utilities/obj_table.html" with table=vrf_table table_template="panel_table.html" heading="VRFs" disable_pagination=False %}
-    {% include "utilities/obj_table.html" with table=prefix_table table_template="panel_table.html" heading="Prefixes" disable_pagination=False %}
-{% endblock content_full_width_page %}
+{% block extra_nav_tabs %}
+{% if perms.ipam.view_vrf %}
+    <li role="presentation"{% if active_tab == 'vrfs' %} class="active"{% endif %}>
+        <a href="{% url 'ipam:namespace_vrfs' pk=object.pk %}">VRFs <span class="badge">{{ vrf_count }}</span></a>
+    </li>
+{% endif %}
+{% if perms.ipam.view_prefix %}
+    <li role="presentation"{% if active_tab == 'prefixes' %} class="active"{% endif %}>
+        <a href="{% url 'ipam:namespace_prefixes' pk=object.pk %}">Prefixes <span class="badge">{{ prefix_count }}</span></a>
+    </li>
+{% endif %}
+{% if perms.ipam.view_ipaddress %}
+    <li role="presentation"{% if active_tab == 'ip-addresses' %} class="active"{% endif %}>
+        <a href="{% url 'ipam:namespace_ipaddresses' pk=object.pk %}">IP Addresses <span class="badge">{{ ip_address_count }}</span></a>
+    </li>
+{% endif %}
+{% endblock extra_nav_tabs %}

nautobot/ipam/templates/ipam/namespace_vrfs.html

@@ -0,0 +1,11 @@
+{% extends 'ipam/namespace_retrieve.html' %}
+
+{% block title %}{{ block.super }} - VRFs{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-12">
+            {% include 'utilities/obj_table.html' with table=vrf_table table_template='panel_table.html' heading='VRFs' bulk_edit_url='ipam:vrf_bulk_edit' bulk_delete_url='ipam:vrf_bulk_delete' %}
+        </div>
+    </div>
+{% endblock %}

nautobot/ipam/templates/ipam/prefix.html

@@ -42,7 +42,7 @@
         </li>
         {% if perms.ipam.view_ipaddress %}
             <li role="presentation"{% if active_tab == 'ip-addresses' %} class="active"{% endif %}>
-                <a href="{% url 'ipam:prefix_ipaddresses' pk=object.pk %}">IP Addresses <span class="badge">{{ object.get_child_ips.count }}</span></a>
+                <a href="{% url 'ipam:prefix_ipaddresses' pk=object.pk %}">IP Addresses <span class="badge">{{ object.ip_addresses.count }}</span></a>
             </li>
         {% endif %}
 {% endblock extra_nav_tabs %}

nautobot/ipam/templates/ipam/vlangroup.html

@@ -3,19 +3,6 @@
 {% load helpers %}
 {% load plugins %}
 
-{% block buttons %}
-        {% plugin_buttons object %}
-        {% if perms.ipam.add_vlangroup %}
-            {% clone_button object %}
-        {% endif %}
-        {% if perms.ipam.change_vlangroup %}
-            {% edit_button object key="pk" %}
-        {% endif %}
-        {% if perms.ipam.delete_vlangroup %}
-            {% delete_button object key="pk" %}
-        {% endif %}
-{% endblock buttons %}
-
 {% block content_left_page %}
         <div class="panel panel-default">
             <div class="panel-heading">

nautobot/ipam/templates/ipam/vrf_edit.html

@@ -17,6 +17,12 @@
             {% render_field form.devices %}
         </div>
     </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Virtual Machines</strong></div>
+        <div class="panel-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">

nautobot/ipam/tests/integration/test_prefixes.py

@@ -1,7 +1,5 @@
 import netaddr
 
-from django.test import override_settings
-
 from nautobot.core.testing.integration import SeleniumTestCase
 from nautobot.extras.models import Status
 from nautobot.ipam.models import Prefix
@@ -9,9 +7,7 @@ from nautobot.ipam.models import Prefix
 
 class PrefixHierarchyTest(SeleniumTestCase):
     """
-    This test case proves that the setting `DISABLE_PREFIX_LIST_HIERARCHY` causes the prefix list view to
-    render a flat list when set to True, instead of calculating parent/child relationships, and that by
-    default it is disabled.
+    This test case tests the indented Prefix hierarchy displayed in the Prefix list view.
     """
 
     def setUp(self):
@@ -35,7 +31,8 @@ class PrefixHierarchyTest(SeleniumTestCase):
 
         # Navigate to Prefix list view
         self.browser.visit(self.live_server_url)
-        self.browser.links.find_by_partial_text("IPAM").click()
+        # find_by_partial_text finds both Inventory > Provider Networks as well as the desired Networks top-level menu.
+        self.browser.links.find_by_partial_text("Networks")[1].click()
         self.browser.links.find_by_partial_text("Prefixes").click()
 
         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
@@ -43,23 +40,3 @@ class PrefixHierarchyTest(SeleniumTestCase):
         self.assertTrue(
             self.browser.find_by_tag("tr")[2].find_by_tag("i").first.has_class("mdi-circle-small")
         )  # 10.0.0.0/24 is indented via an <i> tag
-
-    @override_settings(DISABLE_PREFIX_LIST_HIERARCHY=True)
-    def test_child_relationship_flat(self):
-        """
-        Test that 10.0.0.0/24 is NOT shown under 10.0.0.0/16, so the table is a flat list
-        """
-        status = Status.objects.get_for_model(Prefix).first()
-        Prefix(prefix=netaddr.IPNetwork("10.0.0.0/16"), status=status).validated_save()
-        Prefix(prefix=netaddr.IPNetwork("10.0.0.0/24"), status=status).validated_save()
-
-        # Navigate to Prefix 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("Prefixes").click()
-
-        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
-        self.assertEqual(
-            len(self.browser.find_by_tag("tr")[2].find_by_tag("i")), 0
-        )  # 10.0.0.0/24 is *not* indented via an <i> tag