X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=nodequery.py;h=85ff1531d5c923bf6cf6d478672c4c106bcd7a2d;hp=c78d6b4bbb65dc9f9a6a53490abe0a89e4ed3f59;hb=6c38b5cef7bf12fa4ade23ae1c54b3491797fb1d;hpb=f6000cab85e17057d58e885c094f78167f307c43 diff --git a/nodequery.py b/nodequery.py index c78d6b4..85ff153 100755 --- a/nodequery.py +++ b/nodequery.py @@ -36,6 +36,8 @@ def fb_print_nodeinfo(fbnode, hostname, fields=None): fbnode['bootcd_version'] = fbnode['bootcd_version'].split()[-1] else: fbnode['bootcd_version'] = "unknown" + if not fbnode['boot_server']: + fbnode['boot_server'] = "unknown" fbnode['pcu'] = color_pcu_state(fbnode) if not fields: @@ -58,7 +60,7 @@ def fb_print_nodeinfo(fbnode, hostname, fields=None): #print "ERROR!!!!!!!!!!!!!!!!!!!!!" pass - print "%(hostname)-45s | %(date_checked)11.11s | %(boot_state)5.5s| %(observed_status)8.8s | %(ssh_status)5.5s | %(pcu)6.6s | %(bootcd_version)6.6s | %(kernel_version)s" % fbnode + print "%(hostname)-45s | %(date_checked)11.11s | %(boot_state)5.5s| %(observed_status)8.8s | %(ssh_status)5.5s | %(pcu)6.6s | %(bootcd_version)6.6s | %(boot_server)s | %(kernel_version)s" % fbnode else: format = "" for f in fields: