added a contingency in server_identifier for 2U Gateway servers.

CHANGELOG.md

@@ -1,3 +1,3 @@
-## 45drives-tools 2.2.2-7
+## 45drives-tools 2.2.2-8
 
-* added a check in server_identifier to ensure that the bus address of a given HBA matches that found in /sys/bus/pci/devices
+* added contingency in server_identifier for 2U Gateway servers

manifest.json

@@ -2,9 +2,9 @@
     "__version": "45D-R1",
     "name": "45drives-tools",
     "title": "45drives-tools",
-    "prerelease": false,
+    "prerelease": true,
     "version": "2.2.2",
-    "buildVersion": "7",
+    "buildVersion": "8",
     "author": "Mark Hooper <mhooper@45drives.com>",
     "url": "https://github.com/45Drives/tools",
     "category": "utils",
@@ -65,7 +65,7 @@
     "changelog": {
         "urgency": "medium",
         "version": "2.2.2",
-        "buildVersion": "7",
+        "buildVersion": "8",
         "ignore": [],
         "date": null,
         "packager": "Mark Hooper <mhooper@45drives.com>",

packaging/el7/main.spec

@@ -55,6 +55,8 @@ fi
 %{_bindir}/*
 
 %changelog
+* Fri Jun 23 2023 Mark Hooper <mhooper@45drives.com> 2.2.2-8
+- added contingency in server_identifier for 2U Gateway servers
 * Tue Jun 13 2023 Mark Hooper <mhooper@45drives.com> 2.2.2-7
 - added a check in server_identifier to ensure that the bus address of a given HBA
   matches that found in /sys/bus/pci/devices

packaging/el8/main.spec

@@ -55,6 +55,8 @@ fi
 %{_bindir}/*
 
 %changelog
+* Fri Jun 23 2023 Mark Hooper <mhooper@45drives.com> 2.2.2-8
+- added contingency in server_identifier for 2U Gateway servers
 * Tue Jun 13 2023 Mark Hooper <mhooper@45drives.com> 2.2.2-7
 - added a check in server_identifier to ensure that the bus address of a given HBA
   matches that found in /sys/bus/pci/devices

packaging/focal/changelog

@@ -1,3 +1,9 @@
+45drives-tools (2.2.2-8focal) focal; urgency=medium
+
+  * added contingency in server_identifier for 2U Gateway servers
+
+ -- Mark Hooper <mhooper@45drives.com>  Fri, 23 Jun 2023 08:01:32 -0300
+
 45drives-tools (2.2.2-7focal) focal; urgency=medium
 
   * added a check in server_identifier to ensure that the bus address of a given

src/fakeroot/opt/45drives/tools/lsdev

@@ -338,6 +338,10 @@ def build_server(options):
 		print("Unable to determine Alias Style from /etc/45drives/server_info/server_info.json: ")
 		print(json.dumps(server_obj,indent=4))
 		exit(1)
+	elif "Chassis Size" in server_obj.keys() and server_obj["Chassis Size"] in ["2UGW"]:
+		print("This program is intended to display disk information for servers with dedicated storage bays.".format(astyle=server_obj["Alias Style"]))
+		print("Use command line utilities such as lsblk to see disk information for Ceph Gateways.".format(astyle=server_obj["Alias Style"]))
+		exit(1)
 	elif server_obj["Alias Style"] not in alias_template.keys():
 		print("Unknown Alias Style '{astyle}' encountered.".format(astyle=server_obj["Alias Style"]))
 		exit(1)

src/fakeroot/opt/45drives/tools/server_identifier

@@ -34,6 +34,12 @@ g_mobo_to_version_lut = {
 }
 
 g_product_lut = {
+	"Gateway-2UGW-Base":				[g_mobo_to_version_lut["Base"],0,0,"2UGW","2UGW"],
+	"Gateway-2UGW-Base-B":				[g_mobo_to_version_lut["Base"],0,0,"2UGW","2UGW"],
+	"Gateway-2UGW-Enhanced":			[g_mobo_to_version_lut["Enhanced"],0,0,"2UGW","2UGW"],
+	"Gateway-2UGW-Enhanced-S":			[g_mobo_to_version_lut["Enhanced"],0,0,"2UGW","2UGW"],
+	"Gateway-2UGW-Turbo-G":				[g_mobo_to_version_lut["Turbo"],0,0,"2UGW","2UGW"],
+
 	"Storinator-AV15-Base":				[g_mobo_to_version_lut["Base"],0,0,"AV15","AV15-BASE"],
 	"Storinator-AV15-Base-B":			[g_mobo_to_version_lut["Base-B"],0,1,"AV15","STORINATOR"],
 	"Storinator-AV15-Enhanced":			[g_mobo_to_version_lut["Enhanced"],0,1,"AV15","STORINATOR"],