From 40938f0c8a657825ce37758c8b5785b961218131 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 16:13:18 -0400
Subject: [PATCH] Retain ip_addresses name for related IPAddress objects

---
 netbox/dcim/api/views.py                | 2 +-
 netbox/dcim/models/device_components.py | 2 +-
 netbox/dcim/views.py                    | 2 +-
 netbox/ipam/models.py                   | 2 +-
 netbox/virtualization/models.py         | 2 +-
 netbox/virtualization/views.py          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 24f553f0e..324edcb49 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -484,7 +484,7 @@ class PowerOutletViewSet(CableTraceMixin, ModelViewSet):
 
 class InterfaceViewSet(CableTraceMixin, ModelViewSet):
     queryset = Interface.objects.prefetch_related(
-        'device', '_connected_interface', '_connected_circuittermination', 'cable', 'ipaddresses', 'tags'
+        'device', '_connected_interface', '_connected_circuittermination', 'cable', 'ip_addresses', 'tags'
     ).filter(
         device__isnull=False
     )
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 8f945622a..8724994f5 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -686,7 +686,7 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
         blank=True,
         verbose_name='Tagged VLANs'
     )
-    ipaddresses = GenericRelation(
+    ip_addresses = GenericRelation(
         to='ipam.IPAddress',
         content_type_field='assigned_object_type',
         object_id_field='assigned_object_id'
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 9b19734e6..6aad18bd3 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1442,7 +1442,7 @@ class InterfaceView(ObjectView):
 
         # Get assigned IP addresses
         ipaddress_table = InterfaceIPAddressTable(
-            data=interface.ipaddresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
+            data=interface.ip_addresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
             orderable=False
         )
 
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index 11eddb07a..c7baba435 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -2,7 +2,7 @@ import netaddr
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ValidationError, ObjectDoesNotExist
+from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models import F
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 8d4d5d889..de6073b4f 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -405,7 +405,7 @@ class Interface(BaseInterface):
         blank=True,
         verbose_name='Tagged VLANs'
     )
-    ipaddresses = GenericRelation(
+    ip_addresses = GenericRelation(
         to='ipam.IPAddress',
         content_type_field='assigned_object_type',
         object_id_field='assigned_object_id'
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 65fdddd85..4b37b5a66 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -306,7 +306,7 @@ class InterfaceView(ObjectView):
 
         # Get assigned IP addresses
         ipaddress_table = InterfaceIPAddressTable(
-            data=interface.ipaddresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
+            data=interface.ip_addresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
             orderable=False
         )