tyler.durden/hwraid
1
0
Fork 0
mirror of https://github.com/eLvErDe/hwraid.git synced 2025-07-31 01:34:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adapted formats to most printouts.. (Rev 1.24)

Browse Source
This commit is contained in:
Vincent S. Cojot 2015-03-28 00:16:45 -04:00
parent 0bec893d24
commit f06c999d85
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wrapper-scripts/megaclisas-status
View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
# $Id: megaclisas-status,v 1.23 2015/03/28 00:11:19 root Exp $ # $Id: megaclisas-status,v 1.24 2015/03/28 00:16:45 root Exp $
import os import os
import re import re
@ -314,7 +314,9 @@ bad = False
if printcontroller: if printcontroller:
if controllernumber: if controllernumber:
print '-- Controller information --' print '-- Controller information --'
print '-- ID\t| Model'
hbafmt = "%-5s | %s "
print hbafmt % ("-- ID","Model")
controllerid = 0 controllerid = 0
while controllerid < controllernumber: while controllerid < controllernumber:
cmd = '%s -AdpAllInfo -a%d -NoLog' % (megaclipath, controllerid) cmd = '%s -AdpAllInfo -a%d -NoLog' % (megaclipath, controllerid)
@ -322,7 +324,9 @@ if printcontroller:
controllermodel = returnControllerModel(output) controllermodel = returnControllerModel(output)
controllerram = returnMemorySize(output) controllerram = returnMemorySize(output)
controllerrev = returnFirmwareVersion(output) controllerrev = returnFirmwareVersion(output)
print 'c'+str(controllerid)+'\t| '+controllermodel+' ('+controllerram+') FW: '+controllerrev print hbafmt % (
'c'+str(controllerid),
str(controllermodel+' ('+controllerram+') FW: '+controllerrev))
controllerid += 1 controllerid += 1
print '' print ''
else: else:
@ -388,7 +392,7 @@ if totaldrivenumber:
if( len(array[5]) >= flen): if( len(array[5]) >= flen):
flen = len(array[5]) flen = len(array[5])
# Adjust print format with widths computed above # Adjust print format with widths computed above
drvfmt = "%-8s | %-4s | %-"+str(mlen)+"s | %-8s | %-"+str(flen)+"s | %-8s | %-4s | %-8s | %-8s" drvfmt = "%-7s | %-4s | %-"+str(mlen)+"s | %-8s | %-"+str(flen)+"s | %-8s | %-4s | %-8s | %-8s"
i = 0 i = 0
for array in arraydisk: for array in arraydisk:
# Header # Header
@ -439,7 +443,7 @@ if totalunconfdrivenumber:
if( len(array[3]) >= flen): if( len(array[3]) >= flen):
flen = len(array[3]) flen = len(array[3])
# Adjust print format with widths computed above # Adjust print format with widths computed above
drvfmt = "%-8s | %-4s | %-"+str(mlen)+"s | %-8s | %-"+str(flen)+"s | %-8s | %-4s | %-8s | %-8s" drvfmt = "%-7s | %-4s | %-"+str(mlen)+"s | %-8s | %-"+str(flen)+"s | %-8s | %-4s | %-8s | %-8s"
i = 0 i = 0
for array in arraydisk: for array in arraydisk:
# Header # Header