From 9df83ad03e761c0ee34058f42b236bc90eeed480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Christopher=20Schn=C3=BCrle?= Date: Mon, 6 Mar 2023 17:12:23 +0100 Subject: [PATCH 01/15] ignore my custom venv dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ca2bab3d3b..8f3eddcf5c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ .DS_Store venv/ .vscode +venv*/ \ No newline at end of file From b7cf7704f997319285ab09f7701716b17bb1649a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Christopher=20Schn=C3=BCrle?= Date: Mon, 6 Mar 2023 17:47:10 +0100 Subject: [PATCH 02/15] Created definition for Intel H2312XXLR2 --- device-types/Intel/H2312XXLR2.yaml | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 device-types/Intel/H2312XXLR2.yaml diff --git a/device-types/Intel/H2312XXLR2.yaml b/device-types/Intel/H2312XXLR2.yaml new file mode 100644 index 0000000000..e6bfe46b16 --- /dev/null +++ b/device-types/Intel/H2312XXLR2.yaml @@ -0,0 +1,32 @@ +--- +manufacturer: Intel +model: H2312XXLR2 +slug: intel-h2312xxlr2 +u_height: 2 +is_full_depth: true +comments: | + [H2312XXLR2 Specifications on intel.com](https://www.intel.com/content/www/us/en/products/sku/87573/intel-server-chassis-h2312xxlr2/specifications.html) +subdevice_role: parent +device-bays: + - name: Node 1 + label: Blade 1 + - name: Node 2 + label: Blade 2 + - name: Node 3 + label: Blade 3 + - name: Node 4 + label: Blade 4 +power-ports: + - name: Power 1 + label: 2130W common redundant power supply (Platinum Efficiency) + type: FXX2130PCRPS + maximum_draw: 2130 + - name: Power 2 + label: 2130W common redundant power supply (Platinum Efficiency) + type: FXX2130PCRPS + maximum_draw: 2130 +inventory-items: + - name: FHW12X35HS12G + label: 12Gb SAS backplane + manufacturer: Intel + part_id: FHW12X35HS12G From 5513d16a05721c63ec655a9db0354fbf444f730a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Christopher=20Schn=C3=BCrle?= Date: Mon, 6 Mar 2023 19:27:48 +0100 Subject: [PATCH 03/15] changed power-ports type to iec-60320-c22 --- device-types/Intel/H2312XXLR2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device-types/Intel/H2312XXLR2.yaml b/device-types/Intel/H2312XXLR2.yaml index e6bfe46b16..e0c4f0d736 100644 --- a/device-types/Intel/H2312XXLR2.yaml +++ b/device-types/Intel/H2312XXLR2.yaml @@ -19,11 +19,11 @@ device-bays: power-ports: - name: Power 1 label: 2130W common redundant power supply (Platinum Efficiency) - type: FXX2130PCRPS + type: iec-60320-c22 maximum_draw: 2130 - name: Power 2 label: 2130W common redundant power supply (Platinum Efficiency) - type: FXX2130PCRPS + type: iec-60320-c22 maximum_draw: 2130 inventory-items: - name: FHW12X35HS12G From fc88985d203cfa5aa9d2e4c8eceb99d844a62aca Mon Sep 17 00:00:00 2001 From: getspaghett <126900975+getspaghett@users.noreply.github.com> Date: Mon, 6 Mar 2023 19:40:04 +0100 Subject: [PATCH 04/15] Delete .gitignore deleted my changed .gitignore --- .gitignore | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8f3eddcf5c..0000000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.pyc -.idea -.DS_Store -venv/ -.vscode -venv*/ \ No newline at end of file From 7959e9ef7ce6e116e762fd62af48a13b25b03fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Christopher=20Schn=C3=BCrle?= Date: Mon, 6 Mar 2023 19:51:10 +0100 Subject: [PATCH 05/15] restored original .gitignore --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8f3eddcf5c..285e505528 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,4 @@ .idea .DS_Store venv/ -.vscode -venv*/ \ No newline at end of file +.vscode \ No newline at end of file From fbab696add7651081e54538bb8b630fb86c793c5 Mon Sep 17 00:00:00 2001 From: getspaghett <126900975+getspaghett@users.noreply.github.com> Date: Mon, 6 Mar 2023 20:02:26 +0100 Subject: [PATCH 06/15] Update .gitignore added new line at end of file --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 285e505528..ca2bab3d3b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ .idea .DS_Store venv/ -.vscode \ No newline at end of file +.vscode From a36454097c7e8a086938e00371cbc63e35c29414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Christopher=20Schn=C3=BCrle?= Date: Tue, 7 Mar 2023 10:51:26 +0100 Subject: [PATCH 07/15] changed power ports type to iec-60320-c14 --- device-types/Intel/H2312XXLR2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device-types/Intel/H2312XXLR2.yaml b/device-types/Intel/H2312XXLR2.yaml index e0c4f0d736..2cc90be15e 100644 --- a/device-types/Intel/H2312XXLR2.yaml +++ b/device-types/Intel/H2312XXLR2.yaml @@ -19,11 +19,11 @@ device-bays: power-ports: - name: Power 1 label: 2130W common redundant power supply (Platinum Efficiency) - type: iec-60320-c22 + type: iec-60320-c14 maximum_draw: 2130 - name: Power 2 label: 2130W common redundant power supply (Platinum Efficiency) - type: iec-60320-c22 + type: iec-60320-c14 maximum_draw: 2130 inventory-items: - name: FHW12X35HS12G From 20738d7dd0eed1624f6ff702eb6d0be039e8a39f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Christopher=20Schn=C3=BCrle?= Date: Thu, 9 Mar 2023 11:18:35 +0100 Subject: [PATCH 08/15] added weight, airflow and changed power-ports to module bays --- device-types/Intel/H2312XXLR2.yaml | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/device-types/Intel/H2312XXLR2.yaml b/device-types/Intel/H2312XXLR2.yaml index 2cc90be15e..068ff8b896 100644 --- a/device-types/Intel/H2312XXLR2.yaml +++ b/device-types/Intel/H2312XXLR2.yaml @@ -3,28 +3,31 @@ manufacturer: Intel model: H2312XXLR2 slug: intel-h2312xxlr2 u_height: 2 +airflow: front-to-rear +weight: + - value: 30.6 # Could not find specific information on the intel site but ChatGPT had apparently indexed this site: https://ark.intel.com/content/www/us/en/ark/products/83627/intel-server-chassis-h2312xxlr2.html + unit: kg is_full_depth: true comments: | [H2312XXLR2 Specifications on intel.com](https://www.intel.com/content/www/us/en/products/sku/87573/intel-server-chassis-h2312xxlr2/specifications.html) + [Intel Server Chassis H2000G Service Guide (PDF)](https://www.intel.com/content/dam/support/us/en/documents/server-products/server-boards/H2000G_SG.pdf) subdevice_role: parent device-bays: - name: Node 1 - label: Blade 1 + label: Compute Node 1 - name: Node 2 - label: Blade 2 + label: Compute Node 2 - name: Node 3 - label: Blade 3 + label: Compute Node 3 - name: Node 4 - label: Blade 4 -power-ports: - - name: Power 1 - label: 2130W common redundant power supply (Platinum Efficiency) - type: iec-60320-c14 - maximum_draw: 2130 - - name: Power 2 - label: 2130W common redundant power supply (Platinum Efficiency) - type: iec-60320-c14 - maximum_draw: 2130 + label: Compute Node 4 +module-bays: + - name: PSU Slot 1 + label: Power Supply 1 + position: lower center rear + - name: PSU Slot 2 + label: Power Supply 2 + position: upper center rear inventory-items: - name: FHW12X35HS12G label: 12Gb SAS backplane From 036d62885f03be8f8bf2ab8ea926fb3b9e25f11c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Christopher=20Schn=C3=BCrle?= Date: Thu, 9 Mar 2023 14:25:59 +0100 Subject: [PATCH 09/15] removed comment --- device-types/Intel/H2312XXLR2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-types/Intel/H2312XXLR2.yaml b/device-types/Intel/H2312XXLR2.yaml index 068ff8b896..98965511f7 100644 --- a/device-types/Intel/H2312XXLR2.yaml +++ b/device-types/Intel/H2312XXLR2.yaml @@ -5,7 +5,7 @@ slug: intel-h2312xxlr2 u_height: 2 airflow: front-to-rear weight: - - value: 30.6 # Could not find specific information on the intel site but ChatGPT had apparently indexed this site: https://ark.intel.com/content/www/us/en/ark/products/83627/intel-server-chassis-h2312xxlr2.html + - value: 30.6 unit: kg is_full_depth: true comments: | From 2f6ec0f2b7a0b8b05014dd5d085a2bc07b105782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Christopher=20Schn=C3=BCrle?= Date: Thu, 9 Mar 2023 14:48:00 +0100 Subject: [PATCH 10/15] created module-types for intel 1600w and 2130w redundant power supplies --- module-types/Intel/FXX1600PCRPS.yaml | 8 ++++++++ module-types/Intel/FXX2130PCRPS.yaml | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 module-types/Intel/FXX1600PCRPS.yaml create mode 100644 module-types/Intel/FXX2130PCRPS.yaml diff --git a/module-types/Intel/FXX1600PCRPS.yaml b/module-types/Intel/FXX1600PCRPS.yaml new file mode 100644 index 0000000000..c7a41e5898 --- /dev/null +++ b/module-types/Intel/FXX1600PCRPS.yaml @@ -0,0 +1,8 @@ +--- +manufacturer: Intel +model: FXX1600PCRPS +power_ports: + - name: PSU + label: 1600W Common Redundant Power Supply FXX1600PCRPS + type: iec-60320-c14 + maximum_draw: 1600 diff --git a/module-types/Intel/FXX2130PCRPS.yaml b/module-types/Intel/FXX2130PCRPS.yaml new file mode 100644 index 0000000000..b7cdf05aa6 --- /dev/null +++ b/module-types/Intel/FXX2130PCRPS.yaml @@ -0,0 +1,8 @@ +--- +manufacturer: Intel +model: FXX2130PCRPS +power_ports: + - name: PSU + label: 2130W AC Common Redundant Power Supply FXX2130PCRPS + type: iec-60320-c14 + maximum_draw: 2130 From 08c3f4cfeebd80d8ea9fc4c3453174b21a01b3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Christopher=20Schn=C3=BCrle?= Date: Thu, 9 Mar 2023 17:25:37 +0100 Subject: [PATCH 11/15] changed weight to fit new schema and changed position on module-bays --- device-types/Intel/H2312XXLR2.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/device-types/Intel/H2312XXLR2.yaml b/device-types/Intel/H2312XXLR2.yaml index 98965511f7..1ac3e0326e 100644 --- a/device-types/Intel/H2312XXLR2.yaml +++ b/device-types/Intel/H2312XXLR2.yaml @@ -4,9 +4,8 @@ model: H2312XXLR2 slug: intel-h2312xxlr2 u_height: 2 airflow: front-to-rear -weight: - - value: 30.6 - unit: kg +weight: 30.6 +weight_unit: kg is_full_depth: true comments: | [H2312XXLR2 Specifications on intel.com](https://www.intel.com/content/www/us/en/products/sku/87573/intel-server-chassis-h2312xxlr2/specifications.html) @@ -24,10 +23,10 @@ device-bays: module-bays: - name: PSU Slot 1 label: Power Supply 1 - position: lower center rear + position: 1 - name: PSU Slot 2 label: Power Supply 2 - position: upper center rear + position: 2 inventory-items: - name: FHW12X35HS12G label: 12Gb SAS backplane From 4f907330ddd9aa22be7bfa3c78baf386ffa9a47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Christopher=20Schn=C3=BCrle?= Date: Thu, 9 Mar 2023 17:27:40 +0100 Subject: [PATCH 12/15] fixed PSU module name to reflect position in device --- module-types/Intel/FXX1600PCRPS.yaml | 2 +- module-types/Intel/FXX2130PCRPS.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module-types/Intel/FXX1600PCRPS.yaml b/module-types/Intel/FXX1600PCRPS.yaml index c7a41e5898..bfd28ff9be 100644 --- a/module-types/Intel/FXX1600PCRPS.yaml +++ b/module-types/Intel/FXX1600PCRPS.yaml @@ -2,7 +2,7 @@ manufacturer: Intel model: FXX1600PCRPS power_ports: - - name: PSU + - name: PSU{module} label: 1600W Common Redundant Power Supply FXX1600PCRPS type: iec-60320-c14 maximum_draw: 1600 diff --git a/module-types/Intel/FXX2130PCRPS.yaml b/module-types/Intel/FXX2130PCRPS.yaml index b7cdf05aa6..bd4f17cb1f 100644 --- a/module-types/Intel/FXX2130PCRPS.yaml +++ b/module-types/Intel/FXX2130PCRPS.yaml @@ -2,7 +2,7 @@ manufacturer: Intel model: FXX2130PCRPS power_ports: - - name: PSU + - name: PSU{module} label: 2130W AC Common Redundant Power Supply FXX2130PCRPS type: iec-60320-c14 maximum_draw: 2130 From 314da60d22e62b480d323385b7d7ea45f7b49d36 Mon Sep 17 00:00:00 2001 From: "Daniel W. Anner" Date: Thu, 9 Mar 2023 11:32:30 -0500 Subject: [PATCH 13/15] Update H2312XXLR2.yaml Fixed position reference --- device-types/Intel/H2312XXLR2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device-types/Intel/H2312XXLR2.yaml b/device-types/Intel/H2312XXLR2.yaml index 1ac3e0326e..aae0d57f80 100644 --- a/device-types/Intel/H2312XXLR2.yaml +++ b/device-types/Intel/H2312XXLR2.yaml @@ -23,10 +23,10 @@ device-bays: module-bays: - name: PSU Slot 1 label: Power Supply 1 - position: 1 + position: '1' - name: PSU Slot 2 label: Power Supply 2 - position: 2 + position: '2' inventory-items: - name: FHW12X35HS12G label: 12Gb SAS backplane From 06f530316c57ae8b7bd9a363102e12c9962852b0 Mon Sep 17 00:00:00 2001 From: "Daniel W. Anner" Date: Thu, 9 Mar 2023 11:36:14 -0500 Subject: [PATCH 14/15] Update FXX1600PCRPS.yaml Fix power-ports reference --- module-types/Intel/FXX1600PCRPS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-types/Intel/FXX1600PCRPS.yaml b/module-types/Intel/FXX1600PCRPS.yaml index bfd28ff9be..f58d085de2 100644 --- a/module-types/Intel/FXX1600PCRPS.yaml +++ b/module-types/Intel/FXX1600PCRPS.yaml @@ -1,7 +1,7 @@ --- manufacturer: Intel model: FXX1600PCRPS -power_ports: +power-ports: - name: PSU{module} label: 1600W Common Redundant Power Supply FXX1600PCRPS type: iec-60320-c14 From c17bed68009479126cb98f1f1234978c674cc1d1 Mon Sep 17 00:00:00 2001 From: "Daniel W. Anner" Date: Thu, 9 Mar 2023 11:36:44 -0500 Subject: [PATCH 15/15] Update FXX2130PCRPS.yaml fix power-ports definition --- module-types/Intel/FXX2130PCRPS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-types/Intel/FXX2130PCRPS.yaml b/module-types/Intel/FXX2130PCRPS.yaml index bd4f17cb1f..82e8cd63a1 100644 --- a/module-types/Intel/FXX2130PCRPS.yaml +++ b/module-types/Intel/FXX2130PCRPS.yaml @@ -1,7 +1,7 @@ --- manufacturer: Intel model: FXX2130PCRPS -power_ports: +power-ports: - name: PSU{module} label: 2130W AC Common Redundant Power Supply FXX2130PCRPS type: iec-60320-c14