correction d'erreurs dans la géeneration de la conf des switchs

la conf des interfaces doit maintenant se trouver après la definition
des vlans

darcs-hash:20080904164757-af139-be22d2b1d0c58e00292befedea1fe93ed0814e2a.gz
This commit is contained in:
Jeremie Dimino 2008-09-04 18:47:57 +02:00
parent 4fd3644f97
commit bf3b7bc6f5

View file

@ -30,7 +30,7 @@ from annuaires import bat_switchs
class switch(gen_config) : class switch(gen_config) :
# Répertoire ou écire les fichiers de conf # Répertoire ou écire les fichiers de conf
CONF_REP='/tmp/' # avec un / derrière CONF_REP='/tmp/' # avec un / derrière
config = """; %(modele)s Configuration Editor; Created on release #H.08.86 config = """; %(modele)s Configuration Editor; Created on release #H.08.86
hostname "%(switch)s" hostname "%(switch)s"
@ -54,8 +54,6 @@ sntp unicast
console inactivity-timer 30 console inactivity-timer 30
;-------------------------------------------------------- Logs ;-------------------------------------------------------- Logs
logging 10.231.136.7 logging 10.231.136.7
;-------------------------------------------------------- Logs
%(INTERFACES_CONF)s
;-------------------------------------------------------- IP du switch ;-------------------------------------------------------- IP du switch
ip default-gateway 10.231.136.4 ip default-gateway 10.231.136.4
vlan %(vlan_adherent)s vlan %(vlan_adherent)s
@ -90,6 +88,8 @@ vlan %(vlan_accueil)s
tagged %(prises_default)s tagged %(prises_default)s
no ip address no ip address
exit exit
;-------------------------------------------------------- Logs
%(INTERFACES_CONF)s
;------------------------------------------------------- Accès d'administration ;------------------------------------------------------- Accès d'administration
no telnet-server no telnet-server
no web-management no web-management
@ -122,7 +122,8 @@ no cdp run
no stack no stack
""" """
interface_template = """interface %(prise)i enable interface_template = """interface %(prise)i
enable
name "%(nom)s" name "%(nom)s"
flow-control%(speed)s flow-control%(speed)s
no lacp no lacp
@ -436,7 +437,9 @@ aaa port-access mac-based %(prise)s unauth-vid 7
# Saut de ligne parasite # Saut de ligne parasite
params['prises_%s' % v] = params['prises_%s' % v][4:] params['prises_%s' % v] = params['prises_%s' % v][4:]
for name, number in config.vlans: params['prises_default'] = vlans['default']
for name, number in config.vlans.items():
params["vlan_%s" % name] = number params["vlan_%s" % name] = number
# Ecriture # Ecriture