Skip to content

Commit 2c4bfaf

Browse files
committed
adds NVME-F8X1 and NVME-F8X2 to server_identifier and dalias example config (still need these 2 units to be added to dmap/lsdev, waiting on unit to test)
1 parent 5cab004 commit 2c4bfaf

3 files changed

Lines changed: 87 additions & 13 deletions

File tree

dalias/example_config/NVME-F8X1

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
1-1
2+
1-2
3+
1-3
4+
1-4
5+
1-5
6+
1-6
7+
1-7
8+
1-8
9+
1-9
10+
1-10
11+
1-11
12+
1-12
13+
1-13
14+
1-14
15+
1-15
16+
1-16
17+
1-17
18+
1-18
19+
1-19
20+
1-20

dalias/example_config/NVME-F8X2

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
1-1
2+
1-2
3+
1-3
4+
1-4
5+
1-5
6+
1-6
7+
1-7
8+
1-8
9+
1-9
10+
1-10
11+
1-11
12+
1-12
13+
1-13
14+
1-14
15+
1-15
16+
1-16
17+
1-17
18+
1-18
19+
1-19
20+
1-20
21+
2-1
22+
2-2
23+
2-3
24+
2-4
25+
2-5
26+
2-6
27+
2-7
28+
2-8
29+
2-9
30+
2-10
31+
2-11
32+
2-12
33+
2-13
34+
2-14
35+
2-15
36+
2-16
37+
2-17
38+
2-18
39+
2-19
40+
2-20

tools/server_identifier

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ g_product_lut_idx = {
2424
}
2525

2626
# g_chassis_sizes = ["?","AV15","Q30","S45","XL60","F8X1","F8X2","F8X3","NVME-F8X1","NVME-F8X2","NVME-F8X3","2U","2UGW","1UGW","F2","HL15","VM8","VM16","VM32","HL4","HL8","PRO4","PRO8","PRO15","STUDIO8","STUDIO15","HL15_BEAST","F16","VM2"]
27-
g_chassis_sizes = ["?","AV15","Q30","S45","XL60","F8X1","F8X2","F8X3","NVME-F8X3","2U","2UGW","1UGW","F2","HL15","VM8","VM16","VM32","HL4","HL8","PRO4","PRO8","PRO15","STUDIO8","STUDIO15","HL15_BEAST","F16","VM2","2UGW_REV2","X15"]
27+
g_chassis_sizes = ["?","AV15","Q30","S45","XL60","F8X1","F8X2","F8X3","NVME-F8X1","NVME-F8X2","NVME-F8X3","2U","2UGW","1UGW","F2","HL15","VM8","VM16","VM32","HL4","HL8","PRO4","PRO8","PRO15","STUDIO8","STUDIO15","HL15_BEAST","F16","VM2","2UGW_REV2","X15"]
2828

