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

Set related_query_name for GenericRelations to IPAddress

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

7
netbox/virtualization/forms.py
View File

@ -1,5 +1,4 @@
from django import forms
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ValidationError
from dcim.choices import InterfaceModeChoices
@ -358,8 +357,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
# Collect interface IPs
interface_ips = IPAddress.objects.prefetch_related('interface').filter(
address__family=family,
assigned_object_type=ContentType.objects.get_for_model(Interface),
assigned_object_id__in=self.instance.interfaces.values_list('id', flat=True)
vm_interface__in=self.instance.interfaces.values_list('id', flat=True)
)
if interface_ips:
ip_choices.append(
@ -370,8 +368,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
# Collect NAT IPs
nat_ips = IPAddress.objects.prefetch_related('nat_inside').filter(
address__family=family,
nat_inside__assigned_object_type=ContentType.objects.get_for_model(Interface),
nat_inside__assigned_object_id__in=self.instance.interfaces.values_list('id', flat=True)
nat_inside__vm_interface__in=self.instance.interfaces.values_list('id', flat=True)
)
if nat_ips:
ip_choices.append(