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

Optimize API serializer logic

Browse Source
This commit is contained in:
Daniel Sheppard 2025-02-25 08:19:14 -06:00
parent 2c08258d9a
commit 41e6a55ec0
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,6 +239,7 @@ class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect
mode = None mode = None
tagged_vlans = [] tagged_vlans = []
# Gather Information
if self.instance: if self.instance:
mode = data.get('mode') if 'mode' in data.keys() else self.instance.mode mode = data.get('mode') if 'mode' in data.keys() else self.instance.mode
untagged_vlan = data.get('untagged_vlan') if 'untagged_vlan' in data.keys() else \ untagged_vlan = data.get('untagged_vlan') if 'untagged_vlan' in data.keys() else \
@ -253,39 +254,33 @@ class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect
qinq_svlan = data.get('qinq_svlan') if 'qinq_svlan' in data.keys() else None qinq_svlan = data.get('qinq_svlan') if 'qinq_svlan' in data.keys() else None
tagged_vlans = data.get('tagged_vlans') if 'tagged_vlans' in data.keys() else None tagged_vlans = data.get('tagged_vlans') if 'tagged_vlans' in data.keys() else None
errors = {}
# Non Q-in-Q mode with service vlan set
if mode != InterfaceModeChoices.MODE_Q_IN_Q and qinq_svlan:
errors.update({
'qinq_svlan': _("Interface mode does not support q-in-q service vlan")
})
# Routed mode
if not mode: if not mode:
if untagged_vlan and tagged_vlans and qinq_svlan: # Untagged vlan
raise serializers.ValidationError({ if untagged_vlan:
'untagged_vlan': _("Interface mode does not support untagged vlan"), errors.update({
'qinq_svlan': _("Interface mode does not support q-in-q service vlan"),
'tagged_vlans': _("Interface mode does not support tagged vlans")
})
elif untagged_vlan and tagged_vlans:
raise serializers.ValidationError({
'untagged_vlan': _("Interface mode does not support untagged vlan"),
'qinq_svlan': _("Interface mode does not support q-in-q service vlan"),
'tagged_vlans': _("Interface mode does not support tagged vlans")
})
elif untagged_vlan:
raise serializers.ValidationError({
'untagged_vlan': _("Interface mode does not support untagged vlan") 'untagged_vlan': _("Interface mode does not support untagged vlan")
}) })
elif tagged_vlans: # Tagged vlan
raise serializers.ValidationError({ if tagged_vlans:
errors.update({
'tagged_vlans': _("Interface mode does not support tagged vlans") 'tagged_vlans': _("Interface mode does not support tagged vlans")
}) })
elif qinq_svlan: # Non-tagged mode
raise serializers.ValidationError({
'qinq_svlan': _("Interface mode does not support q-in-q service vlan")
})
elif mode in (InterfaceModeChoices.MODE_TAGGED_ALL, InterfaceModeChoices.MODE_ACCESS) and tagged_vlans: elif mode in (InterfaceModeChoices.MODE_TAGGED_ALL, InterfaceModeChoices.MODE_ACCESS) and tagged_vlans:
raise serializers.ValidationError({ errors.update({
'tagged_vlans': _("Interface mode does not support tagged vlans") 'tagged_vlans': _("Interface mode does not support tagged vlans")
}) })
elif mode != InterfaceModeChoices.MODE_Q_IN_Q and qinq_svlan:
raise serializers.ValidationError({ if errors:
'qinq_svlan': _("Interface mode does not support q-in-q service vlan") raise serializers.ValidationError(errors)
})
# Validate many-to-many VLAN assignments # Validate many-to-many VLAN assignments
device = self.instance.device if self.instance else data.get('device') device = self.instance.device if self.instance else data.get('device')