mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Retain ip_addresses name for related IPAddress objects

Browse Source
This commit is contained in:
Jeremy Stretch
2020-06-22 16:13:18 -04:00
parent 490dee1fa0
commit 40938f0c8a
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/api/views.py
View File

@@ -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
)

2
netbox/dcim/models/device_components.py
View File

@@ -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'

2
netbox/dcim/views.py
View File

@@ -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
)