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

Rename 'vm_interface' to 'vminterface'; misc cleanup

Browse Source
This commit is contained in:
Jeremy Stretch
2020-06-24 09:27:30 -04:00
parent d6386f739e
commit 6663844a86
7 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/virtualization/forms.py
View File

@ -3,7 +3,7 @@ from django.core.exceptions import ValidationError
from dcim.choices import InterfaceModeChoices
from dcim.constants import INTERFACE_MTU_MAX, INTERFACE_MTU_MIN
from dcim.forms import INTERFACE_MODE_HELP_TEXT, InterfaceCommonForm
from dcim.forms import INTERFACE_MODE_HELP_TEXT
from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site
from extras.forms import (
AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, CustomFieldFilterForm,
@ -357,7 +357,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
# Collect interface IPs
interface_ips = IPAddress.objects.prefetch_related('interface').filter(
address__family=family,
vm_interface__in=self.instance.interfaces.values_list('id', flat=True)
vminterface__in=self.instance.interfaces.values_list('id', flat=True)
)
if interface_ips:
ip_choices.append(
@ -368,7 +368,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
# Collect NAT IPs
nat_ips = IPAddress.objects.prefetch_related('nat_inside').filter(
address__family=family,
nat_inside__vm_interface__in=self.instance.interfaces.values_list('id', flat=True)
nat_inside__vminterface__in=self.instance.interfaces.values_list('id', flat=True)
)
if nat_ips:
ip_choices.append(