NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-30 04:16:24 -06:00
Code Issues Actions 10 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 mode = None
tagged_vlans = [] tagged_vlans = []
if self.instance.pk and 'mode' in data.keys(): if self.instance:
mode = data.get('mode') if 'mode' in data.keys() else self.instance.get('mode') if 'mode' in data.keys():
elif 'mode' in data.keys(): mode = data.get('mode') if 'mode' in data.keys() else self.instance.get('mode')
mode = data.get('mode') if 'tagged_vlans' in data.keys():
tagged_vlans = data.get('tagged_vlans') if 'tagged_vlans' in data.keys() else \
if self.instance.pk and 'tagged_vlans' in data.keys(): self.instance.tagged_vlans.all()
tagged_vlans = data.get('tagged_vlans') if 'tagged_vlans' in data.keys() else \ if 'untagged_vlan' in data.keys():
self.instance.tagged_vlans.all() untagged_vlan = data.get('untagged_vlan') if 'untagged_vlan' in data.keys() else \
elif 'tagged_vlans' in data.keys(): self.instance.untagged_vlan
tagged_vlans = data.get('tagged_vlans') else:
if 'mode' in data.keys():
if self.instance.pk and 'untagged_vlan' in data.keys(): mode = data.get('mode')
untagged_vlan = data.get('untagged_vlan') if 'untagged_vlan' in data.keys() else \ if 'tagged_vlans' in data.keys():
self.instance.untagged_vlan tagged_vlans = data.get('tagged_vlans')
elif 'untagged_vlan' in data.keys(): if 'untagged_vlan' in data.keys():
untagged_vlan = data.get('untagged_vlan') untagged_vlan = data.get('untagged_vlan')
if mode != InterfaceModeChoices.MODE_TAGGED and tagged_vlans: if mode != InterfaceModeChoices.MODE_TAGGED and tagged_vlans:
raise serializers.ValidationError({ raise serializers.ValidationError({

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

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