NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-24 08:25:17 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

11617 remove l2vpntermination fix

Browse Source
This commit is contained in:
Arthur 2023-08-17 08:06:07 -07:00
parent 7d048b38e8
commit fae151d164
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/ipam/forms/bulk_import.py
View File

@ -548,11 +548,9 @@ class L2VPNTerminationImportForm(NetBoxModelImportForm):
if self.cleaned_data.get('device') and self.cleaned_data.get('virtual_machine'): if self.cleaned_data.get('device') and self.cleaned_data.get('virtual_machine'):
raise ValidationError('Cannot import device and VM interface terminations simultaneously.') raise ValidationError('Cannot import device and VM interface terminations simultaneously.')
if not self.instance and not (self.cleaned_data.get('interface') or self.cleaned_data.get('vlan')): if not (self.cleaned_data.get('interface') or self.cleaned_data.get('vlan')):
raise ValidationError('Each termination must specify either an interface or a VLAN.') raise ValidationError('Each termination must specify either an interface or a VLAN.')
if self.cleaned_data.get('interface') and self.cleaned_data.get('vlan'): if self.cleaned_data.get('interface') and self.cleaned_data.get('vlan'):
raise ValidationError('Cannot assign both an interface and a VLAN.') raise ValidationError('Cannot assign both an interface and a VLAN.')
# if this is an update we might not have interface or vlan in the form data self.instance.assigned_object = self.cleaned_data.get('interface') or self.cleaned_data.get('vlan')
if self.cleaned_data.get('interface') or self.cleaned_data.get('vlan'):
self.instance.assigned_object = self.cleaned_data.get('interface') or self.cleaned_data.get('vlan')