#21488 - Replace MPTT wtih PostgreSQL Ltree

netbox/dcim/models/device_component_templates.py

@@ -1,8 +1,8 @@
 from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.postgres.indexes import GistIndex
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.contrib.postgres.indexes import GistIndex
 from django.utils.translation import gettext_lazy as _
 
 from dcim.choices import *

netbox/netbox/api/viewsets/__init__.py

@@ -333,5 +333,3 @@ class NetBoxModelViewSet(
                 super().perform_destroy(instance)
         except ObjectDoesNotExist:
             raise PermissionDenied()
-
-

netbox/utilities/testing/filtersets.py

@@ -21,7 +21,7 @@ EXEMPT_MODEL_FIELDS = (
     'comments',
     'custom_field_data',
     'path',      # ltree, trigger-maintained
-    'sort_path', # ltree, trigger-maintained
+    'sort_path',  # ltree, trigger-maintained
 )
 
 

netbox/utilities/tests/test_ltree.py

@@ -171,13 +171,13 @@ class SortPathTests(TestCase):
 
     def test_siblings_in_name_order_regardless_of_insertion_order(self):
         # Create siblings out of name order
-        z = Region.objects.create(name='Zebra', slug='zebra-sp')
-        a = Region.objects.create(name='Aardvark', slug='aardvark-sp')
-        b = Region.objects.create(name='Buffalo', slug='buffalo-sp')
+        Region.objects.create(name='Zebra', slug='zebra-sp')
+        Region.objects.create(name='Aardvark', slug='aardvark-sp')
+        buffalo = Region.objects.create(name='Buffalo', slug='buffalo-sp')
 
         # Children of Buffalo also out of order
-        b_z = Region.objects.create(parent=b, name='Zoo', slug='b-zoo-sp')
-        b_a = Region.objects.create(parent=b, name='Apex', slug='b-apex-sp')
+        Region.objects.create(parent=buffalo, name='Zoo', slug='b-zoo-sp')
+        Region.objects.create(parent=buffalo, name='Apex', slug='b-apex-sp')
 
         ordered = list(
             Region.objects.filter(slug__endswith='-sp')
@@ -190,8 +190,8 @@ class SortPathTests(TestCase):
 
     def test_default_ordering_is_sort_path(self):
         """Region.objects.all() uses sort_path-based ordering by default."""
-        b = Region.objects.create(name='B', slug='b-default')
-        a = Region.objects.create(name='A', slug='a-default')
+        Region.objects.create(name='B', slug='b-default')
+        Region.objects.create(name='A', slug='a-default')
         names = list(
             Region.objects.filter(slug__endswith='-default').values_list('name', flat=True)
         )