NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-29 11:56:25 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Re-ordering statements in validators

Browse Source
This commit is contained in:
Daniel Sheppard 2024-08-27 00:28:39 -05:00
parent 9a13caae7a
commit 07444e6f1a
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
netbox/dcim/api/serializers_/device_components.py
View File

@ -243,22 +243,22 @@ class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect
mode = None
tagged_vlans = []
if self.instance.pk and 'mode' in data.keys():
mode = data.get('mode') if 'mode' in data.keys() else self.instance.get('mode')
elif 'mode' in data.keys():
mode = data.get('mode')
if self.instance.pk and 'tagged_vlans' in data.keys():
tagged_vlans = data.get('tagged_vlans') if 'tagged_vlans' in data.keys() else \
self.instance.tagged_vlans.all()
elif 'tagged_vlans' in data.keys():
tagged_vlans = data.get('tagged_vlans')
if self.instance.pk and 'untagged_vlan' in data.keys():
untagged_vlan = data.get('untagged_vlan') if 'untagged_vlan' in data.keys() else \
self.instance.untagged_vlan
elif 'untagged_vlan' in data.keys():
untagged_vlan = data.get('untagged_vlan')
if self.instance:
if 'mode' in data.keys():
mode = data.get('mode') if 'mode' in data.keys() else self.instance.get('mode')
if 'tagged_vlans' in data.keys():
tagged_vlans = data.get('tagged_vlans') if 'tagged_vlans' in data.keys() else \
self.instance.tagged_vlans.all()
if 'untagged_vlan' in data.keys():
untagged_vlan = data.get('untagged_vlan') if 'untagged_vlan' in data.keys() else \
self.instance.untagged_vlan
else:
if 'mode' in data.keys():
mode = data.get('mode')
if 'tagged_vlans' in data.keys():
tagged_vlans = data.get('tagged_vlans')
if 'untagged_vlan' in data.keys():
untagged_vlan = data.get('untagged_vlan')
if mode != InterfaceModeChoices.MODE_TAGGED and tagged_vlans:
raise serializers.ValidationError({

33
netbox/dcim/forms/model_forms.py
View File

@ -1368,22 +1368,23 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
tagged_vlans = []
untagged_vlan = None
if self.instance.pk and 'mode' in self.cleaned_data.keys():
mode = self.cleaned_data.get('mode') if 'mode' in self.cleaned_data.keys() else self.instance.get('mode')
elif 'mode' in self.cleaned_data.keys():
mode = self.cleaned_data.get('mode')
if self.instance.pk and 'tagged_vlans' in self.cleaned_data.keys():
tagged_vlans = self.cleaned_data.get('tagged_vlans') if 'tagged_vlans' in self.cleaned_data.keys() else\
self.instance.tagged_vlans.all()
elif 'tagged_vlans' in self.cleaned_data.keys():
tagged_vlans = self.cleaned_data.get('tagged_vlans')
if self.instance.pk and 'untagged_vlan' in self.cleaned_data.keys():
untagged_vlan = self.cleaned_data.get('untagged_vlan') if 'untagged_vlan' in self.cleaned_data.keys() else\
self.instance.untagged_vlan
elif 'untagged_vlan' in self.cleaned_data.keys():
untagged_vlan = self.cleaned_data.get('untagged_vlan')
if self.instance:
if 'mode' in self.cleaned_data.keys():
mode = self.cleaned_data.get('mode') if 'mode' in self.cleaned_data.keys() else\
self.instance.get('mode')
if 'tagged_vlans' in self.cleaned_data.keys():
tagged_vlans = self.cleaned_data.get('tagged_vlans') if 'tagged_vlans' in self.cleaned_data.keys() else\
self.instance.tagged_vlans.all()
if 'untagged_vlan' in self.cleaned_data.keys():
untagged_vlan = self.cleaned_data.get('untagged_vlan') if 'untagged_vlan' in self.cleaned_data.keys()\
else self.instance.untagged_vlan
else:
if 'mode' in self.cleaned_data.keys():
mode = self.cleaned_data.get('mode')
if 'tagged_vlans' in self.cleaned_data.keys():
tagged_vlans = self.cleaned_data.get('tagged_vlans')
if 'untagged_vlan' in self.cleaned_data.keys():
untagged_vlan = self.cleaned_data.get('untagged_vlan')
if mode != InterfaceModeChoices.MODE_TAGGED and tagged_vlans:
raise forms.ValidationError({