diff --git a/device-types/HPE/Aruba-1960-12XGT-4SFPP.yaml b/device-types/HPE/Aruba-1960-12XGT-4SFPP.yaml
new file mode 100644
index 000000000..466b91328
--- /dev/null
+++ b/device-types/HPE/Aruba-1960-12XGT-4SFPP.yaml
@@ -0,0 +1,48 @@
+---
+manufacturer: HPE
+model: Aruba 1960 12XGT 4SFP+
+slug: hpe-aruba-1960-12xgt-4sfpp
+part_number: JL805A
+u_height: 1
+airflow: left-to-right
+is_full_depth: false
+comments: '[Aruba Instant On 1960 Switch Series Data Sheet](https://www.hpe.com/psnow/doc/a00118137enw)'
+weight: 4.3
+weight_unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 160
+interfaces:
+  - name: '1'
+    type: 10gbase-t
+  - name: '2'
+    type: 10gbase-t
+  - name: '3'
+    type: 10gbase-t
+  - name: '4'
+    type: 10gbase-t
+  - name: '5'
+    type: 10gbase-t
+  - name: '6'
+    type: 10gbase-t
+  - name: '7'
+    type: 10gbase-t
+  - name: '8'
+    type: 10gbase-t
+  - name: '9'
+    type: 10gbase-t
+  - name: '10'
+    type: 10gbase-t
+  - name: '11'
+    type: 10gbase-t
+  - name: '12'
+    type: 10gbase-t
+  - name: '13'
+    type: 10gbase-x-sfpp
+  - name: '14'
+    type: 10gbase-x-sfpp
+  - name: '15'
+    type: 10gbase-x-sfpp
+  - name: '16'
+    type: 10gbase-x-sfpp
diff --git a/device-types/HPE/Aruba-1960-24G-2XGT-2SFPP.yaml b/device-types/HPE/Aruba-1960-24G-2XGT-2SFPP.yaml
new file mode 100644
index 000000000..e1a492f2e
--- /dev/null
+++ b/device-types/HPE/Aruba-1960-24G-2XGT-2SFPP.yaml
@@ -0,0 +1,72 @@
+---
+manufacturer: HPE
+model: Aruba 1960 24G 2XGT 2SFP+
+slug: hpe-aruba-1960-24g-2xgt-2sfpp
+part_number: JL806A
+u_height: 1
+airflow: passive
+is_full_depth: false
+comments: '[Aruba Instant On 1960 Switch Series Data Sheet](https://www.hpe.com/psnow/doc/a00118137enw)'
+weight: 3.9
+weight_unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 80
+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: 10gbase-t
+  - name: '26'
+    type: 10gbase-t
+  - name: '27'
+    type: 10gbase-x-sfpp
+  - name: '28'
+    type: 10gbase-x-sfpp
diff --git a/device-types/HPE/Aruba-1960-24G-PoE-2XGT-2SFPP-370W.yaml b/device-types/HPE/Aruba-1960-24G-PoE-2XGT-2SFPP-370W.yaml
new file mode 100644
index 000000000..2dcdbaea9
--- /dev/null
+++ b/device-types/HPE/Aruba-1960-24G-PoE-2XGT-2SFPP-370W.yaml
@@ -0,0 +1,120 @@
+---
+manufacturer: HPE
+model: Aruba 1960 24G PoE 2XGT 2SFP+ 370W
+slug: hpe-aruba-1960-24g-poe-2xgt-2sfpp-370w
+part_number: JL807A
+u_height: 1
+airflow: left-to-right
+is_full_depth: false
+comments: '[Aruba Instant On 1960 Switch Series Data Sheet](https://www.hpe.com/psnow/doc/a00118137enw)'
+weight: 4.7
+weight_unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 480
+interfaces:
+  - name: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '25'
+    type: 10gbase-t
+  - name: '26'
+    type: 10gbase-t
+  - name: '27'
+    type: 10gbase-x-sfpp
+  - name: '28'
+    type: 10gbase-x-sfpp
diff --git a/device-types/HPE/Aruba-1960-48G-2XGT-2SFPP.yaml b/device-types/HPE/Aruba-1960-48G-2XGT-2SFPP.yaml
new file mode 100644
index 000000000..87ae85fd4
--- /dev/null
+++ b/device-types/HPE/Aruba-1960-48G-2XGT-2SFPP.yaml
@@ -0,0 +1,120 @@
+---
+manufacturer: HPE
+model: Aruba 1960 48G 2XGT 2SFP+
+slug: hpe-aruba-1960-48g-2xgt-2sfpp
+part_number: JL808A
+u_height: 1
+airflow: left-to-right
+is_full_depth: false
+comments: '[Aruba Instant On 1960 Switch Series Data Sheet](https://www.hpe.com/psnow/doc/a00118137enw)'
+weight: 3.13
+weight_unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 120
+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-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
+  - name: '49'
+    type: 10gbase-t
+  - name: '50'
+    type: 10gbase-t
+  - name: '51'
+    type: 10gbase-x-sfpp
+  - name: '52'
+    type: 10gbase-x-sfpp
diff --git a/device-types/HPE/Aruba-1960-48G-PoE-2XGT-2SFPP-600W.yaml b/device-types/HPE/Aruba-1960-48G-PoE-2XGT-2SFPP-600W.yaml
new file mode 100644
index 000000000..6533e9691
--- /dev/null
+++ b/device-types/HPE/Aruba-1960-48G-PoE-2XGT-2SFPP-600W.yaml
@@ -0,0 +1,216 @@
+---
+manufacturer: HPE
+model: Aruba 1960 48G PoE 2XGT 2SFP+ 600W
+slug: hpe-aruba-1960-48g-poe-2xgt-2sfpp-600w
+part_number: JL809A
+u_height: 1
+airflow: left-to-right
+is_full_depth: false
+comments: '[Aruba Instant On 1960 Switch Series Data Sheet](https://www.hpe.com/psnow/doc/a00118137enw)'
+weight: 4.9
+weight_unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 760
+interfaces:
+  - name: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '25'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '26'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '27'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '28'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '29'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '30'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '31'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '32'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '33'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '34'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '35'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '36'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '37'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '38'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '39'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '40'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '41'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '42'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '43'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '44'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '45'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '46'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '47'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '48'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '49'
+    type: 10gbase-t
+  - name: '50'
+    type: 10gbase-t
+  - name: '51'
+    type: 10gbase-x-sfpp
+  - name: '52'
+    type: 10gbase-x-sfpp