Module-Types - Model Name Fixes (#1063)

* Updated module types to have proper model names

* Updated Aruba module-types so that the model name is accurate

* fixing Broadcom part number

* updated comments to description

* fixed checkpoint model names

* moved generic keystone modules to a generic module folder

* according to FS datasheets, each item has an Item ID (unique part number) and their associated model name

* fixing the other module types

* removed mgmt_false definition

* removed newlines

* removed extra definitions

* fixed description, changed to comments

* fixing fs part numbers to be strings

* removed extra newlines

* Removed extra newlines

* reemoved blank definition

device-types/APC/ats-4421.yml

@@ -5,55 +5,39 @@ slug: ats-ap4421
 part_number: ATS-AP4421
 u_height: 1
 is_full_depth: false
-
 console-ports:
   - name: con 0
     type: rj-45
 power-ports:
   - name: 16A Inlet 1
     type: iec-60320-c20
-
   - name: 16A Inlet 2
     type: iec-60320-c20
-
 power-outlets:
   - name: Group 1 Outlet 1
     type: iec-60320-c13
-
   - name: Group 1 Outlet 2
     type: iec-60320-c13
-
   - name: Group 1 Outlet 3
     type: iec-60320-c13
-
   - name: Group 1 Outlet 4
     type: iec-60320-c13
-
   - name: Group 2 Outlet 1
     type: iec-60320-c13
-
   - name: Group 2 Outlet 2
     type: iec-60320-c13
-
   - name: Group 2 Outlet 3
     type: iec-60320-c13
-
   - name: Group 2 Outlet 4
     type: iec-60320-c13
-
   - name: Group 3 Outlet 1
     type: iec-60320-c13
-
   - name: Group 3 Outlet 2
     type: iec-60320-c13
-
   - name: Group 3 Outlet 3
     type: iec-60320-c13
-
   - name: Group 3 Outlet 4
     type: iec-60320-c13
-
-
 interfaces:
   - name: eth 1
     type: 1000base-t

device-types/APC/ats-7723.yml

@@ -5,45 +5,33 @@ slug: ats-ap7723
 part_number: ATS-AP7723
 u_height: 1
 is_full_depth: false
-
 console-ports:
   - name: con 0
     type: rj-45
 power-ports:
   - name: 16A Inlet 1
     type: iec-60320-c20
-
   - name: 16A Inlet 2
     type: iec-60320-c20
-
 power-outlets:
   - name: 16A Outlet
     type: iec-60320-c19
   - name: Group 1 Outlet 1
     type: iec-60320-c13
-
   - name: Group 1 Outlet 2
     type: iec-60320-c13
-
   - name: Group 1 Outlet 3
     type: iec-60320-c13
-
   - name: Group 1 Outlet 4
     type: iec-60320-c13
-
   - name: Group 2 Outlet 1
     type: iec-60320-c13
-
   - name: Group 2 Outlet 2
     type: iec-60320-c13
-
   - name: Group 2 Outlet 3
     type: iec-60320-c13
-
   - name: Group 2 Outlet 4
     type: iec-60320-c13
-
-
 interfaces:
   - name: eth 1
     type: 1000base-t

device-types/APC/epdu1016b.yml

@@ -5,11 +5,9 @@ slug: epdu1016b
 part_number: EPDU1016b
 u_height: 1
 is_full_depth: false
-
 power-ports:
   - name: 16A Inlet 1
     type: iec-60320-c20
-
 power-outlets:
   - name: Outlet 1
     type: iec-60320-c13

device-types/Generic/SC-24-double-port_fiber_patch_panel.yaml

@@ -102,8 +102,6 @@ front-ports:
     type: sc
     rear_port: '24.1'
     rear_port_position: 1
-
-
   - name: '1.2'
     type: sc
     rear_port: '1.2'
@@ -200,7 +198,6 @@ front-ports:
     type: sc
     rear_port: '24.2'
     rear_port_position: 1
-
 rear-ports:
   - name: '1.1'
     type: sc
@@ -274,8 +271,6 @@ rear-ports:
   - name: '24.1'
     type: sc
     positions: 1
-
-
   - name: '1.2'
     type: sc
     positions: 1

device-types/Generic/SC-24-double-port_fiber_patch_panel_half.yaml

@@ -102,8 +102,6 @@ front-ports:
     type: sc
     rear_port: '24.1'
     rear_port_position: 1
-
-
   - name: '1.2'
     type: sc
     rear_port: '1.2'
@@ -200,7 +198,6 @@ front-ports:
     type: sc
     rear_port: '24.2'
     rear_port_position: 1
-
 rear-ports:
   - name: '1.1'
     type: sc
@@ -274,8 +271,6 @@ rear-ports:
   - name: '24.1'
     type: sc
     positions: 1
-
-
   - name: '1.2'
     type: sc
     positions: 1

device-types/Generic/SC-24-port_fiber_patch_panel.yaml

@@ -102,8 +102,6 @@ front-ports:
     type: sc
     rear_port: '24'
     rear_port_position: 1
-
-
 rear-ports:
   - name: '1'
     type: sc

device-types/Generic/SC-24-port_fiber_patch_panel_half.yaml

@@ -102,8 +102,6 @@ front-ports:
     type: sc
     rear_port: '24'
     rear_port_position: 1
-
-
 rear-ports:
   - name: '1'
     type: sc

device-types/IBM/bladecenter_h.yaml

@@ -5,7 +5,6 @@ slug: bladecenter_h
 u_height: 9
 is_full_depth: true
 subdevice_role: parent
-
 device-bays:
   - name: Server Bay 1
   - name: Server Bay 2

device-types/PC Engines/APU.yaml

@@ -15,7 +15,6 @@ interfaces:
 console-ports:
   - name: ttyS0
     type: de-9
-
 power-ports:
   - name: Input
     type: dc-terminal

device-types/PC Engines/APU2.yaml

@@ -15,7 +15,6 @@ interfaces:
 console-ports:
   - name: ttyS0
     type: de-9
-
 power-ports:
   - name: Input
     type: dc-terminal

device-types/PC Engines/APU4.yaml

@@ -17,7 +17,6 @@ interfaces:
 console-ports:
   - name: ttyS0
     type: de-9
-
 power-ports:
   - name: Input
     type: dc-terminal

device-types/Panduit/CDPP8RG-S.yaml

@@ -38,7 +38,6 @@ front-ports:
     type: 8p8c
     rear_port: 08
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CDPP8RG.yaml

@@ -38,7 +38,6 @@ front-ports:
     type: 8p8c
     rear_port: 08
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CP24BLY.yaml

@@ -102,7 +102,6 @@ front-ports:
     type: 8p8c
     rear_port: '24'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CP48BLY.yaml

@@ -198,7 +198,6 @@ front-ports:
     type: 8p8c
     rear_port: '48'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CP48HDBL.yaml

@@ -198,7 +198,6 @@ front-ports:
     type: 8p8c
     rear_port: '48'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPA24BLY.yaml

@@ -102,7 +102,6 @@ front-ports:
     type: 8p8c
     rear_port: '24'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPA48BLY.yaml

@@ -198,7 +198,6 @@ front-ports:
     type: 8p8c
     rear_port: '48'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPA48HDBL.yaml

@@ -198,7 +198,6 @@ front-ports:
     type: 8p8c
     rear_port: '48'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPP24FMWBLY.yaml

@@ -102,7 +102,6 @@ front-ports:
     type: 8p8c
     rear_port: '24'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPP24WBLY.yaml

@@ -102,7 +102,6 @@ front-ports:
     type: 8p8c
     rear_port: '24'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPP48FMWBLY.yaml

@@ -198,7 +198,6 @@ front-ports:
     type: 8p8c
     rear_port: '48'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPP48HDEWBL.yaml

@@ -198,7 +198,6 @@ front-ports:
     type: 8p8c
     rear_port: '48'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPP48WBLY.yaml

@@ -198,7 +198,6 @@ front-ports:
     type: 8p8c
     rear_port: '48'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPP72FMWBLY.yaml

@@ -294,7 +294,6 @@ front-ports:
     type: 8p8c
     rear_port: '72'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPPA24FMWBLY.yaml

@@ -102,7 +102,6 @@ front-ports:
     type: 8p8c
     rear_port: '24'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPPA48FMWBLY.yaml

@@ -198,7 +198,6 @@ front-ports:
     type: 8p8c
     rear_port: '48'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPPA48HDWBLY.yaml

@@ -198,7 +198,6 @@ front-ports:
     type: 8p8c
     rear_port: '48'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/Panduit/CPPA72FMWBLY.yaml

@@ -294,7 +294,6 @@ front-ports:
     type: 8p8c
     rear_port: '72'
     rear_port_position: 1
-
 rear-ports:
   - name: '01'
     type: 110-punch

device-types/ZTE/ZXA10-F832-16.yaml

@@ -29,8 +29,6 @@ interfaces:
   - name: gei_0/1/5
     type: 1000base-t
     mgmt_only: false
-
-
   - name: gei_0/1/6
     type: 1000base-t
     mgmt_only: false

device-types/neousys/Nuvo-824DGC.yaml

@@ -18,7 +18,6 @@ console-ports:
     type: other
   - name: Audio 3.5m plug
     type: other
-
 interfaces:
   - name: enp5s0
     type: 1000base-t

module-types/Alcatel-Lucent/OS-XNI-U12.yaml

@@ -6,37 +6,25 @@ comments: OmniSwitch 6900 (OS6900) plug-in module with 12X 10G SFP+ ports
 interfaces:
   - name: 1/{module}/1
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: 1/{module}/2
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: 1/{module}/3
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: 1/{module}/4
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: 1/{module}/5
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: 1/{module}/6
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: 1/{module}/7
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: 1/{module}/8
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: 1/{module}/9
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: 1/{module}/10
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: 1/{module}/11
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: 1/{module}/12
     type: 10gbase-x-sfpp
-    mgmt_only: false

module-types/Aruba/J8712A.yaml

@@ -1,9 +1,10 @@
 ---
 manufacturer: Aruba
-model: 100-240v 875w J8712A PSU
+model: J8712A
 part_number: J8712A
 comments: "## Electrical characteristics\r\n* Voltage: 100-127 VAC1200-240 VAC \n* Maximum current: 12 A15.7 A\r\n* Frequency range: 50160 Hz\r\n* Power:\
   \ 875 W\r\n## Notes:\r\n* J8712A supplies 600 W chassis power and 273 W PoE power.\r\n* Two J8712A supplies are required to power the J8715A chassis."
 power-ports:
   - name: '{module}'
     type: iec-60320-c14
+    maximum_draw: 875

module-types/Aruba/J8713A.yaml

@@ -1,6 +1,6 @@
 ---
 manufacturer: Aruba
-model: 220v 1500w J8713A PSU
+model: J8713A
 part_number: J8713A
 comments: "## Physical characteristics\r\n* Dimensions: 6.05 x 7.45 x 5.1 in. (15.37 x 18.92 x 12.95 cm)\r\n* Weight: 7.5 lb (3.4 kg)\r\n\r\n## Electrical\
   \ characteristics\r\n* Maximum current: 10A\r\n* Frequency range: 50/60 Hz\r\n* Power 1500 W \r\n* 220V Only\r\n\r\n## Notes\r\nInstallation of the J8713A\
@@ -10,3 +10,4 @@ comments: "## Physical characteristics\r\n* Dimensions: 6.05 x 7.45 x 5.1 in. (1
 power-ports:
   - name: '{module}'
     type: iec-60320-c20
+    maximum_draw: 1500

module-types/Aruba/J9306A.yaml

@@ -1,6 +1,6 @@
 ---
 manufacturer: Aruba
-model: 100-240v 1500w J9306A PSU
+model: J9306A
 part_number: J9306A
 comments: "## Physical characteristics\r\n* Dimensions: 6.05(d) x 7.45(w) x 5.1(h) in. (15.37 x 18.92 x 12.95 cm)\r\n* Weight 7.5 Ib (3.2 kg)\r\n* Electrical\
   \ characteristics\r\n* Voltage: 100-127 VAC/200-240 VAC\r\n* N3xIimum Current. 13 10A\r\n* Maximum power rating: 1500 W\r\n* Frequency range, 50/60 HZ\r\
@@ -10,3 +10,4 @@ comments: "## Physical characteristics\r\n* Dimensions: 6.05(d) x 7.45(w) x 5.1(
 power-ports:
   - name: '{module}'
     type: iec-60320-c14
+    maximum_draw: 1500

module-types/Aruba/J9534A.yaml

@@ -1,77 +1,54 @@
 ---
 manufacturer: Aruba
-model: HP J9534A 24-port Gig-T PoE+ v2 zl Module
+model: J9534A
 part_number: J9534A
+comments: HP J9534A 24-port Gig-T PoE+ v2 zl Module
 interfaces:
   - name: '{module}1'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}2'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}3'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}4'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}5'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}6'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}7'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}8'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}9'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}10'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}11'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}12'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}13'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}14'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}15'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}16'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}17'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}18'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}19'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}20'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}21'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}22'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}23'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}24'
     type: 1000base-t
