Update model ordering parameters to ensure deterministic ordering

netbox/extras/migrations/0035_deterministic_ordering.py

@@ -0,0 +1,29 @@
+# Generated by Django 2.2.8 on 2020-01-15 18:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0034_configcontext_tags'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='customfieldvalue',
+            options={'ordering': ('obj_type', 'obj_id', 'pk')},
+        ),
+        migrations.AlterModelOptions(
+            name='graph',
+            options={'ordering': ('type', 'weight', 'name', 'pk')},
+        ),
+        migrations.AlterModelOptions(
+            name='imageattachment',
+            options={'ordering': ('name', 'pk')},
+        ),
+        migrations.AlterModelOptions(
+            name='webhook',
+            options={'ordering': ('name',)},
+        ),
+    ]

netbox/extras/models.py

@@ -120,6 +120,7 @@ class Webhook(models.Model):
     )
 
     class Meta:
+        ordering = ('name',)
         unique_together = ('payload_url', 'type_create', 'type_update', 'type_delete',)
 
     def __str__(self):
@@ -308,8 +309,8 @@ class CustomFieldValue(models.Model):
     )
 
     class Meta:
-        ordering = ['obj_type', 'obj_id']
-        unique_together = ['field', 'obj_type', 'obj_id']
+        ordering = ('obj_type', 'obj_id', 'pk')  # (obj_type, obj_id) may be non-unique
+        unique_together = ('field', 'obj_type', 'obj_id')
 
     def __str__(self):
         return '{} {}'.format(self.obj, self.field)
@@ -454,7 +455,7 @@ class Graph(models.Model):
     )
 
     class Meta:
-        ordering = ['type', 'weight', 'name']
+        ordering = ('type', 'weight', 'name', 'pk')  # (type, weight, name) may be non-unique
 
     def __str__(self):
         return self.name
@@ -623,7 +624,7 @@ class ImageAttachment(models.Model):
     )
 
     class Meta:
-        ordering = ['name']
+        ordering = ('name', 'pk')  # name may be non-unique
 
     def __str__(self):
         if self.name: