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

Very minor bugfixes (Rev 1.29)

Browse Source
This commit is contained in:
Vincent S. Cojot 2015-04-01 22:10:47 -04:00
parent 7319f6803b
commit 3fb4583c97
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wrapper-scripts/megaclisas-status
View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
# $Id: megaclisas-status,v 1.28 2015/04/01 21:39:31 root Exp $ # $Id: megaclisas-status,v 1.29 2015/04/01 22:10:47 root Exp $
import os import os
import re import re
@ -126,6 +126,15 @@ def returnFirmwareVersion(output):
if re.match(r'^FW Package Build.*$',line.strip()): if re.match(r'^FW Package Build.*$',line.strip()):
return line.split(':')[1].strip() return line.split(':')[1].strip()
def returnROCTemp(output):
ROCtemp = 0
tmpstr = ''
for line in output:
if re.match(r'^ROC temperature :.*$',line.strip()):
tmpstr = line.split(':')[1].strip()
ROCtemp = re.sub(' +.*$', '', tmpstr)
return ROCtemp
def returnArrayNumber(output): def returnArrayNumber(output):
i = 0 i = 0
for line in output: for line in output:
@ -341,18 +350,29 @@ if printcontroller:
if controllernumber: if controllernumber:
print '-- Controller information --' print '-- Controller information --'
hbafmt = "%-5s | %s " i = 0
print hbafmt % ("-- ID","Model")
controllerid = 0 controllerid = 0
mlen = 0
while controllerid < controllernumber: while controllerid < controllernumber:
cmd = '%s -AdpAllInfo -a%d -NoLog' % (megaclipath, controllerid) cmd = '%s -AdpAllInfo -a%d -NoLog' % (megaclipath, controllerid)
output = getOutput(cmd) output = getOutput(cmd)
controllermodel = returnControllerModel(output) controllermodel = returnControllerModel(output)
controllerram = returnMemorySize(output) controllerram = returnMemorySize(output)
controllerrev = returnFirmwareVersion(output) controllerrev = returnFirmwareVersion(output)
controllertemp = returnROCTemp(output)
if ( len(controllermodel) > mlen):
mlen = len(controllermodel)
hbafmt = str('%-5s | %-'+str(mlen)+'s | %-6s | %-4s | %-12s ')
# Header
if ( i == 0 ):
print hbafmt % ("-- ID","H/W Model","RAM","Temp","Firmware")
print hbafmt % ( print hbafmt % (
'c'+str(controllerid), 'c'+str(controllerid),
str(controllermodel+' ('+controllerram+') FW: '+controllerrev)) controllermodel,
str(controllerram),
str(controllertemp+'C'),
str('FW: '+controllerrev))
controllerid += 1 controllerid += 1
print '' print ''
else: else: