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

[ldap_crans + whos] Ajout de la gestion ipv6

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2013-02-22 16:08:59 +01:00
parent 9b8bad1610
commit b32363a3ef
2 changed files with 43 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gestion/whos.py
View file

@ -338,12 +338,12 @@ def list_machines(machines) :
t, bl = __bases_machines(m)
# Données
data.append([m.id(), t, m.nom().split('.')[0], m.ip(), m.mac(), bl])
data.append([m.id(), m.rid(), t, m.nom().split('.')[0], m.ip(), m.ipv6(), m.mac(), bl])
return tableau(data,
titre = [u'mid', u'Type', u'Nom de machine', u'Adresse IP', u'Adresse MAC', u'Limitation'],
largeur = [5, 4, '*', 17, 19, 10],
alignement = ['d', 'c', 'c', 'c', 'c', 'c'])
titre = [u'mid', u'rid', u'Type', u'Nom de machine', u'Adresse IP', u'Adresse IPv6', u'Adresse MAC', u'Limitation'],
largeur = [5, 5, 4, '*', 24, 17, 19, 10],
alignement = ['d', 'd', 'c', 'c', 'c', 'c', 'c', 'c'])
def list_bornes(bornes) :
"""
@ -609,6 +609,7 @@ def machine_details(machine) :
f+= coul(u'IP : ','gras') + "%s\t\t" %machine.ip()
f+= coul(u'MAC : ','gras') + "%s\n" %machine.mac()
f+= coul(u'IPv6 : ','gras') + "%s\n" %machine.ipv6()
if len(machine.sshFingerprint()) > 0 and aff_ssh:
f += u"\n".join([coul(u'Fingerprint SSH : ', 'gras') + u"%s" % (i) for i in machine.sshFingerprint()])+"\n"