From 872d24d9fdd6ba0ab8514dc913e73f56d85c7046 Mon Sep 17 00:00:00 2001
From: pv2b <per.von.zweigbergk@cag.se>
Date: Wed, 23 Aug 2023 17:26:28 +0200
Subject: [PATCH] Improvements to HPE Aruba 2920 series (#1547)
* Fix incorrect part number for HPE Aruba 2920-24G-PoE+
* Fix power figures
* Added Aruba 2920-48G-PoE+-740W model
* Add weight info
* Added module bays
* Added HPE 2920 series modules
* Added missing comments field
* Fix trailing spaces
* Fix part number
* Add missing quotes
* Fix part number
* Add XPS port and replace PS1 port with power supply module slot
* Add HPE J9737A, J9738A, J9739A, power supplies
* Add position number to 2920 series PSU module bay
* Add Aruba 640 Redundant/External Power Supply Shelf
* Add missing quotes around position number
* Make PS1 modular and add XPS port
* Add quotes around position number
* Typo fixes
* Fix quotes
---------
Co-authored-by: Daniel W. Anner <daniel.anner@danstechsupport.com>
---
device-types/HPE/Aruba-2920-24G-PoEP.yml | 16 ++-
device-types/HPE/Aruba-2920-24G.yaml | 18 ++-
.../HPE/Aruba-2920-48G-PoEP-740W.yaml | 127 ++++++++++++++++++
device-types/HPE/Aruba-2920-48G-PoEP.yaml | 18 ++-
device-types/HPE/Aruba-2920-48G.yaml | 18 ++-
device-types/HPE/J9805A.yaml | 39 ++++++
module-types/HPE/J9731A.yaml | 10 ++
module-types/HPE/J9732A.yaml | 10 ++
module-types/HPE/J9733A.yaml | 10 ++
module-types/HPE/J9737A.yaml | 8 ++
module-types/HPE/J9738A.yaml | 8 ++
module-types/HPE/J9739A.yaml | 8 ++
12 files changed, 275 insertions(+), 15 deletions(-)
create mode 100644 device-types/HPE/Aruba-2920-48G-PoEP-740W.yaml
create mode 100644 device-types/HPE/J9805A.yaml
create mode 100644 module-types/HPE/J9731A.yaml
create mode 100644 module-types/HPE/J9732A.yaml
create mode 100644 module-types/HPE/J9733A.yaml
create mode 100644 module-types/HPE/J9737A.yaml
create mode 100644 module-types/HPE/J9738A.yaml
create mode 100644 module-types/HPE/J9739A.yaml
diff --git a/device-types/HPE/Aruba-2920-24G-PoEP.yml b/device-types/HPE/Aruba-2920-24G-PoEP.yml
index a4d61945..b4aed1f9 100644
--- a/device-types/HPE/Aruba-2920-24G-PoEP.yml
+++ b/device-types/HPE/Aruba-2920-24G-PoEP.yml
@@ -2,12 +2,14 @@
manufacturer: HPE
model: Aruba 2920-24G-PoE+
slug: hpe-aruba-2920-24g-poep
-part_number: 9727AJ
+part_number: J9727A
u_height: 1
is_full_depth: false
+weight: 5460
+weight_unit: g
power-ports:
- - name: PS1
- type: iec-60320-c14
+ - name: XPS
+ type: dc-terminal
maximum_draw: 475
allocated_draw: 42
console-ports:
@@ -67,3 +69,11 @@ interfaces:
type: 1000base-t
- name: '24'
type: 1000base-t
+module-bays:
+ - name: Module A
+ position: A
+ - name: Module B
+ position: B
+ - name: Stacking Module
+ - name: Power Supply
+ position: '1'
diff --git a/device-types/HPE/Aruba-2920-24G.yaml b/device-types/HPE/Aruba-2920-24G.yaml
index 7e6f1ffe..132944ae 100644
--- a/device-types/HPE/Aruba-2920-24G.yaml
+++ b/device-types/HPE/Aruba-2920-24G.yaml
@@ -5,11 +5,13 @@ slug: hpe-aruba-2920-24g
part_number: J9726A
u_height: 1
is_full_depth: false
+weight: 5250
+weight_unit: g
power-ports:
- - name: PS1
- type: iec-60320-c14
- maximum_draw: 165
- allocated_draw: 58
+ - name: XPS
+ type: dc-terminal
+ maximum_draw: 58
+ allocated_draw: 26
console-ports:
- name: Console
type: rj-45
@@ -67,3 +69,11 @@ interfaces:
type: 1000base-t
- name: '24'
type: 1000base-t
+module-bays:
+ - name: Module A
+ position: A
+ - name: Module B
+ position: B
+ - name: Stacking Module
+ - name: Power Supply
+ position: '1'
diff --git a/device-types/HPE/Aruba-2920-48G-PoEP-740W.yaml b/device-types/HPE/Aruba-2920-48G-PoEP-740W.yaml
new file mode 100644
index 00000000..5915b0d6
--- /dev/null
+++ b/device-types/HPE/Aruba-2920-48G-PoEP-740W.yaml
@@ -0,0 +1,127 @@
+---
+manufacturer: HPE
+model: Aruba 2920-48G-PoE+-740W
+slug: hpe-aruba-2920-48g-poep-740w
+part_number: J9836A
+u_height: 1
+is_full_depth: false
+weight: 5830
+weight_unit: g
+power-ports:
+ - name: XPS
+ type: dc-terminal
+ maximum_draw: 881
+ allocated_draw: 52
+console-ports:
+ - name: Console
+ type: rj-45
+ - name: USB Console
+ type: usb-micro-b
+interfaces:
+ - name: Management
+ type: 1000base-t
+ mgmt_only: true
+ - name: '1'
+ type: 1000base-t
+ - name: '2'
+ type: 1000base-t
+ - name: '3'
+ type: 1000base-t
+ - name: '4'
+ type: 1000base-t
+ - name: '5'
+ type: 1000base-t
+ - name: '6'
+ type: 1000base-t
+ - name: '7'
+ type: 1000base-t
+ - name: '8'
+ type: 1000base-t
+ - name: '9'
+ type: 1000base-t
+ - name: '10'
+ type: 1000base-t
+ - name: '11'
+ type: 1000base-t
+ - name: '12'
+ type: 1000base-t
+ - name: '13'
+ type: 1000base-t
+ - name: '14'
+ type: 1000base-t
+ - name: '15'
+ type: 1000base-t
+ - name: '16'
+ type: 1000base-t
+ - name: '17'
+ type: 1000base-t
+ - name: '18'
+ type: 1000base-t
+ - name: '19'
+ type: 1000base-t
+ - name: '20'
+ type: 1000base-t
+ - name: '21'
+ type: 1000base-t
+ - name: '22'
+ type: 1000base-t
+ - name: '23'
+ type: 1000base-t
+ - name: '24'
+ type: 1000base-t
+ - name: '25'
+ type: 1000base-t
+ - name: '26'
+ type: 1000base-t
+ - name: '27'
+ type: 1000base-t
+ - name: '28'
+ type: 1000base-t
+ - name: '29'
+ type: 1000base-t
+ - name: '30'
+ type: 1000base-t
+ - name: '31'
+ type: 1000base-t
+ - name: '32'
+ type: 1000base-t
+ - name: '33'
+ type: 1000base-t
+ - name: '34'
+ type: 1000base-t
+ - name: '35'
+ type: 1000base-t
+ - name: '36'
+ type: 1000base-t
+ - name: '37'
+ type: 1000base-t
+ - name: '38'
+ type: 1000base-t
+ - name: '39'
+ type: 1000base-t
+ - name: '40'
+ type: 1000base-t
+ - name: '41'
+ type: 1000base-t
+ - name: '42'
+ type: 1000base-t
+ - name: '43'
+ type: 1000base-t
+ - name: '44'
+ type: 1000base-t
+ - name: '45'
+ type: 1000base-t
+ - name: '46'
+ type: 1000base-t
+ - name: '47'
+ type: 1000base-t
+ - name: '48'
+ type: 1000base-t
+module-bays:
+ - name: Module A
+ position: A
+ - name: Module B
+ position: B
+ - name: Stacking Module
+ - name: Power Supply
+ position: '1'
diff --git a/device-types/HPE/Aruba-2920-48G-PoEP.yaml b/device-types/HPE/Aruba-2920-48G-PoEP.yaml
index 384ce938..bab23205 100644
--- a/device-types/HPE/Aruba-2920-48G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2920-48G-PoEP.yaml
@@ -5,11 +5,13 @@ slug: hpe-aruba-2920-48g-poep
part_number: J9729A
u_height: 1
is_full_depth: false
+weight: 5700
+weight_unit: g
power-ports:
- - name: PS1
- type: iec-60320-c14
- maximum_draw: 575
- allocated_draw: 487
+ - name: XPS
+ type: dc-terminal
+ maximum_draw: 487
+ allocated_draw: 46
console-ports:
- name: Console
type: rj-45
@@ -115,3 +117,11 @@ interfaces:
type: 1000base-t
- name: '48'
type: 1000base-t
+module-bays:
+ - name: Module A
+ position: A
+ - name: Module B
+ position: B
+ - name: Stacking Module
+ - name: Power Supply
+ position: '1'
diff --git a/device-types/HPE/Aruba-2920-48G.yaml b/device-types/HPE/Aruba-2920-48G.yaml
index a991e56c..a074160f 100644
--- a/device-types/HPE/Aruba-2920-48G.yaml
+++ b/device-types/HPE/Aruba-2920-48G.yaml
@@ -5,11 +5,13 @@ slug: hpe-aruba-2920-48g
part_number: J9728A
u_height: 1
is_full_depth: false
+weight: 5420
+weight_unit: g
power-ports:
- - name: PS1
- type: iec-60320-c14
- maximum_draw: 165
- allocated_draw: 70
+ - name: XPS
+ type: dc-terminal
+ maximum_draw: 70
+ allocated_draw: 27
console-ports:
- name: Console
type: rj-45
@@ -115,3 +117,11 @@ interfaces:
type: 1000base-t
- name: '48'
type: 1000base-t
+module-bays:
+ - name: Module A
+ position: A
+ - name: Module B
+ position: B
+ - name: Stacking Module
+ - name: Power Supply
+ position: '1'
diff --git a/device-types/HPE/J9805A.yaml b/device-types/HPE/J9805A.yaml
new file mode 100644
index 00000000..6f3657a1
--- /dev/null
+++ b/device-types/HPE/J9805A.yaml
@@ -0,0 +1,39 @@
+---
+manufacturer: HPE
+model: Aruba 640 Redundant/External Power Supply Shelf
+slug: hpe-aruba-640-redundant-external-power-supply-shelf
+part_number: J9805A
+u_height: 1
+is_full_depth: false
+module-bays:
+ - name: Power Supply 1
+ position: '1'
+ - name: Power Supply 2
+ position: '2'
+ - name: Power Supply 3
+ position: '3'
+power-outlets:
+ - name: 1A
+ power_port: PS1
+ type: dc-terminal
+ - name: 1B
+ power_port: PS1
+ type: dc-terminal
+ - name: 1C
+ power_port: PS1
+ type: dc-terminal
+ - name: 1D
+ power_port: PS1
+ type: dc-terminal
+ - name: 2A
+ power_port: PS2
+ type: dc-terminal
+ - name: 2B
+ power_port: PS2
+ type: dc-terminal
+ - name: 3A
+ power_port: PS3
+ type: dc-terminal
+ - name: 3B
+ power_port: PS3
+ type: dc-terminal
diff --git a/module-types/HPE/J9731A.yaml b/module-types/HPE/J9731A.yaml
new file mode 100644
index 00000000..8f853a53
--- /dev/null
+++ b/module-types/HPE/J9731A.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: HPE
+model: Aruba 2920 2-Port 10GbE SFP+ Module
+comments: Aruba 2920 2-Port 10GbE SFP+ Module
+part_number: J9731A
+interfaces:
+ - name: '{module}1'
+ type: 10gbase-x-sfpp
+ - name: '{module}2'
+ type: 10gbase-x-sfpp
diff --git a/module-types/HPE/J9732A.yaml b/module-types/HPE/J9732A.yaml
new file mode 100644
index 00000000..cd043834
--- /dev/null
+++ b/module-types/HPE/J9732A.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: HPE
+model: Aruba 2920 2-Port 10GBASE-T Module
+comments: Aruba 2920 2-Port 10GBASE-T Module
+part_number: J9732A
+interfaces:
+ - name: '{module}1'
+ type: 10gbase-t
+ - name: '{module}2'
+ type: 10gbase-t
diff --git a/module-types/HPE/J9733A.yaml b/module-types/HPE/J9733A.yaml
new file mode 100644
index 00000000..92f3d8d3
--- /dev/null
+++ b/module-types/HPE/J9733A.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: HPE
+model: Aruba 2920 2-Port Stacking Module
+comments: Aruba 2920 2-Port Stacking Module
+part_number: J9733A
+interfaces:
+ - name: Stacking port 1
+ type: other
+ - name: Stacking port 2
+ type: other
diff --git a/module-types/HPE/J9737A.yaml b/module-types/HPE/J9737A.yaml
new file mode 100644
index 00000000..722f4775
--- /dev/null
+++ b/module-types/HPE/J9737A.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: HPE
+model: HP X332 1050W 110-240VAC to 54VDC Power Supply
+part_number: J9737A
+power-ports:
+ - name: PS{module}
+ type: iec-60320-c16
+ maximum_draw: 1050
diff --git a/module-types/HPE/J9738A.yaml b/module-types/HPE/J9738A.yaml
new file mode 100644
index 00000000..cc023f5b
--- /dev/null
+++ b/module-types/HPE/J9738A.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: HPE
+model: HP X332 575W 100-240VAC to 54VDC Modular Power Supply
+part_number: J9738A
+power-ports:
+ - name: PS{module}
+ type: iec-60320-c16
+ maximum_draw: 575
diff --git a/module-types/HPE/J9739A.yaml b/module-types/HPE/J9739A.yaml
new file mode 100644
index 00000000..dd63fefd
--- /dev/null
+++ b/module-types/HPE/J9739A.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: HPE
+model: HP X331 165W 100-240VAC to 12VDC Modular Power Supply
+part_number: J9739A
+power-ports:
+ - name: PS{module}
+ type: iec-60320-c16
+ maximum_draw: 165
--
GitLab