Skip to content

Commit 93556aa

Browse files
JordanKeo45JordanKeo45
committed
adds Homelab X15 (unraid edition) to dalias example config, dmap, lsdev, server_identifier
1 parent decc8a6 commit 93556aa

4 files changed

Lines changed: 31 additions & 40 deletions

File tree

‎dalias/example_config/X15‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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

‎tools/dmap‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,8 @@ def create_vdev_id(server):
468468
},
469469
"HOMELAB":{
470470
"HL15_BEAST":[23],
471-
"HL15":[15],
471+
"X15":[15],
472+
"HL15":[15],
472473
"HL4":[4],
473474
"HL8":[4,4]
474475
},

‎tools/lsdev‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ def build_server(options):
331331
},
332332
"HOMELAB":{
333333
"HL15_BEAST":[23],
334+
"X15":[15],
334335
"HL15":[15],
335336
"HL4":[4],
336337
"HL8":[4,4]

‎tools/server_identifier‎

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ g_product_lut_idx = {
2323
"ALIAS_STYLE": 4
2424
}
2525

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

2828
g_mobo_to_version_lut = {
29-
"Base": ["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"],
30-
"Base-B": ["X11SPL-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"],
31-
"Enhanced": ["X11SPL-F","X10SRL-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"],
32-
"Enhanced-S":["X11SPL-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"],
33-
"Enhanced-AMD":["H11SSL-i","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"],
34-
"Turbo": ["X11DPL-i","X10DRL-i","X12DPi-N6","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"],
35-
"Turbo-G":["X11SPL-F","X12DPi-N6","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"],
36-
"Good": ["H12SSL-i","H12SSL-I","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"],
37-
"Better": ["H12SSL-i","H12SSL-I","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"],
38-
"Best": ["H12SSL-i","H12SSL-I","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"],
39-
"Super": ["H12SSL-i","H12SSL-I","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"]
29+
"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-000"],
30+
"Base-B": ["X11SPL-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-000"],
31+
"Enhanced": ["X11SPL-F","X10SRL-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-000"],
32+
"Enhanced-S":["X11SPL-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-000"],
33+
"Enhanced-AMD":["H11SSL-i","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-000"],
34+
"Turbo": ["X11SPH-nCTF","X11DPL-i","X10DRL-i","X12DPi-N6","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-000"],
35+
"Turbo-G":["X11SPH-nCTF","X11SPL-F","X12DPi-N6","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-000"],
36+
"Good": ["H12SSL-i","H12SSL-I","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-000"],
37+
"Better": ["H12SSL-i","H12SSL-I","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-000"],
38+
"Best": ["H12SSL-i","H12SSL-I","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-000"],
39+
"Super": ["H12SSL-i","H12SSL-I","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-000"]
4040
}
4141

4242
g_product_lut = {
@@ -52,7 +52,6 @@ g_product_lut = {
5252
"Gateway-2UGW_REV2-Enhanced-S": [g_mobo_to_version_lut["Enhanced"],0,0,"2UGW_REV2","2UGW_REV2"],
5353
"Gateway-2UGW_REV2-Turbo-G": [g_mobo_to_version_lut["Turbo"],0,0,"2UGW_REV2","2UGW_REV2"],
5454

55-
5655
"Gateway-1UGW-Base": [g_mobo_to_version_lut["Base"],0,0,"1UGW","1UGW"],
5756
"Gateway-1UGW-Base-B": [g_mobo_to_version_lut["Base"],0,0,"1UGW","1UGW"],
5857
"Gateway-1UGW-Enhanced": [g_mobo_to_version_lut["Enhanced"],0,0,"1UGW","1UGW"],
@@ -68,6 +67,7 @@ g_product_lut = {
6867
"HomeLab-HL15": [g_mobo_to_version_lut["Turbo"],0,0,"HL15","HOMELAB"],
6968
"HomeLab-HL4": [g_mobo_to_version_lut["Turbo"],0,0,"HL4","HOMELAB"],
7069
"HomeLab-HL8": [g_mobo_to_version_lut["Turbo"],0,0,"HL8","HOMELAB"],
70+
"HomeLab-X15": [g_mobo_to_version_lut["Turbo"],0,1,"X15","HOMELAB"],
7171

7272
"Professional-PRO15": [g_mobo_to_version_lut["Turbo"],0,1,"PRO15","PROFESSIONAL"],
7373
"Professional-PRO4": [g_mobo_to_version_lut["Turbo"],0,0,"PRO4","PROFESSIONAL"],
@@ -580,32 +580,6 @@ def getStorcliInfo(hba_card):
580580
print("Updating Controller ID: {ctl}, PCI Address: {pci}, Bus Address: {ba}".format(ctl=hba_card["Ctl"],pci=hba_card["PCI Address"],ba=hba_card["Bus Address"]))
581581
hba_card["Bus Address"] = hba_card["PCI Address"]
582582

583-
# def getCardOrder():
584-
# # Count the number of storcli2 compatible controllers. If not zero return from the function with that many controllers. Let the normal process take over.
585-
# # If storcli2 controllers are 0 and non zero storcli64 controllers continue with this function
586-
# # this function added to handle the case of the pre-F8X servers. this is not needed in 9600 series systems
587-
# # this will cause a mapping problem in the scenario of having 96XX and 93/94 cards in the system.
588-
# storcli64_check_command = "/opt/45drives/tools/storcli64 show J | jq '.Controllers[0].\"Response Data\".\"Number of Controllers\"'"
589-
# storcli64_check_process = subprocess.Popen(storcli64_check_command, shell=True, stdout=subprocess.PIPE)
590-
# storcli64_controller_count_str,_ = storcli64_check_process.communicate()
591-
# storcli64_controller_count = storcli64_controller_count_str.decode('utf-8').strip()
592-
# storcli2_check_command = "/opt/45drives/tools/storcli2 show J | jq '.Controllers[0].\"Response Data\".\"Number of Controllers\"'"
593-
# storcli2_check_process = subprocess.Popen(storcli2_check_command, shell=True, stdout=subprocess.PIPE)
594-
# storcli2_controller_count_str,_ = storcli2_check_process.communicate()
595-
# storcli2_controller_count = storcli2_controller_count_str.decode('utf-8').strip()
596-
597-
# hba_card_order = []
598-
599-
# if int(storcli2_controller_count) > 0:
600-
# return hba_card_order
601-
# if int(storcli64_controller_count) > 0:
602-
# hba_order_command = "/opt/45drives/tools/storcli64 /call show J | jq -r '.Controllers[].\"Response Data\".\"PCI Address\"' | cut -d : -f 2"
603-
# hba_order_process = subprocess.Popen(hba_order_command, shell=True, stdout=subprocess.PIPE)
604-
# stdout,_ = hba_order_process.communicate()
605-
# hba_cards = stdout.decode('utf-8').splitlines()
606-
# hba_card_order =[item for item in hba_cards if item]
607-
# return hba_card_order
608-
609583
def getCardOrder():
610584
# Count the number of storcli2 compatible controllers. If not zero return from the function with that many controllers.
611585
# If storcli2 controllers are 0 and non-zero storcli64 controllers, continue with this function.

0 commit comments

Comments
 (0)