From f93cd17fee21aa07bba8c40581d403ed45acca5b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 Nov 2019 22:26:35 -0500
Subject: [PATCH] Consolidate #3569 field migrations by model

---
 ...to_slug.py => 0016_3569_circuit_fields.py} |  0
 .../dcim/migrations/0078_3569_site_fields.py  | 12 +++++++
 ...pe_to_slug.py => 0079_3569_rack_fields.py} | 28 ++++++++++++++-
 .../migrations/0079_rack_status_to_slug.py    | 34 -------------------
 ...slug.py => 0080_3569_devicetype_fields.py} |  2 +-
 ..._to_slug.py => 0081_3569_device_fields.py} |  2 +-
 ..._slug.py => 0082_3569_interface_fields.py} |  2 +-
 7 files changed, 42 insertions(+), 38 deletions(-)
 rename netbox/circuits/migrations/{0016_circuit_status_to_slug.py => 0016_3569_circuit_fields.py} (100%)
 create mode 100644 netbox/dcim/migrations/0078_3569_site_fields.py
 rename netbox/dcim/migrations/{0078_rack_type_to_slug.py => 0079_3569_rack_fields.py} (58%)
 delete mode 100644 netbox/dcim/migrations/0079_rack_status_to_slug.py
 rename netbox/dcim/migrations/{0081_devicetype_subdevicerole_to_slug.py => 0080_3569_devicetype_fields.py} (95%)
 rename netbox/dcim/migrations/{0080_device_face_to_slug.py => 0081_3569_device_fields.py} (94%)
 rename netbox/dcim/migrations/{0082_interface_type_to_slug.py => 0082_3569_interface_fields.py} (98%)

diff --git a/netbox/circuits/migrations/0016_circuit_status_to_slug.py b/netbox/circuits/migrations/0016_3569_circuit_fields.py
similarity index 100%
rename from netbox/circuits/migrations/0016_circuit_status_to_slug.py
rename to netbox/circuits/migrations/0016_3569_circuit_fields.py
diff --git a/netbox/dcim/migrations/0078_3569_site_fields.py b/netbox/dcim/migrations/0078_3569_site_fields.py
new file mode 100644
index 000000000..0826f7f78
--- /dev/null
+++ b/netbox/dcim/migrations/0078_3569_site_fields.py
@@ -0,0 +1,12 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    atomic = False
+
+    dependencies = [
+        ('dcim', '0077_power_types'),
+    ]
+
+    operations = [
+    ]
diff --git a/netbox/dcim/migrations/0078_rack_type_to_slug.py b/netbox/dcim/migrations/0079_3569_rack_fields.py
similarity index 58%
rename from netbox/dcim/migrations/0078_rack_type_to_slug.py
rename to netbox/dcim/migrations/0079_3569_rack_fields.py
index 2ebcd7168..137cd6fe5 100644
--- a/netbox/dcim/migrations/0078_rack_type_to_slug.py
+++ b/netbox/dcim/migrations/0079_3569_rack_fields.py
@@ -8,6 +8,14 @@ RACK_TYPE_CHOICES = (
     (1100, 'wall-cabinet'),
 )
 
+RACK_STATUS_CHOICES = (
+    (0, 'reserved'),
+    (1, 'available'),
+    (2, 'planned'),
+    (3, 'active'),
+    (4, 'deprecated'),
+)
+
 
 def rack_type_to_slug(apps, schema_editor):
     Rack = apps.get_model('dcim', 'Rack')
@@ -15,14 +23,22 @@ def rack_type_to_slug(apps, schema_editor):
         Rack.objects.filter(type=str(id)).update(type=slug)
 
 
