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

switchs2.py: don't crash si chbre inexistante

Browse source
This commit is contained in:
Daniel STAN 2014-12-09 21:22:21 +01:00
parent 7c4d8dcbb0
commit e5f7930bd9
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gestion/annuaires_pg.py
View file

@ -44,6 +44,10 @@ def _need_conn(f):
bat_switchs = ["a", "b", "c", "g", "h", "i", "j", "m", "o", "p"] bat_switchs = ["a", "b", "c", "g", "h", "i", "j", "m", "o", "p"]
class ChbreNotFound(ValueError):
"""Lorsqu'une chambre n'existe pas"""
pass
@_need_conn @_need_conn
def chbre_prises(batiment, chambre = None): def chbre_prises(batiment, chambre = None):
"""Correspondance chambre -> prise""" """Correspondance chambre -> prise"""
@ -55,7 +59,7 @@ def chbre_prises(batiment, chambre = None):
try: try:
return "%03d" % cur.fetchone()[0] return "%03d" % cur.fetchone()[0]
except TypeError: except TypeError:
raise ValueError("Chambre inexistante bat %r, chbre %r" % (batiment, chambre)) raise ChbreNotFound("Chambre inexistante bat %r, chbre %r" % (batiment, chambre))
else: else:
cur = conn.cursor() cur = conn.cursor()
cur.execute("SELECT chambre, prise_crans FROM prises WHERE batiment = %s", batiment) cur.execute("SELECT chambre, prise_crans FROM prises WHERE batiment = %s", batiment)

4
gestion/gen_confs/switchs2.py
View file

@ -321,7 +321,11 @@ def check_conf_ldap(hostname):
continue continue
chbre = unicode(res[0].proprio().get('chbre', ['EXT'])[0]) chbre = unicode(res[0].proprio().get('chbre', ['EXT'])[0])
th_prise = chbre[0].lower() th_prise = chbre[0].lower()
try:
th_prise += annuaire.chbre_prises(chbre[0], chbre[1:]) th_prise += annuaire.chbre_prises(chbre[0], chbre[1:])
except annuaire.ChbreNotFound:
# La chambre est inconnue -> drop
continue
th_prises_set.add(th_prise) th_prises_set.add(th_prise)
pr_prise = bat.lower() + '%d%02d' % (sw_num, port.num) pr_prise = bat.lower() + '%d%02d' % (sw_num, port.num)