-    mgmt_only: false

module-types/Aruba/J9535A.yaml

@@ -1,77 +1,54 @@
 ---
 manufacturer: Aruba
-model: HP J9535A 20-port Gig-T PoE+/4-port SFP v2 zl Module
+model: J9535A
 part_number: J9535A
+comments: HP J9535A 20-port Gig-T PoE+/4-port SFP v2 zl Module
 interfaces:
   - name: '{module}1'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}2'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}3'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}4'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}5'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}6'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}7'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}8'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}9'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}10'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}11'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}12'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}13'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}14'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}15'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}16'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}17'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}18'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}19'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}20'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}21'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}22'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}23'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}24'
     type: 1000base-x-sfp
-    mgmt_only: false

module-types/Aruba/J9536A.yaml

@@ -1,71 +1,50 @@
 ---
 manufacturer: Aruba
-model: HP J9536A 20-port Gig-T PoE+/2-port 10GbE SFP+ v2 zl Module
+model: J9536A
 part_number: J9536A
+comments: HP J9536A 20-port Gig-T PoE+/2-port 10GbE SFP+ v2 zl Module
 interfaces:
   - name: '{module}1'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}2'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}3'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}4'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}5'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}6'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}7'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}8'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}9'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}10'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}11'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}12'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}13'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}14'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}15'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}16'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}17'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}18'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}19'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}20'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}21'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: '{module}22'
     type: 10gbase-x-sfpp