+def rack_status_to_slug(apps, schema_editor):
+    Rack = apps.get_model('dcim', 'Rack')
+    for id, slug in RACK_STATUS_CHOICES:
+        Rack.objects.filter(status=str(id)).update(status=slug)
+
+
 class Migration(migrations.Migration):
     atomic = False
 
     dependencies = [
-        ('dcim', '0077_power_types'),
+        ('dcim', '0078_3569_site_fields'),
     ]
 
     operations = [
+
+        # Rack.type
         migrations.AlterField(
             model_name='rack',
             name='type',
@@ -36,4 +52,14 @@ class Migration(migrations.Migration):
             name='type',
             field=models.CharField(blank=True, max_length=50),
         ),
+
+        # Rack.status
+        migrations.AlterField(
+            model_name='rack',
+            name='status',
+            field=models.CharField(default='active', max_length=50),
+        ),
+        migrations.RunPython(
+            code=rack_status_to_slug
+        ),
     ]
diff --git a/netbox/dcim/migrations/0079_rack_status_to_slug.py b/netbox/dcim/migrations/0079_rack_status_to_slug.py
deleted file mode 100644
index 76890d796..000000000
--- a/netbox/dcim/migrations/0079_rack_status_to_slug.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from django.db import migrations, models
-
-RACK_STATUS_CHOICES = (
-    (0, 'reserved'),
-    (1, 'available'),
-    (2, 'planned'),
-    (3, 'active'),
-    (4, 'deprecated'),
-)
-
-
-def rack_status_to_slug(apps, schema_editor):
-    Rack = apps.get_model('dcim', 'Rack')
-    for id, slug in RACK_STATUS_CHOICES:
-        Rack.objects.filter(status=str(id)).update(status=slug)
-
-
-class Migration(migrations.Migration):
-    atomic = False
-
-    dependencies = [
-        ('dcim', '0078_rack_type_to_slug'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='rack',
-            name='status',
-            field=models.CharField(default='active', max_length=50),
-        ),
-        migrations.RunPython(
-            code=rack_status_to_slug
-        ),
-    ]
diff --git a/netbox/dcim/migrations/0081_devicetype_subdevicerole_to_slug.py b/netbox/dcim/migrations/0080_3569_devicetype_fields.py
similarity index 95%
rename from netbox/dcim/migrations/0081_devicetype_subdevicerole_to_slug.py
rename to netbox/dcim/migrations/0080_3569_devicetype_fields.py
index 2497f1702..afd4dd82b 100644
--- a/netbox/dcim/migrations/0081_devicetype_subdevicerole_to_slug.py
+++ b/netbox/dcim/migrations/0080_3569_devicetype_fields.py
@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
     atomic = False
 
     dependencies = [
-        ('dcim', '0080_device_face_to_slug'),
+        ('dcim', '0079_3569_rack_fields'),
     ]
 
     operations = [
diff --git a/netbox/dcim/migrations/0080_device_face_to_slug.py b/netbox/dcim/migrations/0081_3569_device_fields.py
similarity index 94%
rename from netbox/dcim/migrations/0080_device_face_to_slug.py
rename to netbox/dcim/migrations/0081_3569_device_fields.py
index 4fe214770..fc1e9285a 100644
--- a/netbox/dcim/migrations/0080_device_face_to_slug.py
+++ b/netbox/dcim/migrations/0081_3569_device_fields.py
@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
     atomic = False
 
     dependencies = [
-        ('dcim', '0079_rack_status_to_slug'),
+        ('dcim', '0080_3569_devicetype_fields'),
     ]
 
     operations = [
diff --git a/netbox/dcim/migrations/0082_interface_type_to_slug.py b/netbox/dcim/migrations/0082_3569_interface_fields.py
similarity index 98%
rename from netbox/dcim/migrations/0082_interface_type_to_slug.py
rename to netbox/dcim/migrations/0082_3569_interface_fields.py
index 50885d461..d325844fe 100644
--- a/netbox/dcim/migrations/0082_interface_type_to_slug.py
+++ b/netbox/dcim/migrations/0082_3569_interface_fields.py
@@ -91,7 +91,7 @@ class Migration(migrations.Migration):
     atomic = False
 
     dependencies = [
-        ('dcim', '0081_devicetype_subdevicerole_to_slug'),
+        ('dcim', '0081_3569_device_fields'),
     ]
 
     operations = [