From a000ded3506b3f98a61e81ece773bdf74e0d5f26 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 17 Nov 2021 12:50:46 -0500
Subject: [PATCH] Remove "primary for" references to Device on IPAddress

---
 .../0143_remove_primary_for_related_name.py   | 23 +++++++++++++++++++
 netbox/dcim/models/devices.py                 |  4 ++--
 netbox/ipam/views.py                          |  8 ++-----
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 netbox/dcim/migrations/0143_remove_primary_for_related_name.py

diff --git a/netbox/dcim/migrations/0143_remove_primary_for_related_name.py b/netbox/dcim/migrations/0143_remove_primary_for_related_name.py
new file mode 100644
index 000000000..820c9e3fe
--- /dev/null
+++ b/netbox/dcim/migrations/0143_remove_primary_for_related_name.py
@@ -0,0 +1,23 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ipam', '0053_asn_model'),
+        ('dcim', '0142_rename_128gfc_qsfp28'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='device',
+            name='primary_ip4',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ipam.ipaddress'),
+        ),
+        migrations.AlterField(
+            model_name='device',
+            name='primary_ip6',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ipam.ipaddress'),
+        ),
+    ]
diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py
index 7039f6cdd..630f8606e 100644
--- a/netbox/dcim/models/devices.py
+++ b/netbox/dcim/models/devices.py
@@ -540,7 +540,7 @@ class Device(PrimaryModel, ConfigContextModel):
     primary_ip4 = models.OneToOneField(
         to='ipam.IPAddress',
         on_delete=models.SET_NULL,
-        related_name='primary_ip4_for',
+        related_name='+',
         blank=True,
         null=True,
         verbose_name='Primary IPv4'
@@ -548,7 +548,7 @@ class Device(PrimaryModel, ConfigContextModel):
     primary_ip6 = models.OneToOneField(
         to='ipam.IPAddress',
         on_delete=models.SET_NULL,
-        related_name='primary_ip6_for',
+        related_name='+',
         blank=True,
         null=True,
         verbose_name='Primary IPv6'
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 21f0857b3..c172caf0b 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -523,9 +523,7 @@ class PrefixIPAddressesView(generic.ObjectView):
 
     def get_extra_context(self, request, instance):
         # Find all IPAddresses belonging to this Prefix
-        ipaddresses = instance.get_child_ips().restrict(request.user, 'view').prefetch_related(
-            'vrf', 'primary_ip4_for', 'primary_ip6_for'
-        )
+        ipaddresses = instance.get_child_ips().restrict(request.user, 'view').prefetch_related('vrf')
 
         # Add available IP addresses to the table if requested
         if request.GET.get('show_available', 'true') == 'true':
@@ -604,9 +602,7 @@ class IPRangeIPAddressesView(generic.ObjectView):
 
     def get_extra_context(self, request, instance):
         # Find all IPAddresses within this range
-        ipaddresses = instance.get_child_ips().restrict(request.user, 'view').prefetch_related(
-            'vrf', 'primary_ip4_for', 'primary_ip6_for'
-        )
+        ipaddresses = instance.get_child_ips().restrict(request.user, 'view').prefetch_related('vrf')
 
         # Add available IP addresses to the table if requested
         # if request.GET.get('show_available', 'true') == 'true':