From c82deb92994e22953ca15096ea358f9efab07a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?=
 <Pierre-Elliott.Becue@crans.org>
Date: Thu, 9 Aug 2012 18:02:06 +0200
Subject: [PATCH] =?UTF-8?q?[Random]=20Liste=20des=20prises=20backbone=20?=
 =?UTF-8?q?=C3=A0=20jour,=20+=20modif=20de=20generate.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ignore-this: 14a268b749263623ad6c627776cd0711

darcs-hash:20120809160206-b6762-ef9f4ef53feb736251671becf48c7744c802fc51.gz
---
 gestion/annuaires_pg.py       | 14 +++++++-------
 gestion/gen_confs/generate.py | 12 ++++--------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/gestion/annuaires_pg.py b/gestion/annuaires_pg.py
index 66fcfc0e..3305fda6 100755
--- a/gestion/annuaires_pg.py
+++ b/gestion/annuaires_pg.py
@@ -201,23 +201,23 @@ uplink_prises={ 'a' :
 'backbone' : #For your consideration
  {
  #A: 12eth+12fibre,  B: 24 eth
- 'A1': 'zamok',     'B1': 'bata',
+                    'B1': 'bata',
  'A2': 'komaz-ens', 'B2': 'multiprise-wifi',
- 'A3': 'sable',     'B3': 'monit',
+ 'A3': 'sable',     'B3': 'dyson',
  'A4': 'komaz',     'B4': 'fy',
                     'B5': 'switch-ilo',
                     'B6': 'vigile 0B',
-                    'B7': 'rouge',
+                    'B7': 'daath',
                     'B8': 'batb',
                     'B9': '2b',
                     'B10': 'fz',
                     'B11': 'gordon',
-                    'B12': 'ragnarok',
+                    'B12': 'nols2',
  'A13': 'batm',     'B13': 'osm',
- 'A14': 'batp',     'B14': 'fx',
+ 'A14': 'batp',     'B14': 'zamok',
  'A15': 'batc',     'B15': 'charybde',
- 'A16': 'bato',     'B16': 'dyson',
- 'A17': 'bath',
+ 'A16': 'bato',
+ 'A17': 'bath',     'B18': 'nols',
  'A18': 'bati',
  'A19': 'batj',
  'A20': 'batg',
diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py
index 52b1022a..a643a2dd 100644
--- a/gestion/gen_confs/generate.py
+++ b/gestion/gen_confs/generate.py
@@ -165,14 +165,6 @@ class redisdead(base_reconfigure):
         from gen_confs.supervison import mail_solde
         self._do(mail_solde(modifs))
 
-class rouge(base_reconfigure):
-    def autostatus(self):
-        from autostatus import autostatus
-        self._do(autostatus())
-
-#    def dhcp(self):
-#        from gen_confs.dhcpd import dhcp
-#        self._do(dhcp(), self._machines())
 
 class owl(base_reconfigure):
     def del_user(self, args):
@@ -246,6 +238,10 @@ class komaz(base_reconfigure):
         self.__fw().classes_p2p_maj(ips)
 
 class dyson(base_reconfigure):
+    def autostatus(self):
+        from autostatus import autostatus
+        self._do(autostatus())
+
     def dhcp(self):
         from gen_confs.dhcpd_new import dhcp
         self._do(dhcp(), self._machines())