2929
g_mobo_to_version_lut = {
3030
"Base": ["X11SPH-nCTF","X11SSH-CTF","X11SSM-F","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC","ROMED8-2T/BCM","ROMED8-2T", "ProArt X870E-CREATOR WIFI","MH53-G40-000", "MW34-SP0-00"],
@@ -118,19 +118,19 @@ g_product_lut = {
118118
"Storinator-F8X3-Turbo": [g_mobo_to_version_lut["Turbo"] ,3,0,"F8X1","F8"],
119119
"Storinator-F8X3-Turbo-G": [g_mobo_to_version_lut["Turbo-G"] ,3,0,"F8X1","F8"],
120120

121-
# "Storinator-NVME-F8X1-Base-B": [g_mobo_to_version_lut["Base-B"] ,1,1,"NVME-F8X1","F8"],
122-
# "Storinator-NVME-F8X1-Enhanced": [g_mobo_to_version_lut["Enhanced"] ,1,1,"NVME-F8X1","F8"],
123-
# "Storinator-NVME-F8X1-Enhanced-S": [g_mobo_to_version_lut["Enhanced-S"] ,1,1,"NVME-F8X1","F8"],
124-
# "Storinator-NVME-F8X1-Enhanced-AMD": [g_mobo_to_version_lut["Enhanced-AMD"] ,1,1,"NVME-F8X1","F8"],
125-
# "Storinator-NVME-F8X1-Turbo": [g_mobo_to_version_lut["Turbo"] ,1,1,"NVME-F8X1","F8"],
126-
# "Storinator-NVME-F8X1-Turbo-G": [g_mobo_to_version_lut["Turbo-G"] ,1,1,"NVME-F8X1","F8"],
121+
"Storinator-NVME-F8X1-Base-B": [g_mobo_to_version_lut["Base-B"] ,1,1,"NVME-F8X1","F8"],
122+
"Storinator-NVME-F8X1-Enhanced": [g_mobo_to_version_lut["Enhanced"] ,1,1,"NVME-F8X1","F8"],
123+
"Storinator-NVME-F8X1-Enhanced-S": [g_mobo_to_version_lut["Enhanced-S"] ,1,1,"NVME-F8X1","F8"],
124+
"Storinator-NVME-F8X1-Enhanced-AMD": [g_mobo_to_version_lut["Enhanced-AMD"] ,1,1,"NVME-F8X1","F8"],
125+
"Storinator-NVME-F8X1-Turbo": [g_mobo_to_version_lut["Turbo"] ,1,1,"NVME-F8X1","F8"],
126+
"Storinator-NVME-F8X1-Turbo-G": [g_mobo_to_version_lut["Turbo-G"] ,1,1,"NVME-F8X1","F8"],
127127

128-
# "Storinator-NVME-F8X2-Base-B": [g_mobo_to_version_lut["Base-B"] ,2,1,"NVME-F8X2","F8"],
129-
# "Storinator-NVME-F8X2-Enhanced": [g_mobo_to_version_lut["Enhanced"] ,2,1,"NVME-F8X2","F8"],
130-
# "Storinator-NVME-F8X2-Enhanced-S": [g_mobo_to_version_lut["Enhanced-S"] ,2,1,"NVME-F8X2","F8"],
131-
# "Storinator-NVME-F8X2-Enhanced-AMD": [g_mobo_to_version_lut["Enhanced-AMD"] ,2,1,"NVME-F8X2","F8"],
132-
# "Storinator-NVME-F8X2-Turbo": [g_mobo_to_version_lut["Turbo"] ,2,1,"NVME-F8X2","F8"],
133-
# "Storinator-NVME-F8X2-Turbo-G": [g_mobo_to_version_lut["Turbo-G"] ,2,1,"NVME-F8X2","F8"],
128+
"Storinator-NVME-F8X2-Base-B": [g_mobo_to_version_lut["Base-B"] ,2,1,"NVME-F8X2","F8"],
129+
"Storinator-NVME-F8X2-Enhanced": [g_mobo_to_version_lut["Enhanced"] ,2,1,"NVME-F8X2","F8"],
130+
"Storinator-NVME-F8X2-Enhanced-S": [g_mobo_to_version_lut["Enhanced-S"] ,2,1,"NVME-F8X2","F8"],
131+
"Storinator-NVME-F8X2-Enhanced-AMD": [g_mobo_to_version_lut["Enhanced-AMD"] ,2,1,"NVME-F8X2","F8"],
132+
"Storinator-NVME-F8X2-Turbo": [g_mobo_to_version_lut["Turbo"] ,2,1,"NVME-F8X2","F8"],
133+
"Storinator-NVME-F8X2-Turbo-G": [g_mobo_to_version_lut["Turbo-G"] ,2,1,"NVME-F8X2","F8"],
134134

135135
"Storinator-NVME-F8X3-Base-B": [g_mobo_to_version_lut["Base-B"] ,3,1,"NVME-F8X3","F8"],
136136
"Storinator-NVME-F8X3-Enhanced": [g_mobo_to_version_lut["Enhanced"] ,3,1,"NVME-F8X3","F8"],
@@ -1277,6 +1277,20 @@ def main():
12771277
server["OS NAME"], server["OS VERSION_ID"] = get_os()
12781278
update_json_file(server,scan_time)
12791279

1280+
# Create/remove fan controller sentinel file for Cockpit menu visibility
1281+
fan_controller_sentinel = "/etc/45drives/fan-controller-supported"
1282+
if server["Chassis Size"] in ["NVME-F8X1", "NVME-F8X2", "NVME-F8X3"]:
1283+
try:
1284+
open(fan_controller_sentinel, "w").close()
1285+
except Exception as e:
1286+
print("/opt/45drives/tools/server_identifier: Failed to create fan controller sentinel: " + str(e))
1287+
else:
1288+
try:
1289+
if os.path.exists(fan_controller_sentinel):
1290+
os.remove(fan_controller_sentinel)
1291+
except Exception as e:
1292+
print("/opt/45drives/tools/server_identifier: Failed to remove fan controller sentinel: " + str(e))
1293+
12801294
# warn user if improper number of HBA cards are detected.
12811295
if server["Model"] in g_product_lut:
12821296
if len(server["HBA"]) != g_product_lut[server["Model"]][g_product_lut_idx["24I_COUNT"]] + g_product_lut[server["Model"]][g_product_lut_idx["16I_COUNT"]]:

0 commit comments

Comments
 (0)