From c0c1bccf0791576b082dafbc4da86762649286e4 Mon Sep 17 00:00:00 2001 From: "Vincent S. Cojot" Date: Wed, 9 Mar 2016 09:21:11 -0500 Subject: [PATCH] [megaclisas-status] Update for CacheCade LDs.. --- wrapper-scripts/megaclisas-status | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrapper-scripts/megaclisas-status b/wrapper-scripts/megaclisas-status index 08f0c2a..7a8aa79 100755 --- a/wrapper-scripts/megaclisas-status +++ b/wrapper-scripts/megaclisas-status @@ -216,7 +216,7 @@ def returnBBUStatus(output): def returnArrayNumber(output): i = 0 for line in output: - if re.match(r'^Virtual Drive:.*$',line.strip()): + if re.match(r'^(CacheCade )?Virtual Drive:.*$',line.strip()): i += 1 return i @@ -275,7 +275,7 @@ def returnArrayInfo(output,controllerid,arrayid,arrayindex): cachecade_info = 'None' for line in output: - if re.match(r'^Virtual Drive:.*(Target Id: [0-9]+).*$',line.strip()): + if re.match(r'^(CacheCade )?Virtual Drive:.*(Target Id: [0-9]+).*$',line.strip()): # Extract the SCSI Target ID targetid = line.strip().split(':')[2].split(')')[0].strip() elif re.match(r'^RAID Level.*?:.*$',line.strip()):