crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug pour clubs lors de la reconfiguration totale d'un switch

Browse source 
Liste des swtichs

darcs-hash:20040930224424-41617-e390d834ebf495064eb454fb9ac0c1d0c721d2bf.gz
This commit is contained in:
pauget 2004-10-01 00:44:24 +02:00
parent 5282b14f34
commit 843ec90b95
1 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
gestion/gen_confs/switchs.py
View file

@ -19,10 +19,11 @@ import string, sys, os, commands, smtplib
sys.path.append('/usr/scripts/gestion') sys.path.append('/usr/scripts/gestion')
from hptools import hpswitch, sw_chbre from hptools import hpswitch, sw_chbre
from ldap_crans import crans_ldap, ann_scol from ldap_crans import crans_ldap
from annuaires import chbre_prises, uplink_prises, reverse from annuaires import chbre_prises, uplink_prises, reverse
from gen_confs import * from gen_confs import *
from time import localtime from time import localtime
# Liste des switchs # Liste des switchs
bat_switchs = [ 'b', 'c' , 'h' , 'i' , 'g' , 'j' ] bat_switchs = [ 'b', 'c' , 'h' , 'i' , 'g' , 'j' ]
@ -133,7 +134,7 @@ exit
try : try :
bat = chbre[0].lower() bat = chbre[0].lower()
prise = sw_chbre(chbre) prise = sw_chbre(chbre)
a = self.db.search('chbre=%s&paiement=%i' % (chbre,ann_scol)) a = self.db.search('chbre=%s&paiement=ok' % chbre)
a = a['adherent'] + a['club'] a = a['adherent'] + a['club']
sujet = '' sujet = ''
if a and 'bloq' not in a[0].blacklist_actif() : if a and 'bloq' not in a[0].blacklist_actif() :
@ -282,16 +283,17 @@ exit
# Macs sur la prise # Macs sur la prise
nb = 0 nb = 0
adh = self.db.search('chbre=%s%s' % (bat.upper(), chbre) )['adherent'] res = self.db.search('chbre=%s%s' % (bat.upper(), chbre) )
res = res['adherent'] + res['club']
if nb>=3 : if nb>=3 :
warn += 'Trop de macs sur la prise %i\n' % prise warn += 'Trop de macs sur la prise %i\n' % prise
continue continue
if not adh : if not res :
continue continue
elif len(adh) == 1 : elif len(res) == 1 :
adh = adh[0] res = res[0]
if 'bloq' in adh.blacklist_actif() : continue if 'bloq' in res.blacklist_actif() : continue
for m in adh.machines() : for m in res.machines() :
macs += ' ' + m.mac().encode('iso-8859-15').replace(':','') macs += ' ' + m.mac().encode('iso-8859-15').replace(':','')
nb += 1 nb += 1
else : else :
@ -320,6 +322,15 @@ if __name__ == '__main__' :
print "Génération du fichier de configuration des switchs donnés." print "Génération du fichier de configuration des switchs donnés."
sys.exit(255) sys.exit(255)
sw = switch(tuple(sys.argv[1:])) if sys.argv[1] == 'all' :
switchs = ( 'batg-6', 'batg-5', 'batg-4', 'batg-2', 'batg-1', 'batg' ,
'batj-2', 'batj-1', 'batj' ,
'bati-1', 'bati' ,
'bath-1', 'bath' ,
'batc-2', 'batc-1', 'batc' ,
'batb-3', 'batb-2', 'batb-1', 'batb' )
else :
switchs = tuple(sys.argv[1:])
sw = switch(switchs)
sw.debug = 1 sw.debug = 1
sw.reconfigure() sw.reconfigure()