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

Merge pull request #55 from ElCoyote27/master

Browse Source 
Minor bugfix to get NestedLDTable properly laid out..
This commit is contained in:
Adam Cécile 2017-04-05 17:23:37 +02:00 committed by GitHub
commit 1cc125452a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wrapper-scripts/megaclisas-status
View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
# $Id: megaclisas-status,v 1.68 2016/10/21 14:38:56 root Exp root $ # $Id: megaclisas-status,v 1.71 2017/04/04 18:45:52 root Exp root $
# #
# Written by Adam Cecile <gandalf@NOSPAM.le-vert.net> # Written by Adam Cecile <gandalf@NOSPAM.le-vert.net>
# Modified by Vincent S. Cojot <vincent@NOSPAM.cojot.name> # Modified by Vincent S. Cojot <vincent@NOSPAM.cojot.name>
@ -33,7 +33,7 @@ totaldrivenumber = 0
MaxNumHBA = 16 MaxNumHBA = 16
MaxNumLD = 128 MaxNumLD = 128
LDTable = [ [] * MaxNumHBA for i in range(MaxNumLD) ] LDTable = [ [] * MaxNumHBA for i in range(MaxNumLD) ]
NestedLDTable = [[False for i in range(MaxNumHBA)] for j in range(MaxNumLD)] NestedLDTable = [[False for i in range(MaxNumLD)] for j in range(MaxNumHBA)]
# Outputs is a 'dict' of all MegaCLI outputs so we can re-use them during loops.. # Outputs is a 'dict' of all MegaCLI outputs so we can re-use them during loops..
Outputs = {} Outputs = {}
@ -175,6 +175,8 @@ def returnUnConfDriveNumber(output):
for line in output: for line in output:
if re.match(r'^Firmware state: Unconfigured.*$',line.strip()): if re.match(r'^Firmware state: Unconfigured.*$',line.strip()):
confdrives += 1 confdrives += 1
if re.match(r'^Firmware state: Hotspare.*$',line.strip()):
confdrives += 1
return int(confdrives) return int(confdrives)
def returnControllerModel(output): def returnControllerModel(output):
@ -414,7 +416,7 @@ def returnDiskInfo(output,controllerid):
elif re.match(r'Enclosure Device ID: .*$',line.strip()): elif re.match(r'Enclosure Device ID: .*$',line.strip()):
# We match here early in the analysis so reset the vars if this is a new disk we're reading.. # We match here early in the analysis so reset the vars if this is a new disk we're reading..
oldenclid = enclid oldenclid = enclid
enclid = line.split(':')[1].strip() enclid = line.split(':')[1].strip().replace("N/A","")
if oldenclid != False: if oldenclid != False:
fstate = 'Offline' fstate = 'Offline'
model = 'Unknown' model = 'Unknown'
@ -500,7 +502,7 @@ def returnUnconfDiskInfo(output,controllerid):
if re.match(r'Enclosure Device ID: .*$',line.strip()): if re.match(r'Enclosure Device ID: .*$',line.strip()):
# We match here early in the analysis so reset the vars if this is a new disk we're reading.. # We match here early in the analysis so reset the vars if this is a new disk we're reading..
oldenclid = enclid oldenclid = enclid
enclid = line.split(':')[1].strip() enclid = line.split(':')[1].strip().replace("N/A","")
if oldenclid != False: if oldenclid != False:
arrayid = False arrayid = False
fstate = 'Offline' fstate = 'Offline'