-    mgmt_only: false

module-types/Aruba/J9537A.yaml

@@ -1,77 +1,54 @@
 ---
 manufacturer: Aruba
-model: HP J9537A 24-port SFP v2 zl Module
+model: J9537A
 part_number: J9537A
+comments: HP J9537A 24-port SFP v2 zl Module
 interfaces:
   - name: '{module}1'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}2'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}3'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}4'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}5'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}6'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}7'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}8'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}9'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}10'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}11'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}12'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}13'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}14'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}15'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}16'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}17'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}18'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}19'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}20'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}21'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}22'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}23'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}24'
     type: 1000base-x-sfp
-    mgmt_only: false

module-types/Aruba/J9538A.yaml

@@ -1,29 +1,22 @@
 ---
 manufacturer: Aruba
-model: HP J9538A 8p 10G-GbE SFP+ v2 zl Module
+model: J9538A
 part_number: J9538A
+comments: HP J9538A 8p 10G-GbE SFP+ v2 zl Module
 interfaces:
   - name: '{module}1'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: '{module}2'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: '{module}3'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: '{module}4'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: '{module}5'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: '{module}6'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: '{module}7'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: '{module}8'
     type: 10gbase-x-sfpp
-    mgmt_only: false

module-types/Aruba/J9546A.yaml

@@ -1,29 +1,22 @@
 ---
 manufacturer: Aruba
-model: HP J9546A 8-port 10GBASE-T v2 zl Module
+model: J9546A
 part_number: J9546A
+comments: HP J9546A 8-port 10GBASE-T v2 zl Module
 interfaces:
   - name: '{module}1'
     type: 10gbase-t
-    mgmt_only: false
   - name: '{module}2'
     type: 10gbase-t
-    mgmt_only: false
   - name: '{module}3'
     type: 10gbase-t
-    mgmt_only: false
   - name: '{module}4'
     type: 10gbase-t
-    mgmt_only: false
   - name: '{module}5'
     type: 10gbase-t
-    mgmt_only: false
   - name: '{module}6'
     type: 10gbase-t
-    mgmt_only: false
   - name: '{module}7'
     type: 10gbase-t
-    mgmt_only: false
   - name: '{module}8'
     type: 10gbase-t
-    mgmt_only: false

module-types/Aruba/J9547A.yaml

@@ -1,77 +1,54 @@
 ---
 manufacturer: Aruba
-model: HP J9547A 24-port 10/100 PoE+ v2 zl Module
+model: J9547A
 part_number: J9547A
+comments: HP J9547A 24-port 10/100 PoE+ v2 zl Module
 interfaces:
   - name: '{module}1'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}2'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}3'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}4'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}5'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}6'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}7'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}8'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}9'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}10'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}11'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}12'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}13'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}14'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}15'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}16'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}17'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}18'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}19'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}20'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}21'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}22'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}23'
     type: 100base-tx
-    mgmt_only: false
   - name: '{module}24'
     type: 100base-tx
-    mgmt_only: false

module-types/Aruba/J9548A.yaml

@@ -1,71 +1,50 @@
 ---
 manufacturer: Aruba
-model: HP J9548A 20-port Gig-T/2-port 10GbE SFP+ v2 zl Module
+model: J9548A
 part_number: J9548A
+comments: HP J9548A 20-port Gig-T/2-port 10GbE SFP+ v2 zl Module
 interfaces:
   - name: '{module}1'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}2'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}3'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}4'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}5'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}6'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}7'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}8'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}9'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}10'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}11'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}12'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}13'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}14'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}15'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}16'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}17'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}18'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}19'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}20'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}21'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: '{module}22'
     type: 10gbase-x-sfpp
-    mgmt_only: false

module-types/Aruba/J9549A.yaml

@@ -1,77 +1,54 @@
 ---
 manufacturer: Aruba
-model: HP J9549A 20-port Gig-T/4-port SFP v2 zl Module
+model: J9549A
 part_number: J9549A
+comments: HP J9549A 20-port Gig-T/4-port SFP v2 zl Module
 interfaces:
   - name: '{module}1'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}2'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}3'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}4'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}5'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}6'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}7'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}8'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}9'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}10'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}11'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}12'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}13'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}14'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}15'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}16'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}17'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}18'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}19'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}20'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}21'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}22'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}23'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}24'
     type: 1000base-x-sfp
-    mgmt_only: false

module-types/Aruba/J9550A.yaml

@@ -1,77 +1,54 @@
 ---
 manufacturer: Aruba
-model: HP J9550A 24-port Gig-T v2 zl Module
+model: J9550A
 part_number: J9550A
+comments: HP J9550A 24-port Gig-T v2 zl Module
 interfaces:
   - name: '{module}1'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}2'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}3'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}4'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}5'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}6'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}7'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}8'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}9'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}10'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}11'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}12'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}13'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}14'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}15'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}16'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}17'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}18'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}19'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}20'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}21'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}22'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}23'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}24'
     type: 1000base-t
-    mgmt_only: false

module-types/Aruba/J9637A.yaml

@@ -1,77 +1,54 @@
 ---
 manufacturer: Aruba
-model: HP J9637A 12-port Gig-T PoE+/12-port SFP v2 zl Module
+model: J9637A
 part_number: J9637A
+comments: HP J9637A 12-port Gig-T PoE+/12-port SFP v2 zl Module
 interfaces:
   - name: '{module}1'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}2'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}3'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}4'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}5'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}6'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}7'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}8'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}9'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}10'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}11'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}12'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}13'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}14'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}15'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}16'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}17'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}18'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}19'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}20'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}21'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}22'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}23'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: '{module}24'
     type: 1000base-x-sfp
-    mgmt_only: false

module-types/Aruba/J9827A.yaml

@@ -1,7 +1,8 @@
 ---
 manufacturer: Aruba
-model: HP J9827A Management Module 5400Rzl2
+model: J9827A
 part_number: J9827A
+comments: HP J9827A Management Module 5400Rzl2
 console-ports:
   - name: Auxiliary Port
     type: usb-a

