starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-01 23:23:24 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Merge pull request #4178 from netbox-community/4081-drop-ip-family

Browse Source 
Closes #4081: Drop the family column from IP objects
This commit is contained in:
Jeremy Stretch
2020-02-14 15:42:19 -05:00
committed by GitHub
parent 8cb6aed8fa f0ced98dc6
commit f6cbce65fa
20 changed files with 264 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/dcim/forms.py
View File

@@ -1857,14 +1857,14 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
# Collect interface IPs
interface_ips = IPAddress.objects.prefetch_related('interface').filter(
family=family, interface_id__in=interface_ids
address__family=family, interface_id__in=interface_ids
)
if interface_ips:
ip_list = [(ip.id, '{} ({})'.format(ip.address, ip.interface)) for ip in interface_ips]
ip_choices.append(('Interface IPs', ip_list))
# Collect NAT IPs
nat_ips = IPAddress.objects.prefetch_related('nat_inside').filter(
family=family, nat_inside__interface__in=interface_ids
address__family=family, nat_inside__interface__in=interface_ids
)
if nat_ips:
ip_list = [(ip.id, '{} ({})'.format(ip.address, ip.nat_inside.address)) for ip in nat_ips]

4
netbox/dcim/tests/test_filters.py
View File

@@ -1144,8 +1144,8 @@ class DeviceTestCase(TestCase):
# Assign primary IPs for filtering
ipaddresses = (
IPAddress(family=4, address='192.0.2.1/24', interface=interfaces[0]),
IPAddress(family=4, address='192.0.2.2/24', interface=interfaces[1]),
IPAddress(address='192.0.2.1/24', interface=interfaces[0]),
IPAddress(address='192.0.2.2/24', interface=interfaces[1]),
)
IPAddress.objects.bulk_create(ipaddresses)
Device.objects.filter(pk=devices[0].pk).update(primary_ip4=ipaddresses[0])