Classe BorneWifi.
darcs-hash:20060302155728-68412-e2be9bb3a445573dbb34adddfe21be33ca96de96.gz
This commit is contained in:
parent
32d2199d4b
commit
be3d9b49b0
3 changed files with 150 additions and 129 deletions
|
@ -47,7 +47,7 @@ except:
|
|||
|
||||
base = None
|
||||
|
||||
from ldap_crans import is_actif , crans_ldap, ann_scol, crans, hostname
|
||||
from ldap_crans import is_actif, crans_ldap, ann_scol, crans, hostname, BorneWifi
|
||||
from affich_tools import *
|
||||
import user_tests
|
||||
import popen2, commands
|
||||
|
@ -453,10 +453,10 @@ def machine_details(machine) :
|
|||
f+= coul(u'mid=%s ' % machine.id(),'bleu')
|
||||
|
||||
# Type de machine
|
||||
if machine.ipsec() : a='Machine wifi'
|
||||
elif machine.canal() : a='Borne wifi'
|
||||
else : a='Machine fixe'
|
||||
f+= coul(a+' : ' ,'gras')
|
||||
if machine.ipsec(): a = 'Machine wifi'
|
||||
elif isinstance(machine, BorneWifi): a = 'Borne wifi'
|
||||
else: a = 'Machine fixe'
|
||||
f += coul(a + ' : ', 'gras')
|
||||
|
||||
f+= "%s\n" % machine.nom()
|
||||
|
||||
|
@ -494,7 +494,7 @@ def machine_details(machine) :
|
|||
f += '\n'
|
||||
|
||||
# Borne wifi
|
||||
if machine.puissance() :
|
||||
if isinstance(machine, BorneWifi):
|
||||
f += coul(u'Puissance : ','gras') + u"%4.d" % int(machine.puissance())
|
||||
f += coul(u'\tCanaux : ', 'gras') + machine.canal()
|
||||
f += coul(u'\tÉtat : ', 'gras')
|
||||
|
@ -683,7 +683,7 @@ def __bases_machines(m) :
|
|||
""" Retourne [ type de la machines, blacklist ] """
|
||||
#Type
|
||||
if m.ipsec() : t='wifi'
|
||||
elif m.canal() : t='born'
|
||||
elif isinstance(m, BorneWifi): t='born'
|
||||
else : t='fixe'
|
||||
|
||||
# Déconnectée ?
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue