added the ability to serialize HomeLab-HL15 Servers

45Drives · Oct 4, 2023 · dbebdcf · dbebdcf
1 parent 245b55c
commit dbebdcf
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
-## Serial45d 2.0.1-4
+## Serial45d 3.0.0-1
 
-* added 2UTM chassis size for new stornado
+* added the ability to serialize HomeLab-HL15 Servers
diff --git a/manifest.json b/manifest.json
@@ -3,8 +3,8 @@
  "name": "serial45d",
  "title": "Serial45d",
  "prerelease": true,
- "version": "2.0.1",
- "buildVersion": "4",
+ "version": "3.0.0",
+ "buildVersion": "1",
  "author": "Mark Hooper <mhooper@45drives.com>",
  "url": "https://github.com/45Drives/serial45d",
  "category": "utils",
@@ -52,8 +52,8 @@
  ],
  "changelog": {
  "urgency": "medium",
- "version": "2.0.1",
- "buildVersion": "4",
+ "version": "3.0.0",
+ "buildVersion": "1",
  "ignore": [],
  "date": null,
  "packager": "Mark Hooper <mhooper@45drives.com>",

diff --git a/packaging/el7/main.spec b/packaging/el7/main.spec
@@ -42,6 +42,8 @@ fi
 %{_bindir}/*
 
 %changelog
+* Wed Oct 04 2023 Mark Hooper <mhooper@45drives.com> 3.0.0-1
+- added the ability to serialize HomeLab-HL15 Servers
 * Wed Jul 26 2023 Mark Hooper <mhooper@45drives.com> 2.0.1-4
 - added 2UTM chassis size for new stornado
 * Wed Jul 26 2023 Mark Hooper <mhooper@45drives.com> 2.0.1-3

diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec
@@ -42,6 +42,8 @@ fi
 %{_bindir}/*
 
 %changelog
+* Wed Oct 04 2023 Mark Hooper <mhooper@45drives.com> 3.0.0-1
+- added the ability to serialize HomeLab-HL15 Servers
 * Wed Jul 26 2023 Mark Hooper <mhooper@45drives.com> 2.0.1-4
 - added 2UTM chassis size for new stornado
 * Wed Jul 26 2023 Mark Hooper <mhooper@45drives.com> 2.0.1-3

diff --git a/packaging/focal/changelog b/packaging/focal/changelog
@@ -1,3 +1,9 @@
+serial45d (3.0.0-1focal) focal; urgency=medium
+
+ * added the ability to serialize HomeLab-HL15 Servers
+
+ -- Mark Hooper <mhooper@45drives.com> Wed, 04 Oct 2023 07:14:41 -0300
+
 serial45d (2.0.1-4focal) focal; urgency=medium
 
  * added 2UTM chassis size for new stornado

diff --git a/src/fakeroot/opt/45drives/serial45d/configs/config.txt b/src/fakeroot/opt/45drives/serial45d/configs/config.txt
@@ -45,11 +45,13 @@ Chassis Type:MI4
 Chassis Type:Q30
 Chassis Type:S45
 Chassis Type:XL60
+Chassis Type:HL15
 Product Type:Archivinator
 Product Type:Destroyinator
 Product Type:Gateway
 Product Type:Storinator
 Product Type:Stornado
+Product Type:HomeLab
 Product Name:Archivinator-AV15-Base
 Product Name:Archivinator-AV15-Base-B
 Product Name:Archivinator-Q30-Base
@@ -71,6 +73,7 @@ Product Name:Gateway-2UGW-Base-B
 Product Name:Gateway-2UGW-Enhanced
 Product Name:Gateway-2UGW-Enhanced-S
 Product Name:Gateway-2UGW-Turbo-G
+Product Name:HomeLab-HL15
 Product Name:Storinator-AV15-Base
 Product Name:Storinator-AV15-Base-B
 Product Name:Storinator-AV15-Enhanced

diff --git a/src/fakeroot/opt/45drives/serial45d/serial45d b/src/fakeroot/opt/45drives/serial45d/serial45d
@@ -680,6 +680,16 @@ def assignProductName(auto_detect_fields,fru_fields):
  final_product_str = "unknown"
  unique_product_str_tmp = None
 
+ if "HomeLab" in auto_detect_fields["product_type"]:
+ if "HL15" in auto_detect_fields["part_number"]:
+ confirm = input("\nAuto-Detect determined that the product is a \"{pr}\", is this correct? (y/n): ".format(pr="HomeLab-HL15"))
+ if confirm == "y":
+ # user confirmed final product string to be correct. We're all done.
+ fru_fields["product_name"] = "HomeLab-HL15"
+ fru_fields["version"] = "HomeLab"
+ auto_detect_fields["unique_product_str"] = "HomeLab-HL15"
+ return
+
  # build the product string using the input provided by the user.
  unique_product_str = auto_detect_fields["product_type"] + "-"