updated all instances of 2UTM for F2 as the new Stornado was renamed …

…to Stornado F2

CHANGELOG.md

@@ -1,3 +1,3 @@
-## 45drives-tools 3.0.1-2
+## 45drives-tools 3.0.1-3
 
-* added another field in loadtest script to check for hard drive model
+* changed all instances of 2UTM to F2 for new Stornado server

dalias/dalias

@@ -142,7 +142,7 @@ def get_confirmation(alias_dict):
 	print(" {w}Confirmation {e}".format(w=ANSI_colors["WHITE"],e=ANSI_colors["END"]))
 	print("{s:{c}^{l}}".format(s="-",l=80,c="-"))
 	confirmation = input("\nWould you like to create/replace {w}{f}{e} and trigger udev rules? (y/n): ".format(f=default_path,w=ANSI_colors["WHITE"],e=ANSI_colors["END"]))
-	if confirmation != "y": sys.exit(1)
+	if confirmation not in ["y","Y"]: sys.exit(1)
 
 	# generate vdev_id.conf content
 	file_content = "# This file was generated using dalias ({v})\n".format(v=dalias_version)

manifest.json

@@ -4,7 +4,7 @@
     "title": "45drives-tools",
     "prerelease": true,
     "version": "3.0.1",
-    "buildVersion": "2",
+    "buildVersion": "3",
     "author": "Mark Hooper <mhooper@45drives.com>",
     "url": "https://github.com/45Drives/tools",
     "category": "utils",
@@ -66,7 +66,7 @@
     "changelog": {
         "urgency": "medium",
         "version": "3.0.1",
-        "buildVersion": "2",
+        "buildVersion": "3",
         "ignore": [],
         "date": null,
         "packager": "Mark Hooper <mhooper@45drives.com>",

packaging/el7/main.spec

@@ -58,6 +58,8 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Thu Nov 16 2023 Mark Hooper <mhooper@45drives.com> 3.0.1-3
+- changed all instances of 2UTM to F2 for new Stornado server
 * Fri Oct 06 2023 Mark Hooper <mhooper@45drives.com> 3.0.1-2
 - added another field in loadtest script to check for hard drive model
 * Wed Oct 04 2023 Mark Hooper <mhooper@45drives.com> 3.0.1-1

packaging/el8/main.spec

@@ -63,6 +63,8 @@ fi
 /usr/lib/udev/rules.d/*
 
 %changelog
+* Thu Nov 16 2023 Mark Hooper <mhooper@45drives.com> 3.0.1-3
+- changed all instances of 2UTM to F2 for new Stornado server
 * Fri Oct 06 2023 Mark Hooper <mhooper@45drives.com> 3.0.1-2
 - added another field in loadtest script to check for hard drive model
 * Wed Oct 04 2023 Mark Hooper <mhooper@45drives.com> 3.0.1-1

packaging/focal/changelog

@@ -1,3 +1,9 @@
+45drives-tools (3.0.1-3focal) focal; urgency=medium
+
+  * changed all instances of 2UTM to F2 for new Stornado server
+
+ -- Mark Hooper <mhooper@45drives.com>  Thu, 16 Nov 2023 05:38:32 -0400
+
 45drives-tools (3.0.1-2focal) focal; urgency=medium
 
   * added another field in loadtest script to check for hard drive model

tools/dmap

@@ -437,8 +437,8 @@ def create_vdev_id(server):
 		"2USTORNADO":{
 			"2U":[16,16]
 		},
-		"2UTMSTORNADO":{
-			"2UTM":[8,8,8,8]
+		"F2STORNADO":{
+			"F2":[8,8,8,8]
 		},
 		"AV15-BASE":{
 			"AV15":[0]

tools/lsdev

@@ -307,8 +307,8 @@ def build_server(options):
 		"2USTORNADO":{
 			"2U":[32]
 		},
-		"2UTMSTORNADO":{
-			"2UTM":[32]
+		"F2STORNADO":{
+			"F2":[32]
 		},
 		"AV15-BASE":{
 			"AV15":[15]
@@ -639,7 +639,7 @@ def print_bays(server, options, osd, server_info):
 	table_print(ansi = options.colour, c_count = len(print_array), c_txt = print_array, c_labels = col_headers, h_txt = header_text, padding = 1)
 
 	# legend
-	if "Alias Style" in server_info.keys() and server_info["Alias Style"] not in ["2USTORNADO","2UTMSTORNADO"]:
+	if "Alias Style" in server_info.keys() and server_info["Alias Style"] not in ["2USTORNADO","F2STORNADO"]:
 		print(" <-- motherboard | front plate -->")
 	print(" Legend:")
 	if options.colour:

tools/server_identifier

@@ -21,7 +21,7 @@ g_product_lut_idx = {
 	"ALIAS_STYLE":	4
 }
 
-g_chassis_sizes = ["?","AV15","Q30","S45","XL60","F8X1","F8X2","F8X3","2U","2UGW","2UTM","HL15"]
+g_chassis_sizes = ["?","AV15","Q30","S45","XL60","F8X1","F8X2","F8X3","2U","2UGW","F2","HL15"]
 
 g_mobo_to_version_lut = {
 	"Base": ["X11SSH-CTF","X11SSM-F"],
@@ -192,11 +192,11 @@ g_product_lut = {
 	"Stornado-2U-Turbo-G":				[g_mobo_to_version_lut["Turbo-G"]  ,0,2,"2U","2USTORNADO"],
 	"Stornado-2U-Turbo":				[g_mobo_to_version_lut["Turbo"]  ,0,2,"2U","2USTORNADO"],
 
-	"Stornado-2UTM-Base-B":				[g_mobo_to_version_lut["Base-B"]  ,0,4,"2UTM","2UTMSTORNADO"],
-	"Stornado-2UTM-Enhanced-AMD":		[g_mobo_to_version_lut["Enhanced-AMD"]  ,0,4,"2UTM","2UTMSTORNADO"],
-	"Stornado-2UTM-Enhanced-S":			[g_mobo_to_version_lut["Enhanced-S"]  ,0,4,"2UTM","2UTMSTORNADO"],
-	"Stornado-2UTM-Turbo-G":			[g_mobo_to_version_lut["Turbo-G"]  ,0,4,"2UTM","2UTMSTORNADO"],
-	"Stornado-2UTM-Turbo":				[g_mobo_to_version_lut["Turbo"]  ,0,4,"2UTM","2UTMSTORNADO"],
+	"Stornado-F2-Base-B":				[g_mobo_to_version_lut["Base-B"]  ,0,4,"F2","F2STORNADO"],
+	"Stornado-F2-Enhanced-AMD":			[g_mobo_to_version_lut["Enhanced-AMD"]  ,0,4,"F2","F2STORNADO"],
+	"Stornado-F2-Enhanced-S":			[g_mobo_to_version_lut["Enhanced-S"]  ,0,4,"F2","F2STORNADO"],
+	"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"],
 
 	"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"],
@@ -887,7 +887,7 @@ def main():
 	server["Alias Style"] = g_product_lut[server["Model"]][g_product_lut_idx["ALIAS_STYLE"]]
 
 	# set auto alias flag for servers that are automatically aliased using udev rules.
-	if server["Alias Style"] in ["2UTMSTORNADO"]:
+	if server["Alias Style"] in ["F2STORNADO"]:
 		server["Auto Alias"] = True
 
 	# This is added to use only a single chassis size for the Stornado