Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NAS-110576 / 12.0 / R20A enclosure support #6871

Merged
merged 1 commit into from
May 10, 2021
Merged

NAS-110576 / 12.0 / R20A enclosure support #6871

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/freenas/usr/local/lib/middlewared_truenas/plugins/enclosure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@

M_SERIES_REGEX = re.compile(r"(ECStream|iX) 4024S([ps])")
R_SERIES_REGEX = re.compile(r"ECStream (FS2|DSS212S[ps])")
R20A_REGEX = re.compile(r"SMC SC826-P")
R50_REGEX = re.compile(r"iX eDrawer4048S([12])")
X_SERIES_REGEX = re.compile(r"CELESTIC (P3215-O|P3217-B)")
ES24_REGEX = re.compile(r"(ECStream|iX) 4024J")
Expand Down Expand Up @@ -360,7 +361,7 @@ def __init__(self, stat, system_info):
system_info["system_product"] and
system_info["system_product"].startswith("TRUENAS-") and
"-MINI-" not in system_info["system_product"] and
system_info["system_product"] != "TRUENAS-R20"
system_info["system_product"] not in ["TRUENAS-R20", "TRUENAS-R20A"]
):
blacklist.append("AHCI SGPIO Enclosure 2.00")

Expand All @@ -371,10 +372,10 @@ def __init__(self, stat, system_info):
if any(s in enclosure.encname for s in blacklist):
continue
if (
system_info["system_product"] == "TRUENAS-R20" and
system_info["system_product"] in ["TRUENAS-R20", "TRUENAS-R20A"] and
enclosure.encname == "AHCI SGPIO Enclosure 2.00"
):
if enclosure.model == "R20, Drawer #2":
if enclosure.model.endswith("Drawer #2"):
enclosures_tail.append(enclosure)

continue
Expand Down Expand Up @@ -545,20 +546,20 @@ def _set_model(self, data):
if M_SERIES_REGEX.match(self.encname):
self.model = "M Series"
self.controller = True
elif R_SERIES_REGEX.match(self.encname):
elif R_SERIES_REGEX.match(self.encname) or R20A_REGEX.match(self.encname):
self.model = self.system_info["system_product"].replace("TRUENAS-", "")
self.controller = True
if self.model == "R20":
if self.model in ["R20", "R20A"]:
self.model = f"{self.model}, Drawer #1"
if self.model == "R40":
index = [v for v in self.stat.values() if "ECStream FS2" in v].index(data)
self.model = f"{self.model}, Drawer #{index + 1}"
elif (
self.system_info["system_product"] == "TRUENAS-R20" and
self.system_info["system_product"] in ["TRUENAS-R20", "TRUENAS-R20A"] and
self.encname == "AHCI SGPIO Enclosure 2.00" and
len(data.splitlines()) == 6
):
self.model = "R20, Drawer #2"
self.model = f"{self.system_info['system_product'].replace('TRUENAS-', '')}, Drawer #2"
self.controller = True
elif m := R50_REGEX.match(self.encname):
self.model = f"R50, Drawer #{m.group(1)}"
Expand Down