diff --git a/module-types/HPE/Aruba-JL087A.yaml b/module-types/HPE/Aruba-JL087A.yaml
new file mode 100644
index 000000000..d56d1dfe4
--- /dev/null
+++ b/module-types/HPE/Aruba-JL087A.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: Aruba JL087A
+part_number: JL087A
+comments: Aruba X372 1050W AC Power Supply
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c14
+    maximum_draw: 1050
diff --git a/module-types/HPE/J4820A.yaml b/module-types/HPE/J4820A.yaml
new file mode 100644
index 000000000..1897494fe
--- /dev/null
+++ b/module-types/HPE/J4820A.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: ProCurve Switch XL 10/100-TX 24-port module
+part_number: J4820A
+comments: ProCurve Switch XL 10/100-TX 24-port module
+interfaces:
+  - name: '{module}1'
+    type: 100base-tx
+  - name: '{module}2'
+    type: 100base-tx
+  - name: '{module}3'
+    type: 100base-tx
+  - name: '{module}4'
+    type: 100base-tx
+  - name: '{module}5'
+    type: 100base-tx
+  - name: '{module}6'
+    type: 100base-tx
+  - name: '{module}7'
+    type: 100base-tx
+  - name: '{module}8'
+    type: 100base-tx
+  - name: '{module}9'
+    type: 100base-tx
+  - name: '{module}10'
+    type: 100base-tx
+  - name: '{module}11'
+    type: 100base-tx
+  - name: '{module}12'
+    type: 100base-tx
+  - name: '{module}13'
+    type: 100base-tx
+  - name: '{module}14'
+    type: 100base-tx
+  - name: '{module}15'
+    type: 100base-tx
+  - name: '{module}16'
+    type: 100base-tx
+  - name: '{module}17'
+    type: 100base-tx
+  - name: '{module}18'
+    type: 100base-tx
+  - name: '{module}19'
+    type: 100base-tx
+  - name: '{module}20'
+    type: 100base-tx
+  - name: '{module}21'
+    type: 100base-tx
+  - name: '{module}22'
+    type: 100base-tx
+  - name: '{module}23'
+    type: 100base-tx
+  - name: '{module}24'
+    type: 100base-tx
diff --git a/module-types/HPE/J4820B.yaml b/module-types/HPE/J4820B.yaml
new file mode 100644
index 000000000..a64fd6bbc
--- /dev/null
+++ b/module-types/HPE/J4820B.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: ProCurve Switch XL 24-Ports 10/100Base-TX Module
+part_number: J4820B
+comments: ProCurve Switch XL 24-Ports 10/100Base-TX Module
+interfaces:
+  - name: '{module}1'
+    type: 100base-tx
+  - name: '{module}2'
+    type: 100base-tx
+  - name: '{module}3'
+    type: 100base-tx
+  - name: '{module}4'
+    type: 100base-tx
+  - name: '{module}5'
+    type: 100base-tx
+  - name: '{module}6'
+    type: 100base-tx
+  - name: '{module}7'
+    type: 100base-tx
+  - name: '{module}8'
+    type: 100base-tx
+  - name: '{module}9'
+    type: 100base-tx
+  - name: '{module}10'
+    type: 100base-tx
+  - name: '{module}11'
+    type: 100base-tx
+  - name: '{module}12'
+    type: 100base-tx
+  - name: '{module}13'
+    type: 100base-tx
+  - name: '{module}14'
+    type: 100base-tx
+  - name: '{module}15'
+    type: 100base-tx
+  - name: '{module}16'
+    type: 100base-tx
+  - name: '{module}17'
+    type: 100base-tx
+  - name: '{module}18'
+    type: 100base-tx
+  - name: '{module}19'
+    type: 100base-tx
+  - name: '{module}20'
+    type: 100base-tx
+  - name: '{module}21'
+    type: 100base-tx
+  - name: '{module}22'
+    type: 100base-tx
+  - name: '{module}23'
+    type: 100base-tx
+  - name: '{module}24'
+    type: 100base-tx
diff --git a/module-types/HPE/J4821A.yaml b/module-types/HPE/J4821A.yaml
new file mode 100644
index 000000000..315132004
--- /dev/null
+++ b/module-types/HPE/J4821A.yaml
@@ -0,0 +1,14 @@
+---
+manufacturer: HPE
+model: HPE 1G 4-Port XL Module
+part_number: J4821A
+comments: HPE 1G 4-Port XL Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-t
+  - name: '{module}2'
+    type: 1000base-t
+  - name: '{module}3'
+    type: 1000base-t
+  - name: '{module}4'
+    type: 1000base-t
diff --git a/module-types/HPE/J4862B.yaml b/module-types/HPE/J4862B.yaml
new file mode 100644
index 000000000..70872297d
--- /dev/null
+++ b/module-types/HPE/J4862B.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: HP ProCurve Switch gl 24-Port 10/100-TX Module
+part_number: J4862B
+comments: HP ProCurve Switch gl 24-Port 10/100-TX Module
+interfaces:
+  - name: '{module}1'
+    type: 100base-tx
+  - name: '{module}2'
+    type: 100base-tx
+  - name: '{module}3'
+    type: 100base-tx
+  - name: '{module}4'
+    type: 100base-tx
+  - name: '{module}5'
+    type: 100base-tx
+  - name: '{module}6'
+    type: 100base-tx
+  - name: '{module}7'
+    type: 100base-tx
+  - name: '{module}8'
+    type: 100base-tx
+  - name: '{module}9'
+    type: 100base-tx
+  - name: '{module}10'
+    type: 100base-tx
+  - name: '{module}11'
+    type: 100base-tx
+  - name: '{module}12'
+    type: 100base-tx
+  - name: '{module}13'
+    type: 100base-tx
+  - name: '{module}14'
+    type: 100base-tx
+  - name: '{module}15'
+    type: 100base-tx
+  - name: '{module}16'
+    type: 100base-tx
+  - name: '{module}17'
+    type: 100base-tx
+  - name: '{module}18'
+    type: 100base-tx
+  - name: '{module}19'
+    type: 100base-tx
+  - name: '{module}20'
+    type: 100base-tx
+  - name: '{module}21'
+    type: 100base-tx
+  - name: '{module}22'
+    type: 100base-tx
+  - name: '{module}23'
+    type: 100base-tx
+  - name: '{module}24'
+    type: 100base-tx
diff --git a/module-types/HPE/J4878A.yaml b/module-types/HPE/J4878A.yaml
new file mode 100644
index 000000000..d1a3fa855
--- /dev/null
+++ b/module-types/HPE/J4878A.yaml
@@ -0,0 +1,14 @@
+---
+manufacturer: HPE
+model: HP 4-Port mini-Gbic xl Module
+part_number: J4878A
+comments: HP 4-Port mini-Gbic xl Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-x-sfp
+  - name: '{module}2'
+    type: 1000base-x-sfp
+  - name: '{module}3'
+    type: 1000base-x-sfp
+  - name: '{module}4'
+    type: 1000base-x-sfp
diff --git a/module-types/HPE/J4878B.yaml b/module-types/HPE/J4878B.yaml
new file mode 100644
index 000000000..1d24dfe52
--- /dev/null
+++ b/module-types/HPE/J4878B.yaml
@@ -0,0 +1,14 @@
+---
+manufacturer: HPE
+model: HP ProCurve Switch 4-Port xl Mini-GBIC Module
+part_number: J4878B
+comments: HP ProCurve Switch 4-Port xl Mini-GBIC Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-x-sfp
+  - name: '{module}2'
+    type: 1000base-x-sfp
+  - name: '{module}3'
+    type: 1000base-x-sfp
+  - name: '{module}4'
+    type: 1000base-x-sfp
diff --git a/module-types/HPE/J4907A.yaml b/module-types/HPE/J4907A.yaml
new file mode 100644
index 000000000..0d4f5bf9f
--- /dev/null
+++ b/module-types/HPE/J4907A.yaml
@@ -0,0 +1,43 @@
+---
+manufacturer: HPE
+model: HP ProCurve 16-Port 10/100/1000 XL Module
+part_number: J4907A
+comments: HP ProCurve 16-Port 10/100/1000 XL Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-t
+  - name: '{module}2'
+    type: 1000base-t
+  - name: '{module}3'
+    type: 1000base-t
+  - name: '{module}4'
+    type: 1000base-t
+  - name: '{module}5'
+    type: 1000base-t
+  - name: '{module}6'
+    type: 1000base-t
+  - name: '{module}7'
+    type: 1000base-t
+  - name: '{module}8'
+    type: 1000base-t
+  - name: '{module}9'
+    type: 1000base-t
+  - name: '{module}10'
+    type: 1000base-t
+  - name: '{module}11'
+    type: 1000base-t
+  - name: '{module}12'
+    type: 1000base-t
+  - name: '{module}13'
+    type: 1000base-t
+  - name: '{module}14'
+    type: 1000base-t
+  - name: '{module}15'
+    type: 1000base-t
+  - name: '{module}16'
+    type: 1000base-t
+# dual personality
+#  - name: '{module}15'
+#    type: 1000base-x-sfp
+#  - name: '{module}16'
+#    type: 1000base-x-sfp
diff --git a/module-types/HPE/J8702A.yaml b/module-types/HPE/J8702A.yaml
new file mode 100644
index 000000000..23c59fe96
--- /dev/null
+++ b/module-types/HPE/J8702A.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: ProCurve 24-port 10/100/1000Base-T PoE Switch Module
+part_number: J8702A
+comments: ProCurve 24-port 10/100/1000Base-T PoE Switch Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-t
+  - name: '{module}2'
+    type: 1000base-t
+  - name: '{module}3'
+    type: 1000base-t
+  - name: '{module}4'
+    type: 1000base-t
+  - name: '{module}5'
+    type: 1000base-t
+  - name: '{module}6'
+    type: 1000base-t
+  - name: '{module}7'
+    type: 1000base-t
+  - name: '{module}8'
+    type: 1000base-t
+  - name: '{module}9'
+    type: 1000base-t
+  - name: '{module}10'
+    type: 1000base-t
+  - name: '{module}11'
+    type: 1000base-t
+  - name: '{module}12'
+    type: 1000base-t
+  - name: '{module}13'
+    type: 1000base-t
+  - name: '{module}14'
+    type: 1000base-t
+  - name: '{module}15'
+    type: 1000base-t
+  - name: '{module}16'
+    type: 1000base-t
+  - name: '{module}17'
+    type: 1000base-t
+  - name: '{module}18'
+    type: 1000base-t
+  - name: '{module}19'
+    type: 1000base-t
+  - name: '{module}20'
+    type: 1000base-t
+  - name: '{module}21'
+    type: 1000base-t
+  - name: '{module}22'
+    type: 1000base-t
+  - name: '{module}23'
+    type: 1000base-t
+  - name: '{module}24'
+    type: 1000base-t
diff --git a/module-types/HPE/J8705A.yaml b/module-types/HPE/J8705A.yaml
new file mode 100644
index 000000000..8cf85ecdd
--- /dev/null
+++ b/module-types/HPE/J8705A.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: HP J8705A ProCurve PoE 20 Port Gig-T SFP Plus 4 Port Mini GBIC ZL Module
+part_number: J8705A
+comments: HP J8705A ProCurve PoE 20 Port Gig-T SFP Plus 4 Port Mini GBIC ZL Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-t
+  - name: '{module}2'
+    type: 1000base-t
+  - name: '{module}3'
+    type: 1000base-t
+  - name: '{module}4'
+    type: 1000base-t
+  - name: '{module}5'
+    type: 1000base-t
+  - name: '{module}6'
+    type: 1000base-t
+  - name: '{module}7'
+    type: 1000base-t
+  - name: '{module}8'
+    type: 1000base-t
+  - name: '{module}9'
+    type: 1000base-t
+  - name: '{module}10'
+    type: 1000base-t
+  - name: '{module}11'
+    type: 1000base-t
+  - name: '{module}12'
+    type: 1000base-t
+  - name: '{module}13'
+    type: 1000base-t
+  - name: '{module}14'
+    type: 1000base-t
+  - name: '{module}15'
+    type: 1000base-t
+  - name: '{module}16'
+    type: 1000base-t
+  - name: '{module}17'
+    type: 1000base-t
+  - name: '{module}18'
+    type: 1000base-t
+  - name: '{module}19'
+    type: 1000base-t
+  - name: '{module}20'
+    type: 1000base-t
+  - name: '{module}21'
+    type: 1000base-x-sfp
+  - name: '{module}22'
+    type: 1000base-x-sfp
+  - name: '{module}23'
+    type: 1000base-x-sfp
+  - name: '{module}24'
+    type: 1000base-x-sfp
diff --git a/module-types/HPE/J8706A.yaml b/module-types/HPE/J8706A.yaml
new file mode 100644
index 000000000..5d6eeefae
--- /dev/null
+++ b/module-types/HPE/J8706A.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: ProCurve Switch 5400zl 24p Mini-GBIC Module
+part_number: J8706A
+comments: ProCurve Switch 5400zl 24p Mini-GBIC Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-x-sfp
+  - name: '{module}2'
+    type: 1000base-x-sfp
+  - name: '{module}3'
+    type: 1000base-x-sfp
+  - name: '{module}4'
+    type: 1000base-x-sfp
+  - name: '{module}5'
+    type: 1000base-x-sfp
+  - name: '{module}6'
+    type: 1000base-x-sfp
+  - name: '{module}7'
+    type: 1000base-x-sfp
+  - name: '{module}8'
+    type: 1000base-x-sfp
+  - name: '{module}9'
+    type: 1000base-x-sfp
+  - name: '{module}10'
+    type: 1000base-x-sfp
+  - name: '{module}11'
+    type: 1000base-x-sfp
+  - name: '{module}12'
+    type: 1000base-x-sfp
+  - name: '{module}13'
+    type: 1000base-x-sfp
+  - name: '{module}14'
+    type: 1000base-x-sfp
+  - name: '{module}15'
+    type: 1000base-x-sfp
+  - name: '{module}16'
+    type: 1000base-x-sfp
+  - name: '{module}17'
+    type: 1000base-x-sfp
+  - name: '{module}18'
+    type: 1000base-x-sfp
+  - name: '{module}19'
+    type: 1000base-x-sfp
+  - name: '{module}20'
+    type: 1000base-x-sfp
+  - name: '{module}21'
+    type: 1000base-x-sfp
+  - name: '{module}22'
+    type: 1000base-x-sfp
+  - name: '{module}23'
+    type: 1000base-x-sfp
+  - name: '{module}24'
+    type: 1000base-x-sfp
diff --git a/module-types/HPE/J8708A.yaml b/module-types/HPE/J8708A.yaml
new file mode 100644
index 000000000..e86d52ca1
--- /dev/null
+++ b/module-types/HPE/J8708A.yaml
@@ -0,0 +1,14 @@
+---
+manufacturer: HPE
+model: HP 4-Port 10GbE CX4 ZL Module
+part_number: J8708A
+comments: HP J8708A 4-Port 10GbE CX4 ZL Module
+interfaces:
+  - name: '{module}1'
+    type: 10gbase-cx4
+  - name: '{module}2'
+    type: 10gbase-cx4
+  - name: '{module}3'
+    type: 10gbase-cx4
+  - name: '{module}4'
+    type: 10gbase-cx4
diff --git a/module-types/HPE/J8764A.yaml b/module-types/HPE/J8764A.yaml
new file mode 100644
index 000000000..9d8c87b79
--- /dev/null
+++ b/module-types/HPE/J8764A.yaml
@@ -0,0 +1,38 @@
+---
+manufacturer: HPE
+model: HP ProCurve Switch vl 16Port Gig-T Module
+part_number: J8764A
+comments: HP ProCurve Switch vl 16Port Gig-T Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-t
+  - name: '{module}2'
+    type: 1000base-t
+  - name: '{module}3'
+    type: 1000base-t
+  - name: '{module}4'
+    type: 1000base-t
+  - name: '{module}5'
+    type: 1000base-t
+  - name: '{module}6'
+    type: 1000base-t
+  - name: '{module}7'
+    type: 1000base-t
+  - name: '{module}8'
+    type: 1000base-t
+  - name: '{module}9'
+    type: 1000base-t
+  - name: '{module}10'
+    type: 1000base-t
+  - name: '{module}11'
+    type: 1000base-t
+  - name: '{module}12'
+    type: 1000base-t
+  - name: '{module}13'
+    type: 1000base-t
+  - name: '{module}14'
+    type: 1000base-t
+  - name: '{module}15'
+    type: 1000base-t
+  - name: '{module}16'
+    type: 1000base-t
diff --git a/module-types/HPE/J8765A.yaml b/module-types/HPE/J8765A.yaml
new file mode 100644
index 000000000..2a7f2cc5c
--- /dev/null
+++ b/module-types/HPE/J8765A.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: ProCurve Switch VL 24-Port 10/100-TX Module
+part_number: J8765A
+comments: ProCurve Switch VL 24-Port 10/100-TX Module
+interfaces:
+  - name: '{module}1'
+    type: 100base-tx
+  - name: '{module}2'
+    type: 100base-tx
+  - name: '{module}3'
+    type: 100base-tx
+  - name: '{module}4'
+    type: 100base-tx
+  - name: '{module}5'
+    type: 100base-tx
+  - name: '{module}6'
+    type: 100base-tx
+  - name: '{module}7'
+    type: 100base-tx
+  - name: '{module}8'
+    type: 100base-tx
+  - name: '{module}9'
+    type: 100base-tx
+  - name: '{module}10'
+    type: 100base-tx
+  - name: '{module}11'
+    type: 100base-tx
+  - name: '{module}12'
+    type: 100base-tx
+  - name: '{module}13'
+    type: 100base-tx
+  - name: '{module}14'
+    type: 100base-tx
+  - name: '{module}15'
+    type: 100base-tx
+  - name: '{module}16'
+    type: 100base-tx
+  - name: '{module}17'
+    type: 100base-tx
+  - name: '{module}18'
+    type: 100base-tx
+  - name: '{module}19'
+    type: 100base-tx
+  - name: '{module}20'
+    type: 100base-tx
+  - name: '{module}21'
+    type: 100base-tx
+  - name: '{module}22'
+    type: 100base-tx
+  - name: '{module}23'
+    type: 100base-tx
+  - name: '{module}24'
+    type: 100base-tx
diff --git a/module-types/HPE/J8765B.yaml b/module-types/HPE/J8765B.yaml
new file mode 100644
index 000000000..58379b94e
--- /dev/null
+++ b/module-types/HPE/J8765B.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: HP ProCurve Switch vl 24-Port 10/100-TX Module
+part_number: J8765B
+comments: HP ProCurve Switch vl 24-Port 10/100-TX Module
+interfaces:
+  - name: '{module}1'
+    type: 100base-tx
+  - name: '{module}2'
+    type: 100base-tx
+  - name: '{module}3'
+    type: 100base-tx
+  - name: '{module}4'
+    type: 100base-tx
+  - name: '{module}5'
+    type: 100base-tx
+  - name: '{module}6'
+    type: 100base-tx
+  - name: '{module}7'
+    type: 100base-tx
+  - name: '{module}8'
+    type: 100base-tx
+  - name: '{module}9'
+    type: 100base-tx
+  - name: '{module}10'
+    type: 100base-tx
+  - name: '{module}11'
+    type: 100base-tx
+  - name: '{module}12'
+    type: 100base-tx
+  - name: '{module}13'
+    type: 100base-tx
+  - name: '{module}14'
+    type: 100base-tx
+  - name: '{module}15'
+    type: 100base-tx
+  - name: '{module}16'
+    type: 100base-tx
+  - name: '{module}17'
+    type: 100base-tx
+  - name: '{module}18'
+    type: 100base-tx
+  - name: '{module}19'
+    type: 100base-tx
+  - name: '{module}20'
+    type: 100base-tx
+  - name: '{module}21'
+    type: 100base-tx
+  - name: '{module}22'
+    type: 100base-tx
+  - name: '{module}23'
+    type: 100base-tx
+  - name: '{module}24'
+    type: 100base-tx
diff --git a/module-types/HPE/J8768A.yaml b/module-types/HPE/J8768A.yaml
new file mode 100644
index 000000000..16c6be840
--- /dev/null
+++ b/module-types/HPE/J8768A.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: ProCurve Switch 24-port Gig-T vl Module
+part_number: J8768A
+comments: ProCurve Switch 24-port Gig-T vl Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-t
+  - name: '{module}2'
+    type: 1000base-t
+  - name: '{module}3'
+    type: 1000base-t
+  - name: '{module}4'
+    type: 1000base-t
+  - name: '{module}5'
+    type: 1000base-t
+  - name: '{module}6'
+    type: 1000base-t
+  - name: '{module}7'
+    type: 1000base-t
+  - name: '{module}8'
+    type: 1000base-t
+  - name: '{module}9'
+    type: 1000base-t
+  - name: '{module}10'
+    type: 1000base-t
+  - name: '{module}11'
+    type: 1000base-t
+  - name: '{module}12'
+    type: 1000base-t
+  - name: '{module}13'
+    type: 1000base-t
+  - name: '{module}14'
+    type: 1000base-t
+  - name: '{module}15'
+    type: 1000base-t
+  - name: '{module}16'
+    type: 1000base-t
+  - name: '{module}17'
+    type: 1000base-t
+  - name: '{module}18'
+    type: 1000base-t
+  - name: '{module}19'
+    type: 1000base-t
+  - name: '{module}20'
+    type: 1000base-t
+  - name: '{module}21'
+    type: 1000base-t
+  - name: '{module}22'
+    type: 1000base-t
+  - name: '{module}23'
+    type: 1000base-t
+  - name: '{module}24'
+    type: 1000base-t
diff --git a/module-types/HPE/J8776A.yaml b/module-types/HPE/J8776A.yaml
new file mode 100644
index 000000000..682785be3
--- /dev/null
+++ b/module-types/HPE/J8776A.yaml
@@ -0,0 +1,14 @@
+---
+manufacturer: HPE
+model: HP ProCurve J8776A VL 4-Port MINI-GBIC Module
+part_number: J8776A
+comments: HP ProCurve J8776A VL 4-Port MINI-GBIC Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-x-sfp
+  - name: '{module}2'
+    type: 1000base-x-sfp
+  - name: '{module}3'
+    type: 1000base-x-sfp
+  - name: '{module}4'
+    type: 1000base-x-sfp
diff --git a/module-types/HPE/J9033A.yaml b/module-types/HPE/J9033A.yaml
new file mode 100644
index 000000000..1205d98a3
--- /dev/null
+++ b/module-types/HPE/J9033A.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: HP ProCurve Switch vl 20-Port Gig-T+ 4 SFP Module
+part_number: J9033A
+comments: HP ProCurve Switch vl 20-Port Gig-T+ 4 SFP Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-t
+  - name: '{module}2'
+    type: 1000base-t
+  - name: '{module}3'
+    type: 1000base-t
+  - name: '{module}4'
+    type: 1000base-t
+  - name: '{module}5'
+    type: 1000base-t
+  - name: '{module}6'
+    type: 1000base-t
+  - name: '{module}7'
+    type: 1000base-t
+  - name: '{module}8'
+    type: 1000base-t
+  - name: '{module}9'
+    type: 1000base-t
+  - name: '{module}10'
+    type: 1000base-t
+  - name: '{module}11'
+    type: 1000base-t
+  - name: '{module}12'
+    type: 1000base-t
+  - name: '{module}13'
+    type: 1000base-t
+  - name: '{module}14'
+    type: 1000base-t
+  - name: '{module}15'
+    type: 1000base-t
+  - name: '{module}16'
+    type: 1000base-t
+  - name: '{module}17'
+    type: 1000base-t
+  - name: '{module}18'
+    type: 1000base-t
+  - name: '{module}19'
+    type: 1000base-t
+  - name: '{module}20'
+    type: 1000base-t
+  - name: '{module}21'
+    type: 1000base-x-sfp
+  - name: '{module}22'
+    type: 1000base-x-sfp
+  - name: '{module}23'
+    type: 1000base-x-sfp
+  - name: '{module}24'
+    type: 1000base-x-sfp
diff --git a/module-types/HPE/J9537A.yaml b/module-types/HPE/J9537A.yaml
new file mode 100644
index 000000000..8392c49eb
--- /dev/null
+++ b/module-types/HPE/J9537A.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: HP 24-port SFP v2 zl Module
+part_number: J9537A
+comments: HP J9537A 24-port SFP v2 zl Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-x-sfp
+  - name: '{module}2'
+    type: 1000base-x-sfp
+  - name: '{module}3'
+    type: 1000base-x-sfp
+  - name: '{module}4'
+    type: 1000base-x-sfp
+  - name: '{module}5'
+    type: 1000base-x-sfp
+  - name: '{module}6'
+    type: 1000base-x-sfp
+  - name: '{module}7'
+    type: 1000base-x-sfp
+  - name: '{module}8'
+    type: 1000base-x-sfp
+  - name: '{module}9'
+    type: 1000base-x-sfp
+  - name: '{module}10'
+    type: 1000base-x-sfp
+  - name: '{module}11'
+    type: 1000base-x-sfp
+  - name: '{module}12'
+    type: 1000base-x-sfp
+  - name: '{module}13'
+    type: 1000base-x-sfp
+  - name: '{module}14'
+    type: 1000base-x-sfp
+  - name: '{module}15'
+    type: 1000base-x-sfp
+  - name: '{module}16'
+    type: 1000base-x-sfp
+  - name: '{module}17'
+    type: 1000base-x-sfp
+  - name: '{module}18'
+    type: 1000base-x-sfp
+  - name: '{module}19'
+    type: 1000base-x-sfp
+  - name: '{module}20'
+    type: 1000base-x-sfp
+  - name: '{module}21'
+    type: 1000base-x-sfp
+  - name: '{module}22'
+    type: 1000base-x-sfp
+  - name: '{module}23'
+    type: 1000base-x-sfp
+  - name: '{module}24'
+    type: 1000base-x-sfp
diff --git a/module-types/HPE/J9547A.yaml b/module-types/HPE/J9547A.yaml
new file mode 100644
index 000000000..247d91b13
--- /dev/null
+++ b/module-types/HPE/J9547A.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: HP 24-port 10/100 PoE+ v2 zl Module
+part_number: J9547A
+comments: HP J9547A 24-port 10/100 PoE+ v2 zl Module
+interfaces:
+  - name: '{module}1'
+    type: 100base-tx
+  - name: '{module}2'
+    type: 100base-tx
+  - name: '{module}3'
+    type: 100base-tx
+  - name: '{module}4'
+    type: 100base-tx
+  - name: '{module}5'
+    type: 100base-tx
+  - name: '{module}6'
+    type: 100base-tx
+  - name: '{module}7'
+    type: 100base-tx
+  - name: '{module}8'
+    type: 100base-tx
+  - name: '{module}9'
+    type: 100base-tx
+  - name: '{module}10'
+    type: 100base-tx
+  - name: '{module}11'
+    type: 100base-tx
+  - name: '{module}12'
+    type: 100base-tx
+  - name: '{module}13'
+    type: 100base-tx
+  - name: '{module}14'
+    type: 100base-tx
+  - name: '{module}15'
+    type: 100base-tx
+  - name: '{module}16'
+    type: 100base-tx
+  - name: '{module}17'
+    type: 100base-tx
+  - name: '{module}18'
+    type: 100base-tx
+  - name: '{module}19'
+    type: 100base-tx
+  - name: '{module}20'
+    type: 100base-tx
+  - name: '{module}21'
+    type: 100base-tx
+  - name: '{module}22'
+    type: 100base-tx
+  - name: '{module}23'
+    type: 100base-tx
+  - name: '{module}24'
+    type: 100base-tx
diff --git a/module-types/HPE/J9550A.yaml b/module-types/HPE/J9550A.yaml
new file mode 100644
index 000000000..a24fdf5ce
--- /dev/null
+++ b/module-types/HPE/J9550A.yaml
@@ -0,0 +1,54 @@
+---
+manufacturer: HPE
+model: HP 24-Port GiG-T v2 ZL Module
+part_number: J9550A
+comments: HP J9550A 24-Port GiG-T v2 ZL Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-t
+  - name: '{module}2'
+    type: 1000base-t
+  - name: '{module}3'
+    type: 1000base-t
+  - name: '{module}4'
+    type: 1000base-t
+  - name: '{module}5'
+    type: 1000base-t
+  - name: '{module}6'
+    type: 1000base-t
+  - name: '{module}7'
+    type: 1000base-t
+  - name: '{module}8'
+    type: 1000base-t
+  - name: '{module}9'
+    type: 1000base-t
+  - name: '{module}10'
+    type: 1000base-t
+  - name: '{module}11'
+    type: 1000base-t
+  - name: '{module}12'
+    type: 1000base-t
+  - name: '{module}13'
+    type: 1000base-t
+  - name: '{module}14'
+    type: 1000base-t
+  - name: '{module}15'
+    type: 1000base-t
+  - name: '{module}16'
+    type: 1000base-t
+  - name: '{module}17'
+    type: 1000base-t
+  - name: '{module}18'
+    type: 1000base-t
+  - name: '{module}19'
+    type: 1000base-t
+  - name: '{module}20'
+    type: 1000base-t
+  - name: '{module}21'
+    type: 1000base-t
+  - name: '{module}22'
+    type: 1000base-t
+  - name: '{module}23'
+    type: 1000base-t
+  - name: '{module}24'
+    type: 1000base-t
diff --git a/module-types/HPE/J9820A.yaml b/module-types/HPE/J9820A.yaml
new file mode 100644
index 000000000..814c22e5b
--- /dev/null
+++ b/module-types/HPE/J9820A.yaml
@@ -0,0 +1,5 @@
+---
+manufacturer: HPE
+model: HP 2530 8-port Switch Power Adapter Shelf Power
+part_number: J9820A
+comments: HP J9820A 2530 8-port Switch Power Adapter Shelf Power
diff --git a/module-types/HPE/J9827A.yaml b/module-types/HPE/J9827A.yaml
new file mode 100644
index 000000000..4a385b2dc
--- /dev/null
+++ b/module-types/HPE/J9827A.yaml
@@ -0,0 +1,14 @@
+---
+manufacturer: HPE
+model: HPE Aruba 5400R zl2 Management Module
+part_number: J9827A
+comments: HPE Aruba 5400R zl2 Management Module
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: Aux
+    type: usb-a
+interfaces:
+  - name: '{module}'
+    type: 1000base-t
+    mgmt_only: true
diff --git a/module-types/HPE/J9828A.yaml b/module-types/HPE/J9828A.yaml
new file mode 100644
index 000000000..0eed77149
--- /dev/null
+++ b/module-types/HPE/J9828A.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: HPE 5400R 700W PoE+ zl2 Power Supply
+part_number: J9828A
+comments: HPE 5400R 700W PoE+ zl2 Power Supply
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c16
+    maximum_draw: 700
diff --git a/module-types/HPE/J9829A.yaml b/module-types/HPE/J9829A.yaml
new file mode 100644
index 000000000..94f4fe6d9
--- /dev/null
+++ b/module-types/HPE/J9829A.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: HP 5400R 1100W POE+ ZL2 Power Supply
+part_number: J9829A
+comments: HP J9829A 5400R 1100W POE+ ZL2 Power Supply
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c16
+    maximum_draw: 1100
diff --git a/module-types/HPE/JC680A.yaml b/module-types/HPE/JC680A.yaml
new file mode 100644
index 000000000..ccb31fdd5
--- /dev/null
+++ b/module-types/HPE/JC680A.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: HP A58x0AF 650W AC Power Supply
+part_number: JC680A
+comments: HP A58x0AF 650W AC Power Supply
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c16
+    maximum_draw: 650
diff --git a/module-types/HPE/JC683A.yaml b/module-types/HPE/JC683A.yaml
new file mode 100644
index 000000000..bfc94f078
--- /dev/null
+++ b/module-types/HPE/JC683A.yaml
@@ -0,0 +1,5 @@
+---
+manufacturer: HPE
+model: HP 58X0AF FRONT TO BACK FAN TRAY
+part_number: JC683A
+comments: HP 58X0AF FRONT TO BACK FAN TRAY
diff --git a/module-types/HPE/JD219A.yaml b/module-types/HPE/JD219A.yaml
new file mode 100644
index 000000000..557214867
--- /dev/null
+++ b/module-types/HPE/JD219A.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: HPE
+model: HPE FlexNetwork 7500 2800W AC Power Supply
+part_number: JD219A
+comments: HPE FlexNetwork 7500 2800W AC Power Supply
+power-ports:
+  - name: Outlet1-{module}
+    type: iec-60320-c20
+    maximum_draw: 2800
+  - name: Outlet2-{module}
+    type: iec-60320-c20
+    maximum_draw: 2800
diff --git a/module-types/HPE/JD368B.yaml b/module-types/HPE/JD368B.yaml
new file mode 100644
index 000000000..00f179658
--- /dev/null
+++ b/module-types/HPE/JD368B.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: HPE
+model: HP 5500/5120 2-port 10GbE SFP+ Module
+part_number: JD368B
+comments: HP 5500/5120 2-port 10GbE SFP+ Module
+interfaces:
+  - name: '{module}1'
+    type: 10gbase-x-sfpp
+  - name: '{module}2'
+    type: 10gbase-x-sfpp
diff --git a/module-types/HPE/JG545A.yaml b/module-types/HPE/JG545A.yaml
new file mode 100644
index 000000000..757d60f9c
--- /dev/null
+++ b/module-types/HPE/JG545A.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: HP X362 1110W AC PoE Power Supply
+part_number: JG545A
+comments: HP X362 1110W AC PoE Power Supply
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c16
+    maximum_draw: 1110
diff --git a/module-types/HPE/JG900A.yaml b/module-types/HPE/JG900A.yaml
new file mode 100644
index 000000000..f06a52525
--- /dev/null
+++ b/module-types/HPE/JG900A.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: HPE A58x0AF 300W AC Power Supply
+part_number: JG900A
+comments: HPE A58x0AF 300W AC Power Supply
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c14
+    maximum_draw: 300
diff --git a/module-types/HPE/JH157A.yaml b/module-types/HPE/JH157A.yaml
new file mode 100644
index 000000000..cadea7d4d
--- /dev/null
+++ b/module-types/HPE/JH157A.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: HPE
+model: HPE 5130/5510 10GbE SFP+ 2-port Module
+part_number: JH157A
+comments: HPE 5130/5510 10GbE SFP+ 2-port Module
+interfaces:
+  - name: '{module}1'
+    type: 10gbase-x-sfpp
+  - name: '{module}2'
+    type: 10gbase-x-sfpp
diff --git a/module-types/HPE/JH209A.yaml b/module-types/HPE/JH209A.yaml
new file mode 100644
index 000000000..46a67e1fe
--- /dev/null
+++ b/module-types/HPE/JH209A.yaml
@@ -0,0 +1,45 @@
+---
+manufacturer: HPE
+model: HPE FlexNetwork 7500 2.4Tbps Fabric with 8-port 1/10GbE SFP+ and 2-port 40GbE QSFP+
+part_number: JH209A
+comments: '[HPE FlexNetwork 7500 2.4Tbps Fabric with 8-port 1/10GbE SFP+ and 2-port 40GbE QSFP+](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c05028833)'
+weight: 4.4
+weight_unit: kg
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb
+    type: usb-a
+interfaces:
+  - name: M-GigabitEthernet{module}/0/0
+    type: 1000base-t
+    mgmt_only: true
+  - name: M-GigabitEthernet{module}/0/1
+    type: 1000base-t
+    mgmt_only: true
+  - name: M-GigabitEthernet{module}/0/2
+    type: 1000base-x-sfp
+    mgmt_only: true
+  - name: M-GigabitEthernet{module}/0/3
+    type: 1000base-x-sfp
+    mgmt_only: true
+  - name: Ten-GigabitEthernet{module}/0/1
+    type: 10gbase-x-sfpp
+  - name: Ten-GigabitEthernet{module}/0/2
+    type: 10gbase-x-sfpp
+  - name: Ten-GigabitEthernet{module}/0/3
+    type: 10gbase-x-sfpp
+  - name: Ten-GigabitEthernet{module}/0/4
+    type: 10gbase-x-sfpp
+  - name: Ten-GigabitEthernet{module}/0/5
+    type: 10gbase-x-sfpp
+  - name: Ten-GigabitEthernet{module}/0/6
+    type: 10gbase-x-sfpp
+  - name: Ten-GigabitEthernet{module}/0/7
+    type: 10gbase-x-sfpp
+  - name: Ten-GigabitEthernet{module}/0/8
+    type: 10gbase-x-sfpp
+  - name: Forty-GigabitEthernet{module}/0/1
+    type: 40gbase-x-qsfpp
+  - name: Forty-GigabitEthernet{module}/0/2
+    type: 40gbase-x-qsfpp
diff --git a/module-types/HPE/JH211A.yaml b/module-types/HPE/JH211A.yaml
new file mode 100644
index 000000000..f1d3114e7
--- /dev/null
+++ b/module-types/HPE/JH211A.yaml
@@ -0,0 +1,62 @@
+---
+manufacturer: HPE
+model: HPE FlexNetwork 7500 24-port SFP/4-port SFP+ SE Module
+part_number: JH211A
+comments: HPE FlexNetwork 7500 24-port SFP/4-port SFP+ SE Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-x-sfp
+  - name: '{module}2'
+    type: 1000base-x-sfp
+  - name: '{module}3'
+    type: 1000base-x-sfp
+  - name: '{module}4'
+    type: 1000base-x-sfp
+  - name: '{module}5'
+    type: 1000base-x-sfp
+  - name: '{module}6'
+    type: 1000base-x-sfp
+  - name: '{module}7'
+    type: 1000base-x-sfp
+  - name: '{module}8'
+    type: 1000base-x-sfp
+  - name: '{module}9'
+    type: 1000base-x-sfp
+  - name: '{module}10'
+    type: 1000base-x-sfp
+  - name: '{module}11'
+    type: 1000base-x-sfp
+  - name: '{module}12'
+    type: 1000base-x-sfp
+  - name: '{module}13'
+    type: 1000base-x-sfp
+  - name: '{module}14'
+    type: 1000base-x-sfp
+  - name: '{module}15'
+    type: 1000base-x-sfp
+  - name: '{module}16'
+    type: 1000base-x-sfp
+  - name: '{module}17'
+    type: 1000base-x-sfp
+  - name: '{module}18'
+    type: 1000base-x-sfp
+  - name: '{module}19'
+    type: 1000base-x-sfp
+  - name: '{module}20'
+    type: 1000base-x-sfp
+  - name: '{module}21'
+    type: 1000base-x-sfp
+  - name: '{module}22'
+    type: 1000base-x-sfp
+  - name: '{module}23'
+    type: 1000base-x-sfp
+  - name: '{module}24'
+    type: 1000base-x-sfp
+  - name: '{module}25'
+    type: 10gbase-x-sfpp
+  - name: '{module}26'
+    type: 10gbase-x-sfpp
+  - name: '{module}27'
+    type: 10gbase-x-sfpp
+  - name: '{module}28'
+    type: 10gbase-x-sfpp
diff --git a/module-types/HPE/JH213A.yaml b/module-types/HPE/JH213A.yaml
new file mode 100644
index 000000000..0d16149dc
--- /dev/null
+++ b/module-types/HPE/JH213A.yaml
@@ -0,0 +1,102 @@
+---
+manufacturer: HPE
+model: HPE FlexNetwork 7500 48-port 1000BASE-T with PoE+ SE Module
+part_number: JH213A
+comments: HPE FlexNetwork 7500 48-port 1000BASE-T with PoE+ SE Module
+interfaces:
+  - name: '{module}1'
+    type: 1000base-t
+  - name: '{module}2'
+    type: 1000base-t
+  - name: '{module}3'
+    type: 1000base-t
+  - name: '{module}4'
+    type: 1000base-t
+  - name: '{module}5'
+    type: 1000base-t
+  - name: '{module}6'
+    type: 1000base-t
+  - name: '{module}7'
+    type: 1000base-t
+  - name: '{module}8'
+    type: 1000base-t
+  - name: '{module}9'
+    type: 1000base-t
+  - name: '{module}10'
+    type: 1000base-t
+  - name: '{module}11'
+    type: 1000base-t
+  - name: '{module}12'
+    type: 1000base-t
+  - name: '{module}13'
+    type: 1000base-t
+  - name: '{module}14'
+    type: 1000base-t
+  - name: '{module}15'
+    type: 1000base-t
+  - name: '{module}16'
+    type: 1000base-t
+  - name: '{module}17'
+    type: 1000base-t
+  - name: '{module}18'
+    type: 1000base-t
+  - name: '{module}19'
+    type: 1000base-t
+  - name: '{module}20'
+    type: 1000base-t
+  - name: '{module}21'
+    type: 1000base-t
+  - name: '{module}22'
+    type: 1000base-t
+  - name: '{module}23'
+    type: 1000base-t
+  - name: '{module}24'
+    type: 1000base-t
+  - name: '{module}25'
+    type: 1000base-t
+  - name: '{module}26'
+    type: 1000base-t
+  - name: '{module}27'
+    type: 1000base-t
+  - name: '{module}28'
+    type: 1000base-t
+  - name: '{module}29'
+    type: 1000base-t
+  - name: '{module}30'
+    type: 1000base-t
+  - name: '{module}31'
+    type: 1000base-t
+  - name: '{module}32'
+    type: 1000base-t
+  - name: '{module}33'
+    type: 1000base-t
+  - name: '{module}34'
+    type: 1000base-t
+  - name: '{module}35'
+    type: 1000base-t
+  - name: '{module}36'
+    type: 1000base-t
+  - name: '{module}37'
+    type: 1000base-t
+  - name: '{module}38'
+    type: 1000base-t
+  - name: '{module}39'
+    type: 1000base-t
+  - name: '{module}40'
+    type: 1000base-t
+  - name: '{module}41'
+    type: 1000base-t
+  - name: '{module}42'
+    type: 1000base-t
+  - name: '{module}43'
+    type: 1000base-t
+  - name: '{module}44'
+    type: 1000base-t
+  - name: '{module}45'
+    type: 1000base-t
+  - name: '{module}46'
+    type: 1000base-t
+  - name: '{module}47'
+    type: 1000base-t
+  - name: '{module}48'
+    type: 1000base-t
diff --git a/module-types/HPE/JH388A.yaml b/module-types/HPE/JH388A.yaml
new file mode 100644
index 000000000..8c90af2d2
--- /dev/null
+++ b/module-types/HPE/JH388A.yaml
@@ -0,0 +1,5 @@
+---
+manufacturer: HPE
+model: HPE X711 Front (Port Side) to Back (Power Side) Airflow High Volume 2 Fan Tray
+part_number: JH388A
+comments: HPE X711 Front (Port Side) to Back (Power Side) Airflow High Volume 2 Fan Tray