Fixes netbox-community#2562 netbox-community#1073 - Reorders Prefix Ordering to allow allow for proper matching of heirarchy for IP address space

DanSheps · DanSheps · commit 4d2617f78030 · 2018-11-16T15:29:10.000-06:00
diff --git a/netbox/ipam/migrations/0024_auto_20181116_1522.py b/netbox/ipam/migrations/0024_auto_20181116_1522.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.1.3 on 2018-11-16 21:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ipam', '0023_change_logging'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='prefix',
+            options={'ordering': ['family', 'prefix', 'vrf'], 'verbose_name_plural': 'prefixes'},
+        ),
+    ]
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
@@ -329,7 +329,7 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
     ]
 
     class Meta:
-        ordering = ['vrf', 'family', 'prefix']
+        ordering = ['family', 'prefix', 'vrf']
         verbose_name_plural = 'prefixes'
 
     def __str__(self):

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):`
`329`	`329`	`]`
`330`	`330`
`331`	`331`	`class Meta:`
`332`		`- ordering = ['vrf', 'family', 'prefix']`
	`332`	`+ ordering = ['family', 'prefix', 'vrf']`
`333`	`333`	`verbose_name_plural = 'prefixes'`
`334`	`334`
`335`	`335`	`def __str__(self):`