mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-12-23 07:23:46 +00:00
FIx, on preprocess avant de faire la recherche : switch_id n'est pas forcément un switch...
This commit is contained in:
parent
56f391d7d8
commit
fce9f1b746
1 changed files with 7 additions and 3 deletions
|
@ -238,11 +238,15 @@ def detach(_=None):
|
|||
|
||||
def decide_vlan_and_register_macauth(switch_id, port_number, mac_address):
|
||||
# Get port from switch and port number
|
||||
ipv4 = IpList.objects.filter(ipv4=switch_id)
|
||||
switch = Switch.objects.filter(switch_interface=Interface.objects.filter(Q(ipv4=ipv4) | Q(domain=Domain.objects.filter(name=switch_id))))
|
||||
if not switch or not ipv4:
|
||||
if not isinstance(switch_id, int):
|
||||
switch = Switch.objects.filter(switch_interface=Interface.objects.filter(domain=Domain.objects.filter(name=switch_id)))
|
||||
else:
|
||||
switch = Switch.objects.filter(switch_interface=Interface.objects.filter(ipv4=switch_id))
|
||||
if not switch:
|
||||
return ('?', 'Switch inconnu', VLAN_OK)
|
||||
|
||||
ipv4 = switch.first().switch_interface.ipv4
|
||||
|
||||
sw_name = str(switch.first().switch_interface)
|
||||
|
||||
port = Port.objects.filter(switch=switch.first(), port=port_number)
|
||||
|
|
Loading…
Reference in a new issue