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

On utilise le fqdn pour les switchs

Browse source 
darcs-hash:20050617205524-41617-5764faeff471219babc9a6a1710160a65384c854.gz
This commit is contained in:
pauget 2005-06-17 22:55:24 +02:00
parent d744b664dd
commit d7a0d97324
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gestion/annuaires.py
View file

@ -512,7 +512,7 @@ def all_switchs(bat=None):
dup = map(lambda x: x[0], reverse(b).keys()) dup = map(lambda x: x[0], reverse(b).keys())
# dup contient des elements en double # dup contient des elements en double
for n in list(dict(zip(dup,[None]*len(dup)))): 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() switchs.sort()
return switchs return switchs

2
gestion/hptools.py
View file

@ -350,7 +350,7 @@ class sw_chbre(hpswitch) :
bat = chbre[0].lower() bat = chbre[0].lower()
prise = chbre_prises[bat][chbre[1:]] prise = chbre_prises[bat][chbre[1:]]
self.prise_brute = prise self.prise_brute = prise
self.switch = 'bat%s' % bat self.switch = 'bat%s.adm.crans.org' % bat
num_switch = int(prise[0]) num_switch = int(prise[0])
self.switch += '-%i' % num_switch self.switch += '-%i' % num_switch
if prise[-1] == '-' : if prise[-1] == '-' :