From d7a0d97324d9fd1c0e090299b7dc280b6f16cd55 Mon Sep 17 00:00:00 2001 From: pauget Date: Fri, 17 Jun 2005 22:55:24 +0200 Subject: [PATCH] On utilise le fqdn pour les switchs darcs-hash:20050617205524-41617-5764faeff471219babc9a6a1710160a65384c854.gz --- gestion/annuaires.py | 2 +- gestion/hptools.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gestion/annuaires.py b/gestion/annuaires.py index cd38809c..4bb4416c 100755 --- a/gestion/annuaires.py +++ b/gestion/annuaires.py @@ -512,7 +512,7 @@ def all_switchs(bat=None): dup = map(lambda x: x[0], reverse(b).keys()) # dup contient des elements en double for n in list(dict(zip(dup,[None]*len(dup)))): - switchs.append("bat%s-%s" % (b, n)) + switchs.append("bat%s-%s.adm.crans.org" % (b, n)) switchs.sort() return switchs diff --git a/gestion/hptools.py b/gestion/hptools.py index e4a10261..bea51538 100755 --- a/gestion/hptools.py +++ b/gestion/hptools.py @@ -350,7 +350,7 @@ class sw_chbre(hpswitch) : bat = chbre[0].lower() prise = chbre_prises[bat][chbre[1:]] self.prise_brute = prise - self.switch = 'bat%s' % bat + self.switch = 'bat%s.adm.crans.org' % bat num_switch = int(prise[0]) self.switch += '-%i' % num_switch if prise[-1] == '-' :