Toutes les prises n'ont pas le droit au mme nombre de MAC
darcs-hash:20060202120724-d1718-7da0eec08a27d9b4a4912117c2f4343cf65f706c.gz
This commit is contained in:
parent
687d77459d
commit
274d45a1d3
1 changed files with 9 additions and 8 deletions
|
@ -106,9 +106,6 @@ radius-server dead-time 2
|
||||||
radius-server key %(radius_key)s
|
radius-server key %(radius_key)s
|
||||||
%(radius-serveurs)s
|
%(radius-serveurs)s
|
||||||
;------------------------------------------------------- Filtrage mac
|
;------------------------------------------------------- Filtrage mac
|
||||||
aaa port-access mac-based %(prises_filtrage_mac)s
|
|
||||||
aaa port-access mac-based %(prises_filtrage_mac)s addr-limit 3
|
|
||||||
aaa port-access mac-based %(prises_filtrage_mac)s logoff-period 3600
|
|
||||||
aaa port-access mac-based addr-format multi-colon
|
aaa port-access mac-based addr-format multi-colon
|
||||||
;------------------------------------------------------- Bricoles
|
;------------------------------------------------------- Bricoles
|
||||||
no cdp run
|
no cdp run
|
||||||
|
@ -274,8 +271,8 @@ exit
|
||||||
|
|
||||||
self.aff.iter = nb_prises+1
|
self.aff.iter = nb_prises+1
|
||||||
|
|
||||||
# Param-Aètres à affecter-b
|
# Paramètres à affecter
|
||||||
for key in ( 'uplinks', 'non_uplinks', 'prises_filtrage_mac' ) :
|
for key in ( 'uplinks', 'non_uplinks' ) :
|
||||||
params[key] = []
|
params[key] = []
|
||||||
|
|
||||||
vlans = { 'wifi_tagged' : [] , 'wifi_untagged' : [] ,
|
vlans = { 'wifi_tagged' : [] , 'wifi_untagged' : [] ,
|
||||||
|
@ -288,7 +285,8 @@ exit
|
||||||
self.aff.cycle()
|
self.aff.cycle()
|
||||||
|
|
||||||
# Conf par défaut : activée, autonégociation
|
# Conf par défaut : activée, autonégociation
|
||||||
prise_params = { 'prise' : prise , 'speed' : '', 'etat' : '' }
|
prise_params = { 'prise' : prise , 'speed' : '',
|
||||||
|
'etat' : '' }
|
||||||
annu_prise = '%i%02i' % (sw_num, prise) # prise telle que notée dans l'annuaire
|
annu_prise = '%i%02i' % (sw_num, prise) # prise telle que notée dans l'annuaire
|
||||||
|
|
||||||
if uplink_prises[bat].has_key(int(annu_prise)) :
|
if uplink_prises[bat].has_key(int(annu_prise)) :
|
||||||
|
@ -362,7 +360,10 @@ exit
|
||||||
params['INTERFACES_CONF'] += self.interface_template % prise_params
|
params['INTERFACES_CONF'] += self.interface_template % prise_params
|
||||||
continue
|
continue
|
||||||
|
|
||||||
params['prises_filtrage_mac'].append(prise)
|
params['INTERFACES_CONF'] += """aaa port-access mac-based %(prise)s
|
||||||
|
aaa port-access mac-based %(prise)s addr-limit %(nbmac)s
|
||||||
|
aaa port-access mac-based %(prise)s logoff-period 3600
|
||||||
|
""" % { 'nbmac': 1+2*len(chbres), 'prise': prise }
|
||||||
|
|
||||||
## Configuration de la prise adhérent
|
## Configuration de la prise adhérent
|
||||||
# Nom
|
# Nom
|
||||||
|
@ -420,7 +421,7 @@ exit
|
||||||
params['INTERFACES_CONF'] = params['INTERFACES_CONF'][:-1].encode('iso-8859-15')
|
params['INTERFACES_CONF'] = params['INTERFACES_CONF'][:-1].encode('iso-8859-15')
|
||||||
|
|
||||||
# Conversion des listes
|
# Conversion des listes
|
||||||
for key in [ 'prises_filtrage_mac', 'uplinks', 'non_uplinks' ] :
|
for key in [ 'uplinks', 'non_uplinks' ] :
|
||||||
params[key] = mk_list(params[key])
|
params[key] = mk_list(params[key])
|
||||||
for key, prises in vlans.items() :
|
for key, prises in vlans.items() :
|
||||||
vlans[key]=mk_list(prises)
|
vlans[key]=mk_list(prises)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue