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

Parsing fixes for arcconf 2

Browse Source
This commit is contained in:
Adam Cecile 2016-11-11 10:42:22 +01:00
parent 5332a53523
commit 8aeac49387
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wrapper-scripts/aacraid-status
View File

@ -69,18 +69,23 @@ def returnArrayIds(output):
return ids return ids
def returnArrayInfo(output, ctrl_id='?'): def returnArrayInfo(output, ctrl_id='?'):
# For testing purpose
#with open('/tmp/output') as f:
# output = f.read().splitlines()
members = [] members = []
for line in output: for line in output:
# RAID level may be either N or Simple_Volume # RAID level may be either N or Simple_Volume
# (a disk connected to the card, not hotspare, not part of any array) # (a disk connected to the card, not hotspare, not part of any array)
if re.match(r'^RAID level\s+: .+$',line.strip()): if re.match(r'^RAID level\s+: .+$',line.strip()):
type = line.split(':')[1].strip() type = line.split(':')[1].strip()
if re.match(r'^Status of logical [Dd]evice\s+: .*$',line.strip()): if re.match(r'^Status of [Ll]ogical [Dd]evice\s+: .*$',line.strip()):
status = line.split(':')[1].strip() status = line.split(':')[1].strip()
if re.match(r'^Size\s+: [0-9]+ MB$',line.strip()): if re.match(r'^Size\s+: [0-9]+ MB$',line.strip()):
size = str(int(line.strip('MB').split(':')[1].strip()) / 1000) size = str(int(line.strip('MB').split(':')[1].strip()) / 1000)
if re.match(r'^(Group\s[0-9]+,\s)?Segment [0-9]+\s+: .*$',line.strip()): if re.match(r'^(Group\s[0-9]+,\s)?Segment\s[0-9]+\s+: .*$',line.strip()):
# The line can be either (arcconf 1.x) # The line can be either (arcconf 1.x)
# Group 0, Segment 0 : Present (Controller:1,Enclosure:0,Slot:0) JPW9J0N00RWMUV # Group 0, Segment 0 : Present (Controller:1,Enclosure:0,Slot:0) JPW9J0N00RWMUV
@ -97,7 +102,6 @@ def returnArrayInfo(output, ctrl_id='?'):
# Coma separated # Coma separated
device_attrs = device_state.split(',') device_attrs = device_state.split(',')
device_attrs = [ x.strip() for x in device_attrs ] device_attrs = [ x.strip() for x in device_attrs ]
print(device_attrs)
# Some magic here... # Some magic here...
# Strip out from the list element not matching Xyz:12 # Strip out from the list element not matching Xyz:12
# Split on column: now we have and array of arrays like [['Controller', '1'], ['Connector', '1'], ['Device', '0']] # Split on column: now we have and array of arrays like [['Controller', '1'], ['Connector', '1'], ['Device', '0']]