From 82a0de3ebb09ddb042a6036dc9dc332789ef068f Mon Sep 17 00:00:00 2001
From: pv2b <per.von.zweigbergk@cag.se>
Date: Wed, 23 Aug 2023 18:00:11 +0200
Subject: [PATCH] Improvements to HPE Synergy 12000 and related devices/models
 (#1545)

* Rename incorrectly named Gen10 to Gen10 Plus

* Add Synergy 480 Gen10

* Properly modularize Synergy 12000 Frame

* Add Synergy Composer2

* Add Synergy 50Gb ILM

* Remove spurious "HPE" from model names

* Fix part number

* Fix module name

* Add VC SE 100Gb F32 Module for Synergy

* Add Synergy 4-port Frame Link Module

* Add QuickSpecs links

* Add weight and airflow info

* Add power supply

* Fix link syntax

* Fix airflow

* Fix interface names

* Added weight for Composer2 appliance

* End-of-fille fixes

* End-of-fille fixes

* Fix position type (was integer, change to string)

* Fix yaml string quoting

* Remove spurious console ports

* Synergy Frame 12000 Change Appliance, Interconnect, and Frame Link into devices not modules

* Convert synergy modules into devices

* Slug fixes

* Add Management and iLO interfaces
---
 device-types/HPE/Synergy-12000-Frame.yaml     | 88 ++++++-------------
 .../HPE/Synergy-4-port-Frame-Link-Module.yaml | 22 +++++
 device-types/HPE/Synergy-480-Gen10-Plus.yaml  | 11 +++
 device-types/HPE/Synergy-480-Gen10.yaml       |  5 +-
 ...Synergy-50Gb-Interconnect-Link-Module.yaml | 17 ++++
 ...ynergy-Composer2-Management-Appliance.yaml | 17 ++++
 ...nnect-SE-100Gb-F32-Module-for-Synergy.yaml | 46 ++++++++++
 ...tts-Titanium-Hot-Plug-AC-Power-Supply.yaml | 10 +++
 8 files changed, 156 insertions(+), 60 deletions(-)
 create mode 100644 device-types/HPE/Synergy-4-port-Frame-Link-Module.yaml
 create mode 100644 device-types/HPE/Synergy-480-Gen10-Plus.yaml
 create mode 100644 device-types/HPE/Synergy-50Gb-Interconnect-Link-Module.yaml
 create mode 100644 device-types/HPE/Synergy-Composer2-Management-Appliance.yaml
 create mode 100644 device-types/HPE/Virtual-Connect-SE-100Gb-F32-Module-for-Synergy.yaml
 create mode 100644 module-types/HPE/Synergy-12000-2650-Watts-Titanium-Hot-Plug-AC-Power-Supply.yaml

diff --git a/device-types/HPE/Synergy-12000-Frame.yaml b/device-types/HPE/Synergy-12000-Frame.yaml
index 92e5f6e1..716d7d90 100644
--- a/device-types/HPE/Synergy-12000-Frame.yaml
+++ b/device-types/HPE/Synergy-12000-Frame.yaml
@@ -2,68 +2,19 @@
 manufacturer: HPE
 model: Synergy 12000 Frame
 slug: hpe-synergy-12000-frame
+comments: '[QuickSpecs](https://www.hpe.com/psnow/doc/c04815113)'
 part_number: P06011-B21
 u_height: 10
 is_full_depth: true
 subdevice_role: parent
+airflow: front-to-rear
+# Weight refers to empty frame populated with 10 fan modules (not modelled)
+weight: 82
+weight_unit: kg
 interfaces:
-  - name: FLM1
+  - name: Front Panel Console
     type: 1000base-t
     mgmt_only: true
-  - name: FLM2
-    type: 1000base-t
-    mgmt_only: true
-  - name: Interconnect3, Q1:1
-    type: 16gfc-sfpp
-  - name: Interconnect3, Q1:2
-    type: 16gfc-sfpp
-  - name: Interconnect3, Q1:3
-    type: 16gfc-sfpp
-  - name: Interconnect3, Q1:4
-    type: 16gfc-sfpp
-  - name: Interconnect3, Q5:1
-    type: 16gfc-sfpp
-  - name: Interconnect3, Q5:2
-    type: 16gfc-sfpp
-  - name: Interconnect3, Q5:3
-    type: 16gfc-sfpp
-  - name: Interconnect3, Q5:4
-    type: 16gfc-sfpp
-  - name: Interconnect6, Q1:1
-    type: 16gfc-sfpp
-  - name: Interconnect6, Q1:2
-    type: 16gfc-sfpp
-  - name: Interconnect6, Q1:3
-    type: 16gfc-sfpp
-  - name: Interconnect6, Q1:4
-    type: 16gfc-sfpp
-  - name: Interconnect6, Q5:1
-    type: 16gfc-sfpp
-  - name: Interconnect6, Q5:2
-    type: 16gfc-sfpp
-  - name: Interconnect6, Q5:3
-    type: 16gfc-sfpp
-  - name: Interconnect6, Q5:4
-    type: 16gfc-sfpp
-power-ports:
-  - name: PS1
-    type: iec-60320-c20
-    maximum_draw: 2650
-  - name: PS2
-    type: iec-60320-c20
-    maximum_draw: 2650
-  - name: PS3
-    type: iec-60320-c20
-    maximum_draw: 2650
-  - name: PS4
-    type: iec-60320-c20
-    maximum_draw: 2650
-  - name: PS5
-    type: iec-60320-c20
-    maximum_draw: 2650
-  - name: PS6
-    type: iec-60320-c20
-    maximum_draw: 2650
 device-bays:
   - name: Device Bay 1
   - name: Device Bay 2
@@ -77,7 +28,26 @@ device-bays:
   - name: Device Bay 10
   - name: Device Bay 11
   - name: Device Bay 12
-  - name: Device Bay 13
-  - name: Device Bay 14
-  - name: Device Bay 15
-  - name: Device Bay 16
+  - name: Appliance Bay 1
+  - name: Appliance Bay 2
+  - name: Interconnect Bay 1
+  - name: Interconnect Bay 2
+  - name: Interconnect Bay 3
+  - name: Interconnect Bay 4
+  - name: Interconnect Bay 5
+  - name: Interconnect Bay 6
+  - name: Frame Link Module 1
+  - name: Frame Link Module 2
+module-bays:
+  - name: Power Supply 1
+    position: '1'
+  - name: Power Supply 2
+    position: '2'
+  - name: Power Supply 3
+    position: '3'
+  - name: Power Supply 4
+    position: '4'
+  - name: Power Supply 5
+    position: '5'
+  - name: Power Supply 6
+    position: '6'
diff --git a/device-types/HPE/Synergy-4-port-Frame-Link-Module.yaml b/device-types/HPE/Synergy-4-port-Frame-Link-Module.yaml
new file mode 100644
index 00000000..3b51723e
--- /dev/null
+++ b/device-types/HPE/Synergy-4-port-Frame-Link-Module.yaml
@@ -0,0 +1,22 @@
+---
+manufacturer: HPE
+model: Synergy 4-port Frame Link Module
+slug: hpe-synergy-4-port-frame-link-module
+comments: '[QuickSpecs](https://www.hpe.com/psnow/doc/a00030303enw)'
+part_number: 876852-B21
+weight: 1
+weight_unit: kg
+u_height: 0
+subdevice_role: child
+console-ports:
+  - name: Console
+    type: usb-c
+interfaces:
+  - name: MGMT
+    type: 10gbase-x-sfpp
+  - name: LINK
+    type: 10gbase-x-sfpp
+  - name: Appliance 1
+    type: 10gbase-x-sfpp
+  - name: Appliance 2
+    type: 10gbase-x-sfpp
diff --git a/device-types/HPE/Synergy-480-Gen10-Plus.yaml b/device-types/HPE/Synergy-480-Gen10-Plus.yaml
new file mode 100644
index 00000000..7ea56096
--- /dev/null
+++ b/device-types/HPE/Synergy-480-Gen10-Plus.yaml
@@ -0,0 +1,11 @@
+---
+manufacturer: HPE
+model: Synergy 480 Gen10-Plus
+slug: hpe-synergy-480-gen10-plus
+comments: '[QuickSpecs](https://www.hpe.com/psnow/doc/a50004318enw)'
+part_number: P22139-B21
+u_height: 0
+is_full_depth: true
+subdevice_role: child
+weight: 8
+weight_unit: kg
diff --git a/device-types/HPE/Synergy-480-Gen10.yaml b/device-types/HPE/Synergy-480-Gen10.yaml
index 303e433d..89bc62a4 100644
--- a/device-types/HPE/Synergy-480-Gen10.yaml
+++ b/device-types/HPE/Synergy-480-Gen10.yaml
@@ -2,7 +2,10 @@
 manufacturer: HPE
 model: Synergy 480 Gen10
 slug: hpe-synergy-480-gen10
-part_number: P22139-B21
+comments: '[QuickSpecs](https://www.hpe.com/psnow/doc/a00008520enw)'
+part_number: 871940-B21
 u_height: 0
 is_full_depth: true
 subdevice_role: child
+weight: 8
+weight_unit: kg
diff --git a/device-types/HPE/Synergy-50Gb-Interconnect-Link-Module.yaml b/device-types/HPE/Synergy-50Gb-Interconnect-Link-Module.yaml
new file mode 100644
index 00000000..b157d44c
--- /dev/null
+++ b/device-types/HPE/Synergy-50Gb-Interconnect-Link-Module.yaml
@@ -0,0 +1,17 @@
+---
+manufacturer: HPE
+model: Synergy 50Gb Interconnect Link Module
+slug: hpe-synergy-50gb-interconnect-link-module
+comments: '[QuickSpecs](https://www.hpe.com/psnow/doc/a00067743enw)'
+part_number: 867793-B21
+weight: 3
+weight_unit: kg
+u_height: 0
+subdevice_role: child
+interfaces:
+  - name: L1
+    description: CXP28 (300 Gb/s Interconnect Link)
+    type: other
+  - name: L2
+    description: CXP28 (300 Gb/s Interconnect Link)
+    type: other
diff --git a/device-types/HPE/Synergy-Composer2-Management-Appliance.yaml b/device-types/HPE/Synergy-Composer2-Management-Appliance.yaml
new file mode 100644
index 00000000..86196dac
--- /dev/null
+++ b/device-types/HPE/Synergy-Composer2-Management-Appliance.yaml
@@ -0,0 +1,17 @@
+---
+manufacturer: HPE
+model: Synergy Composer2 Management Appliance
+slug: hpe-synergy-composer2-management-appliance
+comments: '[QuickSpecs](https://psnow.ext.hpe.com/doc/c04815139)'
+part_number: 872957-B21
+weight: 1400
+weight_unit: g
+u_height: 0
+subdevice_role: child
+interfaces:
+  - name: Management
+    type: virtual
+    mgmt_only: true
+  - name: iLO
+    type: virtual
+    mgmt_only: true
diff --git a/device-types/HPE/Virtual-Connect-SE-100Gb-F32-Module-for-Synergy.yaml b/device-types/HPE/Virtual-Connect-SE-100Gb-F32-Module-for-Synergy.yaml
new file mode 100644
index 00000000..70a76164
--- /dev/null
+++ b/device-types/HPE/Virtual-Connect-SE-100Gb-F32-Module-for-Synergy.yaml
@@ -0,0 +1,46 @@
+---
+manufacturer: HPE
+model: Virtual Connect SE 100Gb F32 Module for Synergy
+slug: hpe-virtual-connect-se-100gb-f32-module-for-synergy
+comments: '[QuickSpecs](https://www.hpe.com/psnow/doc/a00067745enw)'
+part_number: 867796-B21
+weight: 5
+weight_unit: kg
+u_height: 0
+subdevice_role: child
+interfaces:
+  - name: interconnect {module}, L1
+    description: CXP28 (300 Gb/s Interconnect Link)
+    type: other
+  - name: interconnect {module}, L2
+    description: CXP28 (300 Gb/s Interconnect Link)
+    type: other
+  - name: interconnect {module}, L3
+    description: CXP28 (300 Gb/s Interconnect Link)
+    type: other
+  - name: interconnect {module}, L4
+    description: CXP28 (300 Gb/s Interconnect Link)
+    type: other
+  - name: interconnect {module}, Q1
+    type: 50gbase-x-sfp28
+  - name: interconnect {module}, Q2
+    type: 50gbase-x-sfp28
+  - name: interconnect {module}, Q3
+    type: 50gbase-x-sfp28
+  - name: interconnect {module}, Q4
+    type: 50gbase-x-sfp28
+  - name: interconnect {module}, Q5
+    type: 50gbase-x-sfp28
+  - name: interconnect {module}, Q6
+    type: 50gbase-x-sfp28
+  - name: interconnect {module}, Q7
+    type: 50gbase-x-sfp28
+  - name: interconnect {module}, Q8
+    type: 50gbase-x-sfp28
+  - name: interconnect {module}, X1
+    type: 10gbase-x-sfpp
+  - name: interconnect {module}, X2
+    type: 10gbase-x-sfpp
+console-ports:
+  - name: interconnect {module}, Serial Console
+    type: usb-micro-b
diff --git a/module-types/HPE/Synergy-12000-2650-Watts-Titanium-Hot-Plug-AC-Power-Supply.yaml b/module-types/HPE/Synergy-12000-2650-Watts-Titanium-Hot-Plug-AC-Power-Supply.yaml
new file mode 100644
index 00000000..26465f6e
--- /dev/null
+++ b/module-types/HPE/Synergy-12000-2650-Watts-Titanium-Hot-Plug-AC-Power-Supply.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: HPE
+model: Synergy 12000 2650 Watts Titanium Hot Plug AC Power Supply
+part_number: 798095-B21
+weight: 2
+weight_unit: kg
+power-ports:
+  - name: PS {module}
+    type: iec-60320-c20
+    maximum_draw: 2882
-- 
GitLab