diff --git a/device-types/HPE/Aruba-2930F-24G-4SFP.yaml b/device-types/HPE/Aruba-2930F-24G-4SFP.yaml
new file mode 100644
index 000000000..24279135c
--- /dev/null
+++ b/device-types/HPE/Aruba-2930F-24G-4SFP.yaml
@@ -0,0 +1,77 @@
+---
+manufacturer: HPE
+model: Aruba 2930F-24G-4SFP
+slug: hpe-aruba-2930f-24g-4sfp
+part_number: JL259A
+u_height: 1
+is_full_depth: false
+comments: '[Aruba 2930F 24G 4SFP Switch Data sheet](https://www.hpe.com/psnow/doc/PSN1008995548USEN.pdf)'
+weight:
+  - value: 5.31
+    unit: lb
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 29
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB Console
+    type: usb-micro-b
+interfaces:
+  - 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-x-sfp
+  - name: '26'
+    type: 1000base-x-sfp
+  - name: '27'
+    type: 1000base-x-sfp
+  - name: '28'
+    type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-2930F-24G-PoEP-4SFP.yaml b/device-types/HPE/Aruba-2930F-24G-PoEP-4SFP.yaml
new file mode 100644
index 000000000..12605223c
--- /dev/null
+++ b/device-types/HPE/Aruba-2930F-24G-PoEP-4SFP.yaml
@@ -0,0 +1,77 @@
+---
+manufacturer: HPE
+model: Aruba 2930F-24G-POE+-4SFP
+slug: hpe-aruba-2930f-24g-poep-4sfp
+part_number: JL261A
+u_height: 1
+is_full_depth: false
+comments: '[Aruba 2930F 24G PoE+ 4SFP Switch Data sheet](https://www.hpe.com/psnow/doc/PSN1008995334USEN.pdf)'
+weight:
+  - value: 8.6
+    unit: lb
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 445
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB Console
+    type: usb-micro-b
+interfaces:
+  - 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-x-sfp
+  - name: '26'
+    type: 1000base-x-sfp
+  - name: '27'
+    type: 1000base-x-sfp
+  - name: '28'
+    type: 1000base-x-sfp