Merge pull request #28 from 45Drives/master

merge dev and main

CHANGELOG.md

@@ -1,3 +1,3 @@
-## 45drives-tools 3.0.7-3
+## 45drives-tools 3.0.8-1
 
-* Updated dmap to support MI4 Aliasing on H11 and H12 Motherboards
+* Add support for Proxinator VM8, VM16, and VM32

manifest.json

@@ -3,8 +3,8 @@
     "name": "45drives-tools",
     "title": "45drives-tools",
     "prerelease": false,
-    "version": "3.0.7",
-    "buildVersion": "3",
+    "version": "3.0.8",
+    "buildVersion": "1",
     "author": "Mark Hooper <[email protected]>",
     "url": "https://github.com/45Drives/tools",
     "category": "utils",
@@ -65,8 +65,8 @@
     ],
     "changelog": {
         "urgency": "medium",
-        "version": "3.0.7",
-        "buildVersion": "3",
+        "version": "3.0.8",
+        "buildVersion": "1",
         "ignore": [],
         "date": null,
         "packager": "Mark Hooper <[email protected]>",

packaging/el7/main.spec

@@ -58,6 +58,8 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Thu Mar 21 2024 Joshua Boudreau <[email protected]> 3.0.8-1
+- Add support for Proxinator VM8, VM16, and VM32
 * Wed Jan 31 2024 Brett Kelly <[email protected]> 3.0.7-3
 - Updated dmap to support MI4 Aliasing on H11 and H12 Motherboards
 * Fri Jan 05 2024 Joshua Boudreau <[email protected]> 3.0.7-2

packaging/el8/main.spec

@@ -63,6 +63,8 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Thu Mar 21 2024 Joshua Boudreau <[email protected]> 3.0.8-1
+- Add support for Proxinator VM8, VM16, and VM32
 * Wed Jan 31 2024 Brett Kelly <[email protected]> 3.0.7-3
 - Updated dmap to support MI4 Aliasing on H11 and H12 Motherboards
 * Fri Jan 05 2024 Joshua Boudreau <[email protected]> 3.0.7-2

packaging/focal/changelog

@@ -1,3 +1,9 @@
+45drives-tools (3.0.8-1focal) focal; urgency=medium
+
+  * Add support for Proxinator VM8, VM16, and VM32
+
+ -- Joshua Boudreau <[email protected]>  Thu, 21 Mar 2024 08:09:48 -0300
+
 45drives-tools (3.0.7-3focal) focal; urgency=medium
 
   * Updated dmap to support MI4 Aliasing on H11 and H12 Motherboards

tools/lsdev

@@ -159,7 +159,9 @@ def get_model_serial_firmware(device_name):
 	try:
 		hdparm_result = subprocess.Popen(
 			["hdparm","-I", device_name],
-			stdout=subprocess.PIPE,universal_newlines=True
+			stdout=subprocess.PIPE,
+			stderr=subprocess.DEVNULL,
+			universal_newlines=True
 		).stdout
 	except OSError:
 		print("Error executing hdparm. Is it installed?")
@@ -308,7 +310,10 @@ def build_server(options):
 			"2U":[32]
 		},
 		"F2STORNADO":{
-			"F2":[32]
+			"F2":[32],
+			"VM8":[8],
+			"VM16":[16],
+			"VM32":[32]
 		},
 		"AV15-BASE":{
 			"AV15":[15]

tools/server_identifier

@@ -2,7 +2,7 @@
 ########################################################################################
 # server_identifier
 # This script can be run on standard 45Drives storage servers to determine the system 
-# model by gathering hardware infromation.
+# model by gathering hardware information.
 ########################################################################################
 import subprocess
 import re
@@ -21,7 +21,7 @@ g_product_lut_idx = {
 	"ALIAS_STYLE":	4
 }
 
-g_chassis_sizes = ["?","AV15","Q30","S45","XL60","F8X1","F8X2","F8X3","2U","2UGW","F2","HL15"]
+g_chassis_sizes = ["?","AV15","Q30","S45","XL60","F8X1","F8X2","F8X3","2U","2UGW","F2","HL15","VM8","VM16","VM32"]
 
 g_mobo_to_version_lut = {
 	"Base": ["X11SSH-CTF","X11SSM-F"],
@@ -31,6 +31,9 @@ g_mobo_to_version_lut = {
 	"Enhanced-AMD":["H11SSL-i"],
 	"Turbo": ["X11DPL-i","X10DRL-i","X12DPi-N6"],
 	"Turbo-G":["X11SPL-F","X12DPi-N6"],
+	"Good": ["H12SSL-i","H12SSL-I"],
+	"Better": ["H12SSL-i","H12SSL-I"],
+	"Best": ["H12SSL-i","H12SSL-I"]
 }
 
 g_product_lut = {
@@ -198,6 +201,18 @@ g_product_lut = {
 	"Stornado-F2-Turbo-G":				[g_mobo_to_version_lut["Turbo-G"]  ,0,4,"F2","F2STORNADO"],
 	"Stornado-F2-Turbo":				[g_mobo_to_version_lut["Turbo"]  ,0,4,"F2","F2STORNADO"],
 
+	"Proxinator-VM8-Base":				[g_mobo_to_version_lut["Good"]  ,0,1,"VM8","F2STORNADO"],
+	"Proxinator-VM8-Enhanced":			[g_mobo_to_version_lut["Better"]  ,0,1,"VM8","F2STORNADO"],
+	"Proxinator-VM8-Turbo":				[g_mobo_to_version_lut["Best"]  ,0,1,"VM8","F2STORNADO"],
+
+	"Proxinator-VM16-Base":				[g_mobo_to_version_lut["Good"]  ,0,2,"VM16","F2STORNADO"],
+	"Proxinator-VM16-Enhanced":			[g_mobo_to_version_lut["Better"]  ,0,2,"VM16","F2STORNADO"],
+	"Proxinator-VM16-Turbo":			[g_mobo_to_version_lut["Best"]  ,0,2,"VM16","F2STORNADO"],
+
+	"Proxinator-VM32-Base":				[g_mobo_to_version_lut["Good"]  ,0,4,"VM32","F2STORNADO"],
+	"Proxinator-VM32-Enhanced":			[g_mobo_to_version_lut["Better"]  ,0,4,"VM32","F2STORNADO"],
+	"Proxinator-VM32-Turbo":			[g_mobo_to_version_lut["Best"]  ,0,4,"VM32","F2STORNADO"],
+
 	"Destroyinator-AV15-Enhanced":		[g_mobo_to_version_lut["Enhanced"],0,1,"AV15","DESTROYINATOR"],
 	"Destroyinator-AV15-Enhanced-S":	[g_mobo_to_version_lut["Enhanced-S"],0,1,"AV15","DESTROYINATOR"],
 	"Destroyinator-Q30-Enhanced":		[g_mobo_to_version_lut["Enhanced"]  ,0,2,"Q30","DESTROYINATOR"],