From 8cb2b8b87a3757a230d052ec9225335fb8949ef0 Mon Sep 17 00:00:00 2001
From: Jason Novinger <jnovinger@gmail.com>
Date: Mon, 7 Apr 2025 14:58:50 -0500
Subject: [PATCH] Address PR feedback, clean up migrations

---
 ...0078_add_service_fhrp_group_parent_gfk.py} |  0
 .../0079_populate_service_parent.py           |  2 +-
 ...e_device_remove_service_virtual_machine.py | 19 -------------------
 ...e_virtual_machine_add_parent_gfk_index.py} | 10 +++++++++-
 4 files changed, 10 insertions(+), 21 deletions(-)
 rename netbox/ipam/migrations/{0078_service_parent_object_id_service_parent_object_type.py => 0078_add_service_fhrp_group_parent_gfk.py} (100%)
 delete mode 100644 netbox/ipam/migrations/0080_remove_service_device_remove_service_virtual_machine.py
 rename netbox/ipam/migrations/{0081_service_ipam_servic_parent__563d2b_idx.py => 0080_remove_service_device_virtual_machine_add_parent_gfk_index.py} (63%)

diff --git a/netbox/ipam/migrations/0078_service_parent_object_id_service_parent_object_type.py b/netbox/ipam/migrations/0078_add_service_fhrp_group_parent_gfk.py
similarity index 100%
rename from netbox/ipam/migrations/0078_service_parent_object_id_service_parent_object_type.py
rename to netbox/ipam/migrations/0078_add_service_fhrp_group_parent_gfk.py
diff --git a/netbox/ipam/migrations/0079_populate_service_parent.py b/netbox/ipam/migrations/0079_populate_service_parent.py
index eb91aa444..8eca438a6 100644
--- a/netbox/ipam/migrations/0079_populate_service_parent.py
+++ b/netbox/ipam/migrations/0079_populate_service_parent.py
@@ -42,7 +42,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('dcim', '0202_location_comments_region_comments_sitegroup_comments'),
-        ('ipam', '0078_service_parent_object_id_service_parent_object_type'),
+        ('ipam', '0078_add_service_fhrp_group_parent_gfk'),
         ('virtualization', '0048_populate_mac_addresses'),
     ]
 
diff --git a/netbox/ipam/migrations/0080_remove_service_device_remove_service_virtual_machine.py b/netbox/ipam/migrations/0080_remove_service_device_remove_service_virtual_machine.py
deleted file mode 100644
index 83bff5751..000000000
--- a/netbox/ipam/migrations/0080_remove_service_device_remove_service_virtual_machine.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('ipam', '0079_populate_service_parent'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='service',
-            name='device',
-        ),
-        migrations.RemoveField(
-            model_name='service',
-            name='virtual_machine',
-        ),
-    ]
diff --git a/netbox/ipam/migrations/0081_service_ipam_servic_parent__563d2b_idx.py b/netbox/ipam/migrations/0080_remove_service_device_virtual_machine_add_parent_gfk_index.py
similarity index 63%
rename from netbox/ipam/migrations/0081_service_ipam_servic_parent__563d2b_idx.py
rename to netbox/ipam/migrations/0080_remove_service_device_virtual_machine_add_parent_gfk_index.py
index 125e5aaca..a0d049d61 100644
--- a/netbox/ipam/migrations/0081_service_ipam_servic_parent__563d2b_idx.py
+++ b/netbox/ipam/migrations/0080_remove_service_device_virtual_machine_add_parent_gfk_index.py
@@ -6,10 +6,18 @@ class Migration(migrations.Migration):
     dependencies = [
         ('contenttypes', '0002_remove_content_type_name'),
         ('extras', '0125_exporttemplate_file_name'),
-        ('ipam', '0080_remove_service_device_remove_service_virtual_machine'),
+        ('ipam', '0079_populate_service_parent'),
     ]
 
     operations = [
+        migrations.RemoveField(
+            model_name='service',
+            name='device',
+        ),
+        migrations.RemoveField(
+            model_name='service',
+            name='virtual_machine',
+        ),
         migrations.AddIndex(
             model_name='service',
             index=models.Index(