module-types/Aruba/J9828A.yaml

@@ -1,7 +1,9 @@
 ---
 manufacturer: Aruba
-model: 5400R 700W PoE+ zl2 Power Supply (J9828A)
+model: J9828A
 part_number: J9828A
+comments: 5400R 700W PoE+ zl2 Power Supply (J9828A)
 power-ports:
   - name: '{module}-1'
     type: iec-60320-c14
+    maximum_draw: 700

module-types/Aruba/J9829A.yaml

@@ -1,7 +1,9 @@
 ---
 manufacturer: Aruba
-model: 5400R 1100W PoE+ zl2 Power Supply (J9829A)
+model: J9829A
 part_number: J9829A
+comments: 5400R 1100W PoE+ zl2 Power Supply (J9829A)
 power-ports:
   - name: '{module}-1'
     type: iec-60320-c14
+    maximum_draw: 1100

module-types/Aruba/J9830B.yaml

@@ -1,7 +1,8 @@
 ---
 manufacturer: Aruba
-model: 5400R 2750W PoE+ zl2 Power Supply (J9830B)
+model: J9830B
 part_number: J9830B
+comments: 5400R 2750W PoE+ zl2 Power Supply (J9830B)
 power-ports:
   - name: '{module}-1'
     type: iec-60320-c20

module-types/Aruba/J9986A.yaml

@@ -1,77 +1,54 @@
 ---
 manufacturer: Aruba
-model: HP J9986A 24p 10/100/1000BASE-T PoE+ V3 zl Module
+model: J9986A
 part_number: J9986A
+comments: HP J9986A 24p 10/100/1000BASE-T PoE+ V3 zl Module
 interfaces:
   - name: '{module}1'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}2'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}3'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}4'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}5'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}6'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}7'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}8'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}9'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}10'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}11'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}12'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}13'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}14'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}15'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}16'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}17'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}18'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}19'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}20'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}21'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}22'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}23'
     type: 1000base-t
-    mgmt_only: false
   - name: '{module}24'
     type: 1000base-t
-    mgmt_only: false

module-types/Broadcom Corporation/NetXtreme-BCM5719-4P.yaml

@@ -1,7 +1,7 @@
 ---
 manufacturer: Broadcom Corporation
 model: NetXtreme BCM5719-4P
-part_number: BCM5719-4P
+part_number: BCM95719A1904AC
 comments: '[BCM5719-4P - 4 x 1GbE PCIe NIC](https://www.broadcom.com/products/ethernet-connectivity/network-adapters/bcm5719-4p)'
 interfaces:
   - name: pcie{module}.nic1

module-types/Check Point/2-10FSR-BP-B.yaml

@@ -1,13 +1,12 @@
 ---
 manufacturer: Check Point
-model: 2 Port 10G Base-SFP+ fail-open network I/O module interface card
+model: CPAC-2-10FSR-BP-B
 part_number: CPAC-2-10FSR-BP-B
+comments: 2 Port 10G Base-SFP+ fail-open network I/O module interface card
 interfaces:
   - name: eth{module}-01
     label: '1'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: eth{module}-02
     label: '2'
     type: 10gbase-x-sfpp
-    mgmt_only: false

module-types/Check Point/4-10F-C.yaml

@@ -1,21 +1,18 @@
 ---
 manufacturer: Check Point
-model: 4 Port 10GBase-F SFP+ interface card
+model: CPAC-4-10F-C
 part_number: CPAC-4-10F-C
+comments: 4 Port 10GBase-F SFP+ interface card
 interfaces:
   - name: eth{module}-01
     label: '1'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: eth{module}-02
     label: '2'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: eth{module}-03
     label: '3'
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: eth{module}-04
     label: '4'
     type: 10gbase-x-sfpp
-    mgmt_only: false

module-types/Check Point/4-1C-BP-B.yaml

@@ -1,21 +1,18 @@
 ---
 manufacturer: Check Point
-model: 4 Port 10/100/1000 Base-T RJ45 fail-open network I/O module interface card
+model: CPAC-4-1C-BP-B
 part_number: CPAC-4-1C-BP-B
+comments: 4 Port 10/100/1000 Base-T RJ45 fail-open network I/O module interface card
 interfaces:
   - name: eth{module}-01
     label: '1'
     type: 1000base-t
-    mgmt_only: false
   - name: eth{module}-02
     label: '2'
     type: 1000base-t
-    mgmt_only: false
   - name: eth{module}-03
     label: '3'
     type: 1000base-t
-    mgmt_only: false
   - name: eth{module}-04
     label: '4'
     type: 1000base-t
-    mgmt_only: false

module-types/Check Point/4-1F-C.yaml

@@ -1,21 +1,18 @@
 ---
 manufacturer: Check Point
-model: 4 Port 1000Base-F SFP interface card
+model: CPAC-4-1F-C
 part_number: CPAC-4-1F-C
+comments: 4 Port 1000Base-F SFP interface card
 interfaces:
   - name: eth{module}-01
     label: '1'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: eth{module}-02
     label: '2'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: eth{module}-03
     label: '3'
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: eth{module}-04
     label: '4'
     type: 1000base-x-sfp
-    mgmt_only: false

module-types/Check Point/8-1C-C.yaml

@@ -1,21 +1,18 @@
 ---
 manufacturer: Check Point
-model: 8 Port 10/100/1000 Base-T RJ45 interface card
+model: CPAC-8-1C-C
 part_number: CPAC-8-1C-C
+comments: 8 Port 10/100/1000 Base-T RJ45 interface card
 interfaces:
   - name: eth{module}-01
     label: '1'
     type: 1000base-t
-    mgmt_only: false
   - name: eth{module}-02
     label: '2'
     type: 1000base-t
-    mgmt_only: false
   - name: eth{module}-03
     label: '3'
     type: 1000base-t
-    mgmt_only: false
   - name: eth{module}-04
     label: '4'
     type: 1000base-t
-    mgmt_only: false

module-types/Cisco/A9K-RSP440-LT.yaml

@@ -7,22 +7,22 @@ interfaces:
   - name: MgmtEth0/RSP{module}/CPU0/0
     type: 1000base-t
     mgmt_only: true
-    description: Out-of-Band Management Interface
+    comments: Out-of-Band Management Interface
   - name: MgmtEth0/RSP{module}/CPU0/1
     type: 1000base-t
     mgmt_only: true
-    description: Out-of-Band Management Interface
+    comments: Out-of-Band Management Interface
   - name: External USB2 class-A port
     type: other
     mgmt_only: true
   - name: SFP+_00_10GE
     type: 10gbase-x-sfpp
-    description: Virtualization Cluster Port
+    comments: Virtualization Cluster Port
     mgmt_only: true
   - name: SFP+_01_10GE
     type: 10gbase-x-sfpp
     mgmt_only: true
-    description: Virtualization Cluster Port
+    comments: Virtualization Cluster Port
 console-ports:
   - name: Console
     type: rj-45

