Merge branch 'master' into generic-sc-24-front-images

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 files: ^(device-types|module-types)/
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

.pre-commit-hooks-config.yaml

@@ -2,9 +2,9 @@
 files: ^(device-types|module-types)/
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
-        name: Check YAML files
+        name: Check YAML files

device-types/Cisco/CBS350-24T-4X.yaml

@@ -0,0 +1,79 @@
+---
+manufacturer: Cisco
+model: CBS350-24T-4X
+slug: cisco-cbs350-24t-4x
+part_number: WCBS350-24T-4X
+comments: https://www.cisco.com/c/en/us/products/collateral/switches/business-350-series-managed-switches/datasheet-c78-744156.html
+airflow: side-to-rear
+weight: 2.78
+weight_unit: kg
+is_full_depth: false
+u_height: 1
+interfaces:
+  - name: GigabitEthernet1
+    type: 1000base-t
+  - name: GigabitEthernet2
+    type: 1000base-t
+  - name: GigabitEthernet3
+    type: 1000base-t
+  - name: GigabitEthernet4
+    type: 1000base-t
+  - name: GigabitEthernet5
+    type: 1000base-t
+  - name: GigabitEthernet6
+    type: 1000base-t
+  - name: GigabitEthernet7
+    type: 1000base-t
+  - name: GigabitEthernet8
+    type: 1000base-t
+  - name: GigabitEthernet9
+    type: 1000base-t
+  - name: GigabitEthernet10
+    type: 1000base-t
+  - name: GigabitEthernet11
+    type: 1000base-t
+  - name: GigabitEthernet12
+    type: 1000base-t
+  - name: GigabitEthernet13
+    type: 1000base-t
+  - name: GigabitEthernet14
+    type: 1000base-t
+  - name: GigabitEthernet15
+    type: 1000base-t
+  - name: GigabitEthernet16
+    type: 1000base-t
+  - name: GigabitEthernet17
+    type: 1000base-t
+  - name: GigabitEthernet18
+    type: 1000base-t
+  - name: GigabitEthernet19
+    type: 1000base-t
+  - name: GigabitEthernet20
+    type: 1000base-t
+  - name: GigabitEthernet21
+    type: 1000base-t
+  - name: GigabitEthernet22
+    type: 1000base-t
+  - name: GigabitEthernet23
+    type: 1000base-t
+  - name: GigabitEthernet24
+    type: 1000base-t
+  - name: GigabitEthernet25
+    type: 10gbase-x-sfpp
+  - name: GigabitEthernet26
+    type: 10gbase-x-sfpp
+  - name: GigabitEthernet27
+    type: 10gbase-x-sfpp
+  - name: GigabitEthernet28
+    type: 10gbase-x-sfpp
+  - name: Vlan1
+    type: virtual
+console-ports:
+  - name: con0
+    type: rj-45
+  - name: con1
+    type: usb-mini-b
+power-ports:
+  - name: PSU0
+    type: iec-60320-c14
+    maximum_draw: 236

device-types/Cisco/CBS350-48T-4G.yaml

@@ -0,0 +1,127 @@
+---
+manufacturer: Cisco
+model: CBS350-48T-4G
+slug: cisco-cbs350-48t-4g
+part_number: WCBS350-48T-4G
+comments: https://www.cisco.com/c/en/us/products/collateral/switches/business-350-series-managed-switches/datasheet-c78-744156.html
+airflow: side-to-rear
+weight: 2.78
+weight_unit: kg
+is_full_depth: false
+u_height: 1
+interfaces:
+  - name: GigabitEthernet1
+    type: 1000base-t
+  - name: GigabitEthernet2
+    type: 1000base-t
+  - name: GigabitEthernet3
+    type: 1000base-t
+  - name: GigabitEthernet4
+    type: 1000base-t
+  - name: GigabitEthernet5
+    type: 1000base-t
+  - name: GigabitEthernet6
+    type: 1000base-t
+  - name: GigabitEthernet7
+    type: 1000base-t
+  - name: GigabitEthernet8
+    type: 1000base-t
+  - name: GigabitEthernet9
+    type: 1000base-t
+  - name: GigabitEthernet10
+    type: 1000base-t
+  - name: GigabitEthernet11
+    type: 1000base-t
+  - name: GigabitEthernet12
+    type: 1000base-t
+  - name: GigabitEthernet13
+    type: 1000base-t
+  - name: GigabitEthernet14
+    type: 1000base-t
+  - name: GigabitEthernet15
+    type: 1000base-t
+  - name: GigabitEthernet16
+    type: 1000base-t
+  - name: GigabitEthernet17
+    type: 1000base-t
+  - name: GigabitEthernet18
+    type: 1000base-t
+  - name: GigabitEthernet19
+    type: 1000base-t
+  - name: GigabitEthernet20
+    type: 1000base-t
+  - name: GigabitEthernet21
+    type: 1000base-t
+  - name: GigabitEthernet22
+    type: 1000base-t
+  - name: GigabitEthernet23
+    type: 1000base-t
+  - name: GigabitEthernet24
+    type: 1000base-t
+  - name: GigabitEthernet25
+    type: 1000base-t
+  - name: GigabitEthernet26
+    type: 1000base-t
+  - name: GigabitEthernet27
+    type: 1000base-t
+  - name: GigabitEthernet28
+    type: 1000base-t
+  - name: GigabitEthernet29
+    type: 1000base-t
+  - name: GigabitEthernet30
+    type: 1000base-t
+  - name: GigabitEthernet31
+    type: 1000base-t
+  - name: GigabitEthernet32
+    type: 1000base-t
+  - name: GigabitEthernet33
+    type: 1000base-t
+  - name: GigabitEthernet34
+    type: 1000base-t
+  - name: GigabitEthernet35
+    type: 1000base-t
+  - name: GigabitEthernet36
+    type: 1000base-t
+  - name: GigabitEthernet37
+    type: 1000base-t
+  - name: GigabitEthernet38
+    type: 1000base-t
+  - name: GigabitEthernet39
+    type: 1000base-t
+  - name: GigabitEthernet40
+    type: 1000base-t
+  - name: GigabitEthernet41
+    type: 1000base-t
+  - name: GigabitEthernet42
+    type: 1000base-t
+  - name: GigabitEthernet43
+    type: 1000base-t
+  - name: GigabitEthernet44
+    type: 1000base-t
+  - name: GigabitEthernet45
+    type: 1000base-t
+  - name: GigabitEthernet46
+    type: 1000base-t
+  - name: GigabitEthernet47
+    type: 1000base-t
+  - name: GigabitEthernet48
+    type: 1000base-t
+  - name: GigabitEthernet49
+    type: 10gbase-x-sfpp
+  - name: GigabitEthernet50
+    type: 10gbase-x-sfpp
+  - name: GigabitEthernet51
+    type: 10gbase-x-sfpp
+  - name: GigabitEthernet52
+    type: 10gbase-x-sfpp
+  - name: Vlan1
+    type: virtual
+console-ports:
+  - name: con0
+    type: rj-45
+  - name: con1
+    type: usb-mini-b
+power-ports:
+  - name: PSU0
+    type: iec-60320-c14
+    maximum_draw: 236

