From bf3b7bc6f556daed6459be1edbe29d69a2a1da52 Mon Sep 17 00:00:00 2001
From: Jeremie Dimino <dimino@crans.org>
Date: Thu, 4 Sep 2008 18:47:57 +0200
Subject: [PATCH] =?UTF-8?q?correction=20d'erreurs=20dans=20la=20g=C3=A9ene?=
 =?UTF-8?q?ration=20de=20la=20conf=20des=20switchs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

darcs-hash:20080904164757-af139-be22d2b1d0c58e00292befedea1fe93ed0814e2a.gz
---
 gestion/gen_confs/switchs.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gestion/gen_confs/switchs.py b/gestion/gen_confs/switchs.py
index 13903409..d5639181 100755
--- a/gestion/gen_confs/switchs.py
+++ b/gestion/gen_confs/switchs.py
@@ -30,7 +30,7 @@ from annuaires import bat_switchs
 class switch(gen_config) :
     # Répertoire ou écire les fichiers de conf
     CONF_REP='/tmp/' # avec un / derrière
-    
+
     config = """; %(modele)s Configuration Editor; Created on release #H.08.86
 
 hostname "%(switch)s" 
@@ -54,8 +54,6 @@ sntp unicast
 console inactivity-timer 30
 ;-------------------------------------------------------- Logs
 logging 10.231.136.7
-;-------------------------------------------------------- Logs
-%(INTERFACES_CONF)s
 ;-------------------------------------------------------- IP du switch
 ip default-gateway 10.231.136.4
 vlan %(vlan_adherent)s
@@ -90,6 +88,8 @@ vlan %(vlan_accueil)s
    tagged %(prises_default)s
    no ip address
    exit
+;-------------------------------------------------------- Logs
+%(INTERFACES_CONF)s
 ;------------------------------------------------------- Accès d'administration
 no telnet-server
 no web-management
@@ -122,7 +122,8 @@ no cdp run
 no stack
 """
 
-    interface_template = """interface %(prise)i enable
+    interface_template = """interface %(prise)i
+   enable
    name "%(nom)s"
    flow-control%(speed)s
    no lacp
@@ -436,7 +437,9 @@ aaa port-access mac-based %(prise)s unauth-vid 7
             # Saut de ligne parasite
             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
 
         # Ecriture