module-types/Cisco/A9K-RSP440-SE.yaml

@@ -7,22 +7,22 @@ interfaces:
   - name: MgmtEth0/RSP{module}/CPU0/0
     type: 1000base-t
     mgmt_only: true
-    description: Out-of-Band Management Interface
+    comments: Out-of-Band Management Interface
   - name: MgmtEth0/RSP{module}/CPU0/1
     type: 1000base-t
     mgmt_only: true
-    description: Out-of-Band Management Interface
+    comments: Out-of-Band Management Interface
   - name: External USB2 class-A port
     type: other
     mgmt_only: true
   - name: SFP+_00_10GE
     type: 10gbase-x-sfpp
-    description: Virtualization Cluster Port
+    comments: Virtualization Cluster Port
     mgmt_only: true
   - name: SFP+_01_10GE
     type: 10gbase-x-sfpp
     mgmt_only: true
-    description: Virtualization Cluster Port
+    comments: Virtualization Cluster Port
 console-ports:
   - name: Console
     type: rj-45

module-types/Cisco/A9K-RSP440-TR.yaml

@@ -7,22 +7,22 @@ interfaces:
   - name: MgmtEth0/RSP{module}/CPU0/0
     type: 1000base-t
     mgmt_only: true
-    description: Out-of-Band Management Interface
+    comments: Out-of-Band Management Interface
   - name: MgmtEth0/RSP{module}/CPU0/1
     type: 1000base-t
     mgmt_only: true
-    description: Out-of-Band Management Interface
+    comments: Out-of-Band Management Interface
   - name: External USB2 class-A port
     type: other
     mgmt_only: true
   - name: SFP+_00_10GE
     type: 10gbase-x-sfpp
-    description: Virtualization Cluster Port
+    comments: Virtualization Cluster Port
     mgmt_only: true
   - name: SFP+_01_10GE
     type: 10gbase-x-sfpp
     mgmt_only: true
-    description: Virtualization Cluster Port
+    comments: Virtualization Cluster Port
 console-ports:
   - name: Console
     type: rj-45

module-types/Cisco/ISR4431-X-4x1GE.yaml

@@ -1,7 +1,8 @@
 ---
 manufacturer: Cisco
 part_number: ISR4431-X-4x1GE
-model: Front Panel 4 ports Gigabitethernet Module
+model: ISR4431-X-4x1GE
+comments: Front Panel 4 ports Gigabitethernet Module
 interfaces:
   - name: GigabitEthernet{module}/0/0
     type: 1000base-t

module-types/Cisco/N77-F348XP-23.yaml

@@ -2,7 +2,6 @@
 manufacturer: Cisco
 model: N77-F348XP-23
 part_number: N77-F348XP-23
-
 interfaces:
   - name: Ethernet{module}/1
     type: 10gbase-x-sfpp

module-types/Cisco/RSP720-3C-GE.yaml

@@ -8,7 +8,5 @@ console-ports:
 interfaces:
   - name: Gi{module}/1
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: Gi{module}/2
     type: 1000base-x-sfp
-    mgmt_only: false

module-types/Cisco/UCS-FI-M-6324.yaml

@@ -10,28 +10,20 @@ console-ports:
 interfaces:
   - name: Fabric {module}/5/1
     type: 40gbase-x-qsfpp
-    mgmt_only: false
   - name: Fabric {module}/5/2
     type: 40gbase-x-qsfpp
-    mgmt_only: false
   - name: Fabric {module}/5/3
     type: 40gbase-x-qsfpp
-    mgmt_only: false
   - name: Fabric {module}/5/4
     type: 40gbase-x-qsfpp
-    mgmt_only: false
   - name: Fabric {module}/1
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/2
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/3
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/4
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: IOM {module} Mgmt0
     type: 1000base-t
     mgmt_only: true

module-types/Cisco/UCS-IOM-2204XP.yaml

@@ -5,13 +5,9 @@ part_number: UCS-IOM-2204XP
 interfaces:
   - name: Fabric {module}/1
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/2
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/3
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/4
     type: 10gbase-x-sfpp
-    mgmt_only: false

module-types/Cisco/UCS-IOM-2208XP.yaml

@@ -5,25 +5,17 @@ part_number: UCS-IOM-2208XP
 interfaces:
   - name: Fabric {module}/1
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/2
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/3
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/4
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/5
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/6
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/7
     type: 10gbase-x-sfpp
-    mgmt_only: false
   - name: Fabric {module}/8
     type: 10gbase-x-sfpp
-    mgmt_only: false

module-types/Cisco/UCS-IOM-2304.yaml

@@ -5,13 +5,9 @@ part_number: UCS-IOM-2304
 interfaces:
   - name: Fabric {module}/1
     type: 40gbase-x-qsfpp
-    mgmt_only: false
   - name: Fabric {module}/2
     type: 40gbase-x-qsfpp
-    mgmt_only: false
   - name: Fabric {module}/3
     type: 40gbase-x-qsfpp
-    mgmt_only: false
   - name: Fabric {module}/4
     type: 40gbase-x-qsfpp
-    mgmt_only: false

module-types/Cisco/UCS-IOM-2408.yaml

@@ -5,25 +5,17 @@ part_number: UCS-IOM-2408
 interfaces:
   - name: Fabric {module}/1
     type: 25gbase-x-sfp28
-    mgmt_only: false
   - name: Fabric {module}/2
     type: 25gbase-x-sfp28
-    mgmt_only: false
   - name: Fabric {module}/3
     type: 25gbase-x-sfp28
-    mgmt_only: false
   - name: Fabric {module}/4
     type: 25gbase-x-sfp28
-    mgmt_only: false
   - name: Fabric {module}/5
     type: 25gbase-x-sfp28
-    mgmt_only: false
   - name: Fabric {module}/6
     type: 25gbase-x-sfp28
-    mgmt_only: false
   - name: Fabric {module}/7
     type: 25gbase-x-sfp28
-    mgmt_only: false
   - name: Fabric {module}/8
     type: 25gbase-x-sfp28
-    mgmt_only: false

module-types/Cisco/VIC2-4FXO.yaml

@@ -2,21 +2,17 @@
 manufacturer: Cisco
 model: VIC2-4FXO
 part_number: VIC2-4FXO
-comments: 'Description: 2nd generation four port FXO voice interface daughtercard'
+comments: 2nd generation four port FXO voice interface daughtercard
 interfaces:
   - name: voice-port {module}/0
     type: other
-    mgmt_only: false
     label: '0'
   - name: voice-port {module}/1
     type: other
-    mgmt_only: false
     label: '1'
   - name: voice-port {module}/2
     type: other
-    mgmt_only: false
     label: '2'
   - name: voice-port {module}/3
     type: other
-    mgmt_only: false
     label: '3'

module-types/Cisco/WS-X4648-RJ45V+E.yaml

