xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 17:43:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix error handling for nodeinventory command

Browse Source 
Cleanly handle error messages from server
This commit is contained in:
Jarrod Johnson 2016-05-12 10:25:35 -04:00
parent 129f034c07
commit b328c53d91
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
confluent_client/bin/nodeinventory
View File

@ -54,6 +54,20 @@ def print_mem_info(node, prefix, meminfo):
print('{0}: {1} manufacture location: {2}'.format(
node, prefix, meminfo['manufacture_location']))
exitcode = 0
def printerror(res, node=None):
global exitcode
if 'errorcode' in res:
exitcode = res['errorcode']
if 'error' in res:
if node:
sys.stderr.write('{0}: {1}\n'.format(node, res['error']))
else:
sys.stderr.write('{0}\n'.format(res['error']))
if 'errorcode' not in res:
exitcode = 1
try:
noderange = sys.argv[1]
@ -66,7 +80,13 @@ try:
session = client.Command()
for res in session.read('/noderange/{0}/inventory/hardware/all/all'.format(
noderange)):
printerror(res)
if 'databynode' not in res:
continue
for node in res['databynode']:
printerror(res['databynode'][node], node)
if 'inventory' not in res['databynode'][node]:
continue
for inv in res['databynode'][node]['inventory']:
prefix = inv['name']
if not inv['present']:
@ -86,8 +106,6 @@ try:
print('{0}: {1} {2}: {3}'.format(node, prefix,
pretty(datum),
info[datum]))
exitcode = 0
sys.exit(
session.simple_noderange_command(noderange, '/inventory/hardware/all/all'))
except KeyboardInterrupt:
print('')
sys.exit(exitcode)