device-types/Palo Alto/PA-3250.yaml

@@ -45,13 +45,13 @@ interfaces:
   - name: ethernet1/12
     type: 1000base-t
   - name: ethernet1/13
-    type: 1000base-x-sfp
+    type: 10gbase-x-sfpp
   - name: ethernet1/14
-    type: 1000base-x-sfp
+    type: 10gbase-x-sfpp
   - name: ethernet1/15
-    type: 1000base-x-sfp
+    type: 10gbase-x-sfpp
   - name: ethernet1/16
-    type: 1000base-x-sfp
+    type: 10gbase-x-sfpp
   - name: ethernet1/17
     type: 10gbase-x-sfpp
   - name: ethernet1/18

device-types/Server Technology/PRO3X-C3WG36RL-DQJE2NT2.yaml

@@ -0,0 +1,179 @@
+---
+manufacturer: Server Technology
+model: PRO3X-C3WG36RL-DQJE2NT2
+slug: server-technology-pro3x-c3wg36rl-dqje2nt2
+part_number: PRO3X-C3WG36RL-DQJE2NT2
+u_height: 0
+is_full_depth: false
+airflow: passive
+comments: PRO3 Switched, Per-Outlet & Per-Inlet Power Sensing, 60A, 208V, (18) C13 & (18) Cx/C19/C13
+console-ports:
+  - name: console/modem
+    label: SER
+    type: rj-45
+    poe: false
+  - name: usb-a
+    label: USB-A
+    type: usb-a
+    poe: false
+console-server-ports:
+  - name: aux
+    label: AUX
+    type: rj-12
+power-ports:
+  - name: Power Port 1
+    type: iec-60309-3p-e-9h
+power-outlets:
+  - name: Outlet 1
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 2
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 3
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 4
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 5
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 6
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 7
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 8
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 9
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 10
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 11
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 12
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 13
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: C
+  - name: Outlet 14
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: C
+  - name: Outlet 15
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: C
+  - name: Outlet 16
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: C
+  - name: Outlet 17
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: C
+  - name: Outlet 18
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: C
+  - name: Outlet 19
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 20
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 21
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 22
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 23
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 24
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Outlet 25
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 26
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 27
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 28
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 29
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 30
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: B
+  - name: Outlet 31
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: C
+  - name: Outlet 32
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: C
+  - name: Outlet 33
+    type: hdot-cx
+    power_port: Power Port 1
+    feed_leg: C
+  - name: Outlet 34
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: C
+  - name: Outlet 35
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: C
+  - name: Outlet 36
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: C
+interfaces:
+  - name: eth1
+    label: ETH1
+    type: 1000base-t
+    mgmt_only: true
+  - name: eth2
+    label: ETH2
+    type: 1000base-t
+    mgmt_only: true

requirements.txt

@@ -1,8 +1,8 @@
-jsonschema==4.21.1
+jsonschema==4.22.0
 jsondiff==2.0.0
-pre-commit==3.7.0
-pytest==8.1.1
+pre-commit==3.7.1
+pytest==8.2.0
 PyYAML==6.0.1
 yamllint==1.35.1
-gitpython==3.1.42
+gitpython==3.1.43
 psutil==5.9.8

schema/generated_schema.json

@@ -353,6 +353,8 @@
                         "800gbase-x-qsfpdd",
                         "800gbase-x-osfp",
                         "1000base-kx",
+                        "2.5gbase-kx",
+                        "5gbase-kr",
                         "10gbase-kr",
                         "10gbase-kx4",
                         "25gbase-kr",