@@ -1,7 +1,8 @@
 ---
 manufacturer: Cisco
 part_number: WS-X4648-RJ45V+E
-model: 10/100/1000BaseT (RJ45)+V E Series with 48 10/100/1000 baseT Premium PoE ports
+model: WS-X4648-RJ45V+E
+comments: 10/100/1000BaseT (RJ45)+V E Series with 48 10/100/1000 baseT Premium PoE ports
 interfaces:
   - name: GigabitEthernet{module}/1
     type: 1000base-t

module-types/Cisco/WS-X4748-RJ45V+E.yaml

@@ -1,7 +1,8 @@
 ---
 manufacturer: Cisco
 part_number: WS-X4748-RJ45V+E
-model: 10/100/1000BaseT (RJ45)+V E Series with 48 10/100/1000 baseT Premium PoE ports
+model: WS-X4748-RJ45V+E
+comments: 10/100/1000BaseT (RJ45)+V E Series with 48 10/100/1000 baseT Premium PoE ports
 interfaces:
   - name: GigabitEthernet{module}/1
     type: 1000base-t

module-types/Cisco/WS-X6708-10GE.yaml

@@ -5,25 +5,17 @@ part_number: WS-X6708-10GE
 interfaces:
   - name: TenGigabitEthernet{module}/1
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/2
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/3
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/4
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/5
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/6
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/7
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/8
     type: 10gbase-x-x2
-    mgmt_only: false

module-types/Cisco/WS-X6716-10GE.yaml

@@ -5,49 +5,33 @@ part_number: WS-X6716-10GE
 interfaces:
   - name: TenGigabitEthernet{module}/1
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/2
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/3
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/4
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/5
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/6
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/7
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/8
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/9
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/10
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/11
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/12
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/13
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/14
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/15
     type: 10gbase-x-x2
-    mgmt_only: false
   - name: TenGigabitEthernet{module}/16
     type: 10gbase-x-x2
-    mgmt_only: false

module-types/Cisco/WS-X6724-SFP.yaml

@@ -5,73 +5,49 @@ part_number: WS-X6724-SFP
 interfaces:
   - name: GigabitEthernet{module}/1
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/2
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/3
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/4
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/5
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/6
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/7
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/8
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/9
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/10
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/11
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/12
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/13
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/14
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/15
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/16
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/17
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/18
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/19
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/20
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/21
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/22
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/23
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/24
     type: 1000base-x-sfp
-    mgmt_only: false

module-types/Cisco/WS-X6748-GE-TX.yaml

@@ -5,145 +5,97 @@ part_number: WS-X6748-GE-TX
 interfaces:
   - name: GigabitEthernet{module}/1
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/2
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/3
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/4
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/5
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/6
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/7
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/8
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/9
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/10
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/11
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/12
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/13
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/14
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/15
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/16
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/17
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/18
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/19
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/20
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/21
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/22
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/23
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/24
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/25
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/26
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/27
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/28
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/29
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/30
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/31
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/32
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/33
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/34
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/35
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/36
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/37
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/38
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/39
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/40
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/41
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/42
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/43
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/44
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/45
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/46
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/47
     type: 1000base-t
-    mgmt_only: false
   - name: GigabitEthernet{module}/48
     type: 1000base-t
-    mgmt_only: false

module-types/Cisco/WS-X6748-SFP.yaml

@@ -5,145 +5,97 @@ part_number: WS-X6748-SFP
 interfaces:
   - name: GigabitEthernet{module}/1
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/2
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/3
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/4
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/5
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/6
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/7
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/8
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/9
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/10
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/11
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/12
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/13
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/14
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/15
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/16
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/17
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/18
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/19
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/20
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/21
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/22
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/23
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/24
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/25
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/26
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/27
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/28
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/29
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/30
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/31
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/32
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/33
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/34
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/35
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/36
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/37
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/38
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/39
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/40
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/41
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/42
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/43
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/44
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/45
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/46
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/47
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: GigabitEthernet{module}/48
     type: 1000base-x-sfp
-    mgmt_only: false

module-types/Corning/ECM-UM-12-04-89G.yaml

@@ -9,34 +9,34 @@ front-ports:
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 1
-    description: Front Port 1 (Strands 1-2)
+    comments: Front Port 1 (Strands 1-2)
   - name: '{module}2'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 2
-    description: Front Port 2 (Strands 3-4)
+    comments: Front Port 2 (Strands 3-4)
   - name: '{module}3'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 3
-    description: Front Port 3 (Strands 5-6)
+    comments: Front Port 3 (Strands 5-6)
   - name: '{module}4'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 4
-    description: Front Port 4 (Strands 7-8)
+    comments: Front Port 4 (Strands 7-8)
   - name: '{module}5'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 5
-    description: Front Port 5 (Strands 9-10)
+    comments: Front Port 5 (Strands 9-10)
   - name: '{module}6'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 6
-    description: Front Port 6 (Strands 11-12)
+    comments: Front Port 6 (Strands 11-12)
 rear-ports:
   - name: '{module}1-6'
     type: mpo
     positions: 6
-    description: Rear Port MPO connector ports 1-6 (strands 1-12)
+    comments: Rear Port MPO connector ports 1-6 (strands 1-12)

module-types/Corning/ECM-UM-12-05-93Q.yaml

@@ -9,34 +9,34 @@ front-ports:
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 1
-    description: Front Port 1 (Strands 1-2)
+    comments: Front Port 1 (Strands 1-2)
   - name: '{module}2'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 2
-    description: Front Port 2 (Strands 3-4)
+    comments: Front Port 2 (Strands 3-4)
   - name: '{module}3'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 3
-    description: Front Port 3 (Strands 5-6)
+    comments: Front Port 3 (Strands 5-6)
   - name: '{module}4'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 4
-    description: Front Port 4 (Strands 7-8)
+    comments: Front Port 4 (Strands 7-8)
   - name: '{module}5'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 5
-    description: Front Port 5 (Strands 9-10)
+    comments: Front Port 5 (Strands 9-10)
   - name: '{module}6'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 6
-    description: Front Port 6 (Strands 11-12)
+    comments: Front Port 6 (Strands 11-12)
 rear-ports:
   - name: '{module}1-6'
     type: mpo
     positions: 6
-    description: Rear Port MPO connector ports 1-6 (strands 1-12)
+    comments: Rear Port MPO connector ports 1-6 (strands 1-12)

module-types/Corning/ECM-UM-12-05-93T.yaml

@@ -9,34 +9,34 @@ front-ports:
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 1
-    description: Front Port 1 (Strands 1-2)
+    comments: Front Port 1 (Strands 1-2)
   - name: '{module}2'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 2
-    description: Front Port 2 (Strands 3-4)
+    comments: Front Port 2 (Strands 3-4)
   - name: '{module}3'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 3
-    description: Front Port 3 (Strands 5-6)
+    comments: Front Port 3 (Strands 5-6)
   - name: '{module}4'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 4
