rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-27 17:33:45 +00:00
Code Issues Releases Wiki Activity

Merge branch 'machine_on_type_vlan' into 'dev'

Browse source 
Placement des machines sur un vlan en fonction de leur classe type

See merge request federez/re2o!211
This commit is contained in:
chirac 2018-08-03 20:36:48 +02:00
commit a1c35832aa
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
freeradius_utils/auth.py
View file

@ -63,6 +63,7 @@ from preferences.models import OptionalTopologie
options, created = OptionalTopologie.objects.get_or_create() options, created = OptionalTopologie.objects.get_or_create()
VLAN_NOK = options.vlan_decision_nok.vlan_id VLAN_NOK = options.vlan_decision_nok.vlan_id
VLAN_OK = options.vlan_decision_ok.vlan_id VLAN_OK = options.vlan_decision_ok.vlan_id
RADIUS_POLICY = options.radius_general_policy
#: Serveur radius de test (pas la prod) #: Serveur radius de test (pas la prod)
TEST_SERVER = bool(os.getenv('DBG_FREERADIUS', False)) TEST_SERVER = bool(os.getenv('DBG_FREERADIUS', False))
@ -460,13 +461,16 @@ def decide_vlan_and_register_switch(nas_machine, nas_type, port_number,
VLAN_NOK) VLAN_NOK)
# Sinon on capture et on laisse passer sur le bon vlan # Sinon on capture et on laisse passer sur le bon vlan
else: else:
result, reason = (room_user interface, reason = (room_user
.first() .first()
.autoregister_machine( .autoregister_machine(
mac_address, mac_address,
nas_type nas_type
)) ))
if result: if interface:
## Si on choisi de placer les machines sur le vlan correspondant à leur type :
if RADIUS_POLICY == 'MACHINE':
DECISION_VLAN = interface.type.ip_type.vlan.vlan_id
return (sw_name, return (sw_name,
room, room,
u'Access Ok, Capture de la mac: ' + extra_log, u'Access Ok, Capture de la mac: ' + extra_log,
@ -488,7 +492,10 @@ def decide_vlan_and_register_switch(nas_machine, nas_type, port_number,
room, room,
u'Machine non active / adherent non cotisant', u'Machine non active / adherent non cotisant',
VLAN_NOK) VLAN_NOK)
elif not interface.ipv4: ## Si on choisi de placer les machines sur le vlan correspondant à leur type :
if RADIUS_POLICY == 'MACHINE':
DECISION_VLAN = interface.type.ip_type.vlan.vlan_id
if not interface.ipv4:
interface.assign_ipv4() interface.assign_ipv4()
return (sw_name, return (sw_name,
room, room,