-    description: Front Port 4 (Strands 7-8)
+    comments: Front Port 4 (Strands 7-8)
   - name: '{module}5'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 5
-    description: Front Port 5 (Strands 9-10)
+    comments: Front Port 5 (Strands 9-10)
   - name: '{module}6'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 6
-    description: Front Port 6 (Strands 11-12)
+    comments: Front Port 6 (Strands 11-12)
 rear-ports:
   - name: '{module}1-6'
     type: mpo
     positions: 6
-    description: Rear Port MPO connector ports 1-6 (strands 1-12)
+    comments: Rear Port MPO connector ports 1-6 (strands 1-12)

module-types/Corning/ECM-UM-12-05-93V.yaml

@@ -9,34 +9,34 @@ front-ports:
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 1
-    description: Front Port 1 (Strands 1-2)
+    comments: Front Port 1 (Strands 1-2)
   - name: '{module}2'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 2
-    description: Front Port 2 (Strands 3-4)
+    comments: Front Port 2 (Strands 3-4)
   - name: '{module}3'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 3
-    description: Front Port 3 (Strands 5-6)
+    comments: Front Port 3 (Strands 5-6)
   - name: '{module}4'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 4
-    description: Front Port 4 (Strands 7-8)
+    comments: Front Port 4 (Strands 7-8)
   - name: '{module}5'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 5
-    description: Front Port 5 (Strands 9-10)
+    comments: Front Port 5 (Strands 9-10)
   - name: '{module}6'
     type: lc
     rear_port: '{module}1-6'
     rear_port_position: 6
-    description: Front Port 6 (Strands 11-12)
+    comments: Front Port 6 (Strands 11-12)
 rear-ports:
   - name: '{module}1-6'
     type: mpo
     positions: 6
-    description: Rear Port MPO connector ports 1-6 (strands 1-12)
+    comments: Rear Port MPO connector ports 1-6 (strands 1-12)

module-types/Dell/3PD98.yaml

@@ -6,3 +6,4 @@ comments: Dell 3PD98 PV ME412 ME424 ME4012 ME4024 ME5012 ME5024 C13 580W AC Powe
 power-ports:
   - name: PSU{module}
     type: iec-60320-c14
+    maximum_draw: 580

module-types/Dell/49H29.yaml

@@ -2,7 +2,7 @@
 manufacturer: Dell
 model: 49H29
 part_number: 49H29
-comments: SAS 4 Port Controller for use in the Dell ME4012 and Dell ME4024
+comments: PowerVault ME4012 ME4024 SAS 4 Port Controller
 interfaces:
   - name: mgmtport_{module}
     type: 1000base-t

module-types/Eaton/EMPDT1H1C2.yaml

@@ -1,16 +1,14 @@
 ---
 manufacturer: Eaton
-model: Environmental Monitoring Probe Gen 2
+model: EMPDT1H1C2
 part_number: EMPDT1H1C2
 comments: Environmental Monitoring Probe Gen 2 [Manual](https://www.eaton.com/content/dam/eaton/products/backup-power-ups-surge-it-power-distribution/power-management-software-connectivity/eaton-environmental-monitoring-probe-gen-2/eaton-emp-gen-2-manual.pdf)
 interfaces:
   - name: EMP{module}/Device
     type: other
-    mgmt_only: false
     label: from device
-    description: RJ45 connector for RS485/Modbus connection
+    comments: RJ45 connector for RS485/Modbus connection
   - name: EMP{module}/Sensors
     type: other
-    mgmt_only: false
     label: to sensors
-    description: RJ45 connector for RS485/Modbus connection
+    comments: RJ45 connector for RS485/Modbus connection

module-types/Eaton/Network-M2.yaml

@@ -8,12 +8,11 @@ interfaces:
     type: other
     mgmt_only: true
     label: Settings
-    description: RNDIS (Ethernet over USB) connection with USB Micro-B connector
+    comments: RNDIS (Ethernet over USB) connection with USB Micro-B connector
   - name: Sensors
     type: other
-    mgmt_only: false
     label: AUX
-    description: USB-A connection for USB to RS485/Modbus connection to environmental sensors
+    comments: USB-A connection for USB to RS485/Modbus connection to environmental sensors
   - name: mgmt
     type: 1000base-t
     mgmt_only: true

module-types/FS/FHD-1MTP12LCDSMFA.yaml

@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FHD-1MTP12LCDSMFA
-part_number: FHD-1MTP12LCDSMFA (#57023)
+part_number: '57023'
 comments: FHD MTP-24 Cassette, 24 Fibers OS2 Single Mode, Type A, MTP to 12 x LC Duplex
 front-ports:
   - name: '{module}:1-2'

module-types/FS/FHD-1MTP12LCDSMFAF.yaml

@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FHD-1MTP12LCDSMFAF
-part_number: FHD-1MTP12LCDSMFAF (#68549)
+part_number: '68549'
 comments: FHD MTP-24 Cassette, 24 Fibers OS2 Single Mode, Type AF, MTP to 12 x LC Duplex
 front-ports:
   - name: '{module}:1-2'

module-types/FS/FHD-1MTP6LCDSMFA.yaml

@@ -1,8 +1,8 @@
 ---
 manufacturer: FS
 model: FHD-1MTP6LCDSMFA
+part_number: '57016'
 comments: FHD MTP-12 Cassette, 12 Fibers OS2 Single Mode, Type AF, MTP to 6 x LC Duplex (Blue), 0.35dB max
-part_number: FHD-1MTP6LCDSMFA (#57016)
 front-ports:
   - name: '{module}:1-2'
     type: lc

module-types/FS/FHD-1MTP6LCDSMFAF.yaml

@@ -1,8 +1,8 @@
 ---
 manufacturer: FS
 model: FHD-1MTP6LCDSMFAF
+part_number: '57037'
 comments: FHD MTP-12 Cassette, 12 Fibers OS2 Single Mode, Type AF, MTP to 6 x LC Duplex (Blue), 0.35dB max
-part_number: FHD-1MTP6LCDSMFAF (#57037)
 front-ports:
   - name: '{module}:1-2'
     type: lc

module-types/FS/FHD-2MTP12LCDSMFA.yaml

@@ -1,8 +1,8 @@
 ---
 manufacturer: FS
 model: FHD-2MTP12LCDSMFA
+part_number: '57341'
 comments: FHD 2 x MTP-12 Cassette, 24 Fibers OS2 Single Mode, Type A, 2 x 12F MTP to 12 x LC Duplex (Blue), 0.35dB max
-part_number: FHD-2MTP12LCDSMFA (#57341)
 front-ports:
   - name: '{module}:1-2'
     type: lc

module-types/FS/FHD-2MTP12LCDSMFAF.yaml

@@ -1,8 +1,8 @@
 ---
 manufacturer: FS
 model: FHD-2MTP12LCDSMFAF
+part_number: '68540'
 comments: FHD 2 x MTP-12 Cassette, 24 Fibers OS2 Single Mode, Type AF, 2 x 12F MTP to 12 x LC Duplex (Blue), 0.35dB max
-part_number: FHD-2MTP12LCDSMFAF (#68540)
 front-ports:
   - name: '{module}:1-2'
     type: lc

module-types/FS/FHD-FMP6-CAT6.yaml

@@ -1,37 +0,0 @@
----
-manufacturer: FS
-model: FHD-FMP6 + CAT6
-comments: FHD 6-Port Multimedia Copper/Fiber Modular Panel with 6 x Plastic Clips + CAT6 Jacks
-part_number: FHD-FMP6 (#66602) + CAT6 Jacks
-front-ports:
-  - name: '{module}:1'
-    type: 8p8c
-    rear_port: '{module}:1'
-  - name: '{module}:2'
-    type: 8p8c
-    rear_port: '{module}:2'
-  - name: '{module}:3'
-    type: 8p8c
-    rear_port: '{module}:3'
-  - name: '{module}:4'
-    type: 8p8c
-    rear_port: '{module}:4'
-  - name: '{module}:5'
-    type: 8p8c
-    rear_port: '{module}:5'
-  - name: '{module}:6'
-    type: 8p8c
-    rear_port: '{module}:6'
-rear-ports:
-  - name: '{module}:1'
-    type: 8p8c
-  - name: '{module}:2'
-    type: 8p8c
-  - name: '{module}:3'
-    type: 8p8c
-  - name: '{module}:4'
-    type: 8p8c
-  - name: '{module}:5'
-    type: 8p8c
-  - name: '{module}:6'
-    type: 8p8c

module-types/FS/FHD-FMP6-LC.yaml

@@ -1,37 +0,0 @@
----
-manufacturer: FS
-model: FHD-FMP6 + LC
-comments: FHD 6-Port Multimedia Copper/Fiber Modular Panel with 6 x Plastic Clips + LC Adapter
-part_number: FHD-FMP6 (#66602) + LC Adapter
-front-ports:
-  - name: '{module}:1'
-    type: lc
-    rear_port: '{module}:1'
-  - name: '{module}:2'
-    type: lc
-    rear_port: '{module}:2'
-  - name: '{module}:3'
-    type: lc
-    rear_port: '{module}:3'
-  - name: '{module}:4'
-    type: lc
-    rear_port: '{module}:4'
-  - name: '{module}:5'
-    type: lc
-    rear_port: '{module}:5'
-  - name: '{module}:6'
-    type: lc
-    rear_port: '{module}:6'
-rear-ports:
-  - name: '{module}:1'
-    type: lc
-  - name: '{module}:2'
-    type: lc
-  - name: '{module}:3'
-    type: lc
-  - name: '{module}:4'
-    type: lc
-  - name: '{module}:5'
-    type: lc
-  - name: '{module}:6'
-    type: lc

module-types/FS/FHD-FMP6.yaml

@@ -1,5 +1,5 @@
 ---
 manufacturer: FS
 model: FHD-FMP6
+part_number: '66602'
 comments: FHD 6-Port Multimedia Copper/Fiber Modular Panel with 6 x Plastic Clips
-part_number: FHD-FMP6 (#66602)

module-types/FS/FHX-3LCQSMF73.yaml

@@ -1,8 +1,8 @@
 ---
 manufacturer: FS
 model: FHX-3LCQSMF73
-part_number: FHX-3LCQSMF73 (#73676) (discontinued)
-comments: 3x LC Quad, 12 Fibers OS2 Single Mode FHX TAP Cassette, 70/30 Split Ratio (Live/Tap), 1/10/40/100G
+part_number: '73676'
+comments: (discontinued) 3x LC Quad, 12 Fibers OS2 Single Mode FHX TAP Cassette, 70/30 Split Ratio (Live/Tap), 1/10/40/100G
 front-ports:
   - name: '{module}:1'
     type: lc

module-types/Generic/LC-Keystone.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Leviton
-model: KeyStone LC Fiber Pair
-part_number: KeyStone-LC-Fiber-Pair
+manufacturer: Generic
+model: Keystone LC Fiber
+part_number: Keystone-LC-Fiber
 front-ports:
   - name: '{module}-LC'
     type: lc

module-types/Generic/RJ45-Keystone.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Leviton
-model: KeyStone RJ45
-part_number: KeyStone-RJ45
+manufacturer: Generic
+model: Keystone RJ45
+part_number: Keystone-RJ45
 front-ports:
   - name: '{module}-RJ45'
     type: 8p8c

module-types/HPE/X361.yaml

@@ -1,7 +1,8 @@
 ---
 manufacturer: HPE
-model: X361 150W AC Power Supply
-part_number: JD362B
+model: JD362B
+part_number: JD362B#B2B
+comments: X361 150W AC Power Supply
 power-ports:
   - name: Power {module}
     type: iec-60320-c14

module-types/HPE/X362.yaml

@@ -1,7 +1,8 @@
 ---
 manufacturer: HPE
-model: X362 720W AC PoE Power Supply
-part_number: JG544A
+model: JG544A
+part_number: JG544A#ABA
+comments: X362 720W AC PoE Power Supply
 power-ports:
   - name: Power {module}
     type: iec-60320-c16

module-types/Juniper/MIC-3D-20GE-SFP.yaml

@@ -5,61 +5,41 @@ part_number: MIC-3D-20GE-SFP
 interfaces:
   - name: ge-{module}/0/0
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/0/1
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/0/2
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/0/3
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/0/4
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/0/5
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/0/6
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/0/7
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/0/8
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/0/9
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/1/0
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/1/1
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/1/2
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/1/3
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/1/4
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/1/5
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/1/6
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/1/7
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/1/8
     type: 1000base-x-sfp
-    mgmt_only: false
   - name: ge-{module}/1/9
     type: 1000base-x-sfp
-    mgmt_only: false

module-types/SM40-1187040G1

@@ -2,33 +2,12 @@
 manufacturer: Adtran
 model: SM40
 part_number: 1187040G1
-comments: ''
 interfaces:
 - name: Te 1/{module}/1
   type: 10gbase-x-sfpp
-  mgmt_only: false
-  label: ''
-  description: ''
-  poe_mode: ''
-  poe_type: ''
 - name: Te 1/{module}/2
   type: 10gbase-x-sfpp
-  mgmt_only: false
-  label: ''
-  description: ''
-  poe_mode: ''
-  poe_type: ''
 - name: Te 1/{module}/3
   type: 10gbase-x-sfpp
-  mgmt_only: false
-  label: ''
-  description: ''
-  poe_mode: ''
-  poe_type: ''
 - name: Te 1/{module}/4
   type: 10gbase-x-sfpp
-  mgmt_only: false
-  label: ''
-  description: ''
-  poe_mode: ''
-  poe_type: ''