diff --git a/device-types/3Com/4200G-12_Port.yml b/device-types/3Com/4200G-12-Port.yml similarity index 100% rename from device-types/3Com/4200G-12_Port.yml rename to device-types/3Com/4200G-12-Port.yml diff --git a/device-types/3Com/4200G-24_Port.yml b/device-types/3Com/4200G-24-Port.yml similarity index 100% rename from device-types/3Com/4200G-24_Port.yml rename to device-types/3Com/4200G-24-Port.yml diff --git a/device-types/3Com/4200G-48_Port.yml b/device-types/3Com/4200G-48-Port.yml similarity index 100% rename from device-types/3Com/4200G-48_Port.yml rename to device-types/3Com/4200G-48-Port.yml diff --git a/device-types/3Com/4200G-PWR-24_port.yml b/device-types/3Com/4200G-PWR-24-port.yml similarity index 100% rename from device-types/3Com/4200G-PWR-24_port.yml rename to device-types/3Com/4200G-PWR-24-port.yml diff --git a/device-types/3Com/4210G-24_Port.yml b/device-types/3Com/4210G-24-Port.yml similarity index 100% rename from device-types/3Com/4210G-24_Port.yml rename to device-types/3Com/4210G-24-Port.yml diff --git a/device-types/3Com/4210G-48_Port.yml b/device-types/3Com/4210G-48-Port.yml similarity index 100% rename from device-types/3Com/4210G-48_Port.yml rename to device-types/3Com/4210G-48-Port.yml diff --git a/device-types/3Com/4210G-PWR-24_Port.yml b/device-types/3Com/4210G-PWR-24-Port.yml similarity index 100% rename from device-types/3Com/4210G-PWR-24_Port.yml rename to device-types/3Com/4210G-PWR-24-Port.yml diff --git a/device-types/ADVA/FSP_150-XG120PRO-SH.yaml b/device-types/ADVA/FSP-150-XG120PRO-SH.yaml similarity index 100% rename from device-types/ADVA/FSP_150-XG120PRO-SH.yaml rename to device-types/ADVA/FSP-150-XG120PRO-SH.yaml diff --git a/device-types/ADVA/FSP_150-XG418-100G-CFP2.yaml b/device-types/ADVA/FSP-150-XG418-100G-CFP2.yaml similarity index 100% rename from device-types/ADVA/FSP_150-XG418-100G-CFP2.yaml rename to device-types/ADVA/FSP-150-XG418-100G-CFP2.yaml diff --git a/device-types/ADVA/FSP_150-XG418-100G.yaml b/device-types/ADVA/FSP-150-XG418-100G.yaml similarity index 100% rename from device-types/ADVA/FSP_150-XG418-100G.yaml rename to device-types/ADVA/FSP-150-XG418-100G.yaml diff --git a/device-types/ADVA/FSP_150-XG480-100G-CFP2.yaml b/device-types/ADVA/FSP-150-XG480-100G-CFP2.yaml similarity index 100% rename from device-types/ADVA/FSP_150-XG480-100G-CFP2.yaml rename to device-types/ADVA/FSP-150-XG480-100G-CFP2.yaml diff --git a/device-types/ADVA/FSP_150-XG480-100G.yaml b/device-types/ADVA/FSP-150-XG480-100G.yaml similarity index 100% rename from device-types/ADVA/FSP_150-XG480-100G.yaml rename to device-types/ADVA/FSP-150-XG480-100G.yaml diff --git a/device-types/ADVA/FSP_150-XG480-25G-100G.yaml b/device-types/ADVA/FSP-150-XG480-25G-100G.yaml similarity index 100% rename from device-types/ADVA/FSP_150-XG480-25G-100G.yaml rename to device-types/ADVA/FSP-150-XG480-25G-100G.yaml diff --git a/device-types/APC/ats-4421.yml b/device-types/APC/ATS-AP4421.yml similarity index 100% rename from device-types/APC/ats-4421.yml rename to device-types/APC/ATS-AP4421.yml diff --git a/device-types/APC/ats-7723.yml b/device-types/APC/ATS-AP7723.yml similarity index 100% rename from device-types/APC/ats-7723.yml rename to device-types/APC/ATS-AP7723.yml diff --git a/device-types/AVM/7530.yaml b/device-types/AVM/FRITZBox-7530.yaml similarity index 100% rename from device-types/AVM/7530.yaml rename to device-types/AVM/FRITZBox-7530.yaml diff --git a/device-types/AVM/7590.yaml b/device-types/AVM/FRITZBox-7590.yaml similarity index 100% rename from device-types/AVM/7590.yaml rename to device-types/AVM/FRITZBox-7590.yaml diff --git a/device-types/Adtran/NV4660.yaml b/device-types/Adtran/NetVanta-4660.yaml similarity index 100% rename from device-types/Adtran/NV4660.yaml rename to device-types/Adtran/NetVanta-4660.yaml diff --git a/device-types/Adtran/TA-5000-23in.yaml b/device-types/Adtran/Total-Access-5000-23-Inch-Chassis.yaml similarity index 100% rename from device-types/Adtran/TA-5000-23in.yaml rename to device-types/Adtran/Total-Access-5000-23-Inch-Chassis.yaml diff --git a/device-types/Allied Telesis/x8106.yaml b/device-types/Allied Telesis/SwitchBlade-x8106.yaml similarity index 100% rename from device-types/Allied Telesis/x8106.yaml rename to device-types/Allied Telesis/SwitchBlade-x8106.yaml diff --git a/device-types/Allied Telesis/x8112.yaml b/device-types/Allied Telesis/SwitchBlade-x8112.yaml similarity index 100% rename from device-types/Allied Telesis/x8112.yaml rename to device-types/Allied Telesis/SwitchBlade-x8112.yaml diff --git a/device-types/Allied Telesis/x908Gen2.yaml b/device-types/Allied Telesis/SwitchBlade-x908-Gen2.yaml similarity index 100% rename from device-types/Allied Telesis/x908Gen2.yaml rename to device-types/Allied Telesis/SwitchBlade-x908-Gen2.yaml diff --git a/device-types/Brocade/icx6450-48.yaml b/device-types/Brocade/ICX-6450-48.yaml similarity index 100% rename from device-types/Brocade/icx6450-48.yaml rename to device-types/Brocade/ICX-6450-48.yaml diff --git a/device-types/Brocade/icx6610-24.yaml b/device-types/Brocade/ICX-6610-24.yaml similarity index 100% rename from device-types/Brocade/icx6610-24.yaml rename to device-types/Brocade/ICX-6610-24.yaml diff --git a/device-types/Brocade/icx6610-48.yaml b/device-types/Brocade/ICX-6610-48.yaml similarity index 100% rename from device-types/Brocade/icx6610-48.yaml rename to device-types/Brocade/ICX-6610-48.yaml diff --git a/device-types/Brocade/icx6610-48p.yaml b/device-types/Brocade/ICX-6610-48p.yaml similarity index 100% rename from device-types/Brocade/icx6610-48p.yaml rename to device-types/Brocade/ICX-6610-48p.yaml diff --git a/device-types/Brocade/icx6650-64.yaml b/device-types/Brocade/ICX-6650-64.yaml similarity index 100% rename from device-types/Brocade/icx6650-64.yaml rename to device-types/Brocade/ICX-6650-64.yaml diff --git a/device-types/Brocade/icx7150-c12.yaml b/device-types/Brocade/ICX-7150-C12P.yaml similarity index 100% rename from device-types/Brocade/icx7150-c12.yaml rename to device-types/Brocade/ICX-7150-C12P.yaml diff --git a/device-types/Brocade/icx7250-24.yaml b/device-types/Brocade/ICX-7250-24.yaml similarity index 100% rename from device-types/Brocade/icx7250-24.yaml rename to device-types/Brocade/ICX-7250-24.yaml diff --git a/device-types/Brocade/icx7250-48.yaml b/device-types/Brocade/ICX-7250-48.yaml similarity index 100% rename from device-types/Brocade/icx7250-48.yaml rename to device-types/Brocade/ICX-7250-48.yaml diff --git a/device-types/Brocade/icx7450-48.yaml b/device-types/Brocade/ICX-7450-48.yaml similarity index 100% rename from device-types/Brocade/icx7450-48.yaml rename to device-types/Brocade/ICX-7450-48.yaml diff --git a/device-types/Check Point/1500_3600_3800-RM-DUAL.yaml b/device-types/Check Point/CPAC-1500-3600-3800-RM-DUAL.yaml similarity index 100% rename from device-types/Check Point/1500_3600_3800-RM-DUAL.yaml rename to device-types/Check Point/CPAC-1500-3600-3800-RM-DUAL.yaml diff --git a/device-types/Ciena/3928.yaml b/device-types/Ciena/3928AC.yaml similarity index 100% rename from device-types/Ciena/3928.yaml rename to device-types/Ciena/3928AC.yaml diff --git a/device-types/Cisco/2951-K9.yaml b/device-types/Cisco/2951-ISR.yaml similarity index 100% rename from device-types/Cisco/2951-K9.yaml rename to device-types/Cisco/2951-ISR.yaml diff --git a/device-types/Cisco/CDB-MNT-RACK5-C14.yaml b/device-types/Cisco/CDB-MNT-RACK5-C14.yaml index 8ae729ec..c7860016 100644 --- a/device-types/Cisco/CDB-MNT-RACK5-C14.yaml +++ b/device-types/Cisco/CDB-MNT-RACK5-C14.yaml @@ -2,7 +2,7 @@ manufacturer: Cisco model: Catalyst Digital Building 5-slot Rack Mount slug: cisco-catalyst-digital-building-5-slot-rack-mount -part_number: CDB-MNT-RACK5-C14= +part_number: CDB-MNT-RACK5-C14 u_height: 5 is_full_depth: false subdevice_role: parent diff --git a/device-types/Cisco/CISCO3925.yaml b/device-types/Cisco/CISCO3925-CHASSIS.yaml similarity index 100% rename from device-types/Cisco/CISCO3925.yaml rename to device-types/Cisco/CISCO3925-CHASSIS.yaml diff --git a/device-types/Cisco/ISR1100X-4G.yaml b/device-types/Cisco/ISR-100X-4G.yaml similarity index 100% rename from device-types/Cisco/ISR1100X-4G.yaml rename to device-types/Cisco/ISR-100X-4G.yaml diff --git a/device-types/Cisco/ISR1100-4G.yaml b/device-types/Cisco/ISR-1100-4G.yaml similarity index 100% rename from device-types/Cisco/ISR1100-4G.yaml rename to device-types/Cisco/ISR-1100-4G.yaml diff --git a/device-types/Cisco/ISR1100-4GLTEGB.yaml b/device-types/Cisco/ISR-1100-4GLTEGB.yaml similarity index 100% rename from device-types/Cisco/ISR1100-4GLTEGB.yaml rename to device-types/Cisco/ISR-1100-4GLTEGB.yaml diff --git a/device-types/Cisco/ISR1100-4GLTENA.yaml b/device-types/Cisco/ISR-1100-4GLTENA.yaml similarity index 100% rename from device-types/Cisco/ISR1100-4GLTENA.yaml rename to device-types/Cisco/ISR-1100-4GLTENA.yaml diff --git a/device-types/Cisco/ISR1100-6G.yaml b/device-types/Cisco/ISR-1100-6G.yaml similarity index 100% rename from device-types/Cisco/ISR1100-6G.yaml rename to device-types/Cisco/ISR-1100-6G.yaml diff --git a/device-types/Cisco/ISR1100X-6G.yaml b/device-types/Cisco/ISR-1100X-6G.yaml similarity index 100% rename from device-types/Cisco/ISR1100X-6G.yaml rename to device-types/Cisco/ISR-1100X-6G.yaml diff --git a/device-types/Cisco/ISR1111-8P.yaml b/device-types/Cisco/ISR-1111-8P.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8P.yaml rename to device-types/Cisco/ISR-1111-8P.yaml diff --git a/device-types/Cisco/ISR1111-8PLTEEA.yaml b/device-types/Cisco/ISR-1111-8PLTEEA.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTEEA.yaml rename to device-types/Cisco/ISR-1111-8PLTEEA.yaml diff --git a/device-types/Cisco/ISR1111-8PLTEEAWA.yaml b/device-types/Cisco/ISR-1111-8PLTEEAWA.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTEEAWA.yaml rename to device-types/Cisco/ISR-1111-8PLTEEAWA.yaml diff --git a/device-types/Cisco/ISR1111-8PLTEEAWB.yaml b/device-types/Cisco/ISR-1111-8PLTEEAWB.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTEEAWB.yaml rename to device-types/Cisco/ISR-1111-8PLTEEAWB.yaml diff --git a/device-types/Cisco/ISR1111-8PLTEEAWE.yaml b/device-types/Cisco/ISR-1111-8PLTEEAWE.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTEEAWE.yaml rename to device-types/Cisco/ISR-1111-8PLTEEAWE.yaml diff --git a/device-types/Cisco/ISR1111-8PLTEEAWF.yaml b/device-types/Cisco/ISR-1111-8PLTEEAWF.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTEEAWF.yaml rename to device-types/Cisco/ISR-1111-8PLTEEAWF.yaml diff --git a/device-types/Cisco/ISR1111-8PLTEEAWH.yaml b/device-types/Cisco/ISR-1111-8PLTEEAWH.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTEEAWH.yaml rename to device-types/Cisco/ISR-1111-8PLTEEAWH.yaml diff --git a/device-types/Cisco/ISR1111-8PLTEEAWN.yaml b/device-types/Cisco/ISR-1111-8PLTEEAWN.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTEEAWN.yaml rename to device-types/Cisco/ISR-1111-8PLTEEAWN.yaml diff --git a/device-types/Cisco/ISR1111-8PLTEEAWQ.yaml b/device-types/Cisco/ISR-1111-8PLTEEAWQ.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTEEAWQ.yaml rename to device-types/Cisco/ISR-1111-8PLTEEAWQ.yaml diff --git a/device-types/Cisco/ISR1111-8PLTEEAWR.yaml b/device-types/Cisco/ISR-1111-8PLTEEAWR.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTEEAWR.yaml rename to device-types/Cisco/ISR-1111-8PLTEEAWR.yaml diff --git a/device-types/Cisco/ISR1111-8PLTEEAWZ.yaml b/device-types/Cisco/ISR-1111-8PLTEEAWZ.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTEEAWZ.yaml rename to device-types/Cisco/ISR-1111-8PLTEEAWZ.yaml diff --git a/device-types/Cisco/ISR1111-8PLTELA.yaml b/device-types/Cisco/ISR-1111-8PLTELA.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTELA.yaml rename to device-types/Cisco/ISR-1111-8PLTELA.yaml diff --git a/device-types/Cisco/ISR1111-8PLTELAWA.yaml b/device-types/Cisco/ISR-1111-8PLTELAWA.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTELAWA.yaml rename to device-types/Cisco/ISR-1111-8PLTELAWA.yaml diff --git a/device-types/Cisco/ISR1111-8PLTELAWB.yaml b/device-types/Cisco/ISR-1111-8PLTELAWB.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTELAWB.yaml rename to device-types/Cisco/ISR-1111-8PLTELAWB.yaml diff --git a/device-types/Cisco/ISR1111-8PLTELAWE.yaml b/device-types/Cisco/ISR-1111-8PLTELAWE.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTELAWE.yaml rename to device-types/Cisco/ISR-1111-8PLTELAWE.yaml diff --git a/device-types/Cisco/ISR1111-8PLTELAWF.yaml b/device-types/Cisco/ISR-1111-8PLTELAWF.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTELAWF.yaml rename to device-types/Cisco/ISR-1111-8PLTELAWF.yaml diff --git a/device-types/Cisco/ISR1111-8PLTELAWH.yaml b/device-types/Cisco/ISR-1111-8PLTELAWH.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTELAWH.yaml rename to device-types/Cisco/ISR-1111-8PLTELAWH.yaml diff --git a/device-types/Cisco/ISR1111-8PLTELAWN.yaml b/device-types/Cisco/ISR-1111-8PLTELAWN.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTELAWN.yaml rename to device-types/Cisco/ISR-1111-8PLTELAWN.yaml diff --git a/device-types/Cisco/ISR1111-8PLTELAWQ.yaml b/device-types/Cisco/ISR-1111-8PLTELAWQ.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTELAWQ.yaml rename to device-types/Cisco/ISR-1111-8PLTELAWQ.yaml diff --git a/device-types/Cisco/ISR1111-8PLTELAWR.yaml b/device-types/Cisco/ISR-1111-8PLTELAWR.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTELAWR.yaml rename to device-types/Cisco/ISR-1111-8PLTELAWR.yaml diff --git a/device-types/Cisco/ISR1111-8PLTELAWZ.yaml b/device-types/Cisco/ISR-1111-8PLTELAWZ.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PLTELAWZ.yaml rename to device-types/Cisco/ISR-1111-8PLTELAWZ.yaml diff --git a/device-types/Cisco/ISR1111-8PWA.yaml b/device-types/Cisco/ISR-1111-8PWA.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PWA.yaml rename to device-types/Cisco/ISR-1111-8PWA.yaml diff --git a/device-types/Cisco/ISR1111-8PWB.yaml b/device-types/Cisco/ISR-1111-8PWB.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PWB.yaml rename to device-types/Cisco/ISR-1111-8PWB.yaml diff --git a/device-types/Cisco/ISR1111-8PWE.yaml b/device-types/Cisco/ISR-1111-8PWE.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PWE.yaml rename to device-types/Cisco/ISR-1111-8PWE.yaml diff --git a/device-types/Cisco/ISR1111-8PWF.yaml b/device-types/Cisco/ISR-1111-8PWF.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PWF.yaml rename to device-types/Cisco/ISR-1111-8PWF.yaml diff --git a/device-types/Cisco/ISR1111-8PWH.yaml b/device-types/Cisco/ISR-1111-8PWH.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PWH.yaml rename to device-types/Cisco/ISR-1111-8PWH.yaml diff --git a/device-types/Cisco/ISR1111-8PWN.yaml b/device-types/Cisco/ISR-1111-8PWN.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PWN.yaml rename to device-types/Cisco/ISR-1111-8PWN.yaml diff --git a/device-types/Cisco/ISR1111-8PWQ.yaml b/device-types/Cisco/ISR-1111-8PWQ.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PWQ.yaml rename to device-types/Cisco/ISR-1111-8PWQ.yaml diff --git a/device-types/Cisco/ISR1111-8PWR.yaml b/device-types/Cisco/ISR-1111-8PWR.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PWR.yaml rename to device-types/Cisco/ISR-1111-8PWR.yaml diff --git a/device-types/Cisco/ISR1111-8PWZy.yaml b/device-types/Cisco/ISR-1111-8PWZy.yaml similarity index 100% rename from device-types/Cisco/ISR1111-8PWZy.yaml rename to device-types/Cisco/ISR-1111-8PWZy.yaml diff --git a/device-types/Cisco/ISR1121.yaml b/device-types/Cisco/ISR-1121-8P.yaml similarity index 100% rename from device-types/Cisco/ISR1121.yaml rename to device-types/Cisco/ISR-1121-8P.yaml diff --git a/device-types/Cisco/ISR1161-8P.yaml b/device-types/Cisco/ISR-1161-8P.yaml similarity index 100% rename from device-types/Cisco/ISR1161-8P.yaml rename to device-types/Cisco/ISR-1161-8P.yaml diff --git a/device-types/Cisco/ISR1118-8P.yaml b/device-types/Cisco/ISR-C1118-8P.yaml similarity index 100% rename from device-types/Cisco/ISR1118-8P.yaml rename to device-types/Cisco/ISR-C1118-8P.yaml diff --git a/device-types/Cisco/ISR4451.yaml b/device-types/Cisco/ISR4451-X.yaml similarity index 100% rename from device-types/Cisco/ISR4451.yaml rename to device-types/Cisco/ISR4451-X.yaml diff --git a/device-types/Cisco/ISR4461.yaml b/device-types/Cisco/ISR4461-X.yaml similarity index 100% rename from device-types/Cisco/ISR4461.yaml rename to device-types/Cisco/ISR4461-X.yaml diff --git a/device-types/Cisco/N3K-C3132Q-40GX.yaml b/device-types/Cisco/N3K-C3132Q-40GX.yaml index 0973cd7b..2fc8b2ae 100644 --- a/device-types/Cisco/N3K-C3132Q-40GX.yaml +++ b/device-types/Cisco/N3K-C3132Q-40GX.yaml @@ -2,7 +2,7 @@ manufacturer: Cisco model: Nexus 3132Q-40GX slug: cisco-nexus-3132q-40gx -part_number: s +part_number: N3K-C3132Q-40GX u_height: 1 is_full_depth: false interfaces: diff --git a/device-types/Cisco/N3K-C3172PQ-10GE.yaml b/device-types/Cisco/N3K-C3172Q-10GE.yaml similarity index 100% rename from device-types/Cisco/N3K-C3172PQ-10GE.yaml rename to device-types/Cisco/N3K-C3172Q-10GE.yaml diff --git a/device-types/Cisco/SPA112.yaml b/device-types/Cisco/SPA112-V05.yaml similarity index 100% rename from device-types/Cisco/SPA112.yaml rename to device-types/Cisco/SPA112-V05.yaml diff --git a/device-types/Cisco/WS-C3750E-48TD-S.yaml b/device-types/Cisco/WS-C3750E-48TS-S.yaml similarity index 100% rename from device-types/Cisco/WS-C3750E-48TD-S.yaml rename to device-types/Cisco/WS-C3750E-48TS-S.yaml diff --git a/device-types/Cisco/WS-C4948-10G-S.yaml b/device-types/Cisco/WS-C4948-10GE-S.yaml similarity index 100% rename from device-types/Cisco/WS-C4948-10G-S.yaml rename to device-types/Cisco/WS-C4948-10GE-S.yaml diff --git a/device-types/D-Link/D-Link_DES-1210-28.yaml b/device-types/D-Link/D-Link-DES-1210-28.yaml similarity index 100% rename from device-types/D-Link/D-Link_DES-1210-28.yaml rename to device-types/D-Link/D-Link-DES-1210-28.yaml diff --git a/device-types/D-Link/D-Link_DES-3200-52.yaml b/device-types/D-Link/D-Link-DES-3200-52.yaml similarity index 100% rename from device-types/D-Link/D-Link_DES-3200-52.yaml rename to device-types/D-Link/D-Link-DES-3200-52.yaml diff --git a/device-types/D-Link/D-Link_DGS-1210-52.yaml b/device-types/D-Link/D-Link-DGS-1210-52.yaml similarity index 100% rename from device-types/D-Link/D-Link_DGS-1210-52.yaml rename to device-types/D-Link/D-Link-DGS-1210-52.yaml diff --git a/device-types/Datto/DSW100-84P-4X.yaml b/device-types/Datto/DSW100-48P-4X.yaml similarity index 100% rename from device-types/Datto/DSW100-84P-4X.yaml rename to device-types/Datto/DSW100-48P-4X.yaml diff --git a/device-types/Digital Loggers/smart_power_supply_pro.yaml b/device-types/Digital Loggers/smart-power-supply-pro.yaml similarity index 100% rename from device-types/Digital Loggers/smart_power_supply_pro.yaml rename to device-types/Digital Loggers/smart-power-supply-pro.yaml diff --git a/device-types/Eaton/Tripp-Lite-B064-016.yaml b/device-types/Eaton/Tripp-Lite-B064-016-02-IPG.yaml similarity index 100% rename from device-types/Eaton/Tripp-Lite-B064-016.yaml rename to device-types/Eaton/Tripp-Lite-B064-016-02-IPG.yaml diff --git a/device-types/Extreme Networks/715W_AC_PSU_FB.yaml b/device-types/Extreme Networks/715W-AC-PSU-FB.yaml similarity index 100% rename from device-types/Extreme Networks/715W_AC_PSU_FB.yaml rename to device-types/Extreme Networks/715W-AC-PSU-FB.yaml diff --git a/device-types/Extreme Networks/BR-MLXE-16-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-16-MR2-AC.yaml similarity index 100% rename from device-types/Extreme Networks/BR-MLXE-16-MR2-M-AC.yaml rename to device-types/Extreme Networks/BR-MLXE-16-MR2-AC.yaml diff --git a/device-types/Extreme Networks/BR-MLXE-32-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-32-MR2-AC.yaml similarity index 100% rename from device-types/Extreme Networks/BR-MLXE-32-MR2-M-AC.yaml rename to device-types/Extreme Networks/BR-MLXE-32-MR2-AC.yaml diff --git a/device-types/Extreme Networks/BR-MLXE-4-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-4-MR2-AC.yaml similarity index 100% rename from device-types/Extreme Networks/BR-MLXE-4-MR2-M-AC.yaml rename to device-types/Extreme Networks/BR-MLXE-4-MR2-AC.yaml diff --git a/device-types/Extreme Networks/BR-MLXE-8-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-8-MR2-AC.yaml similarity index 100% rename from device-types/Extreme Networks/BR-MLXE-8-MR2-M-AC.yaml rename to device-types/Extreme Networks/BR-MLXE-8-MR2-AC.yaml diff --git a/device-types/Extreme Networks/X460-G2_VIM-2x.yaml b/device-types/Extreme Networks/X460-G2-VIM-2x.yaml similarity index 100% rename from device-types/Extreme Networks/X460-G2_VIM-2x.yaml rename to device-types/Extreme Networks/X460-G2-VIM-2x.yaml diff --git a/device-types/F5/BIG-IP_3900.yaml b/device-types/F5/BIG-IP-3900.yaml similarity index 100% rename from device-types/F5/BIG-IP_3900.yaml rename to device-types/F5/BIG-IP-3900.yaml diff --git a/device-types/F5/BIG-IP_4200v.yaml b/device-types/F5/BIG-IP-4200v.yaml similarity index 100% rename from device-types/F5/BIG-IP_4200v.yaml rename to device-types/F5/BIG-IP-4200v.yaml diff --git a/device-types/F5/BIG-IP_5200v.yaml b/device-types/F5/BIG-IP-5200v.yaml similarity index 100% rename from device-types/F5/BIG-IP_5200v.yaml rename to device-types/F5/BIG-IP-5200v.yaml diff --git a/device-types/F5/BIG-IP_5250v.yaml b/device-types/F5/BIG-IP-5250v.yaml similarity index 100% rename from device-types/F5/BIG-IP_5250v.yaml rename to device-types/F5/BIG-IP-5250v.yaml diff --git a/device-types/F5/BIG-IP_VPR-C2400.yaml b/device-types/F5/BIG-IP-VPR-C2400.yaml similarity index 100% rename from device-types/F5/BIG-IP_VPR-C2400.yaml rename to device-types/F5/BIG-IP-VPR-C2400.yaml diff --git a/device-types/F5/BIG-IP_i2600.yaml b/device-types/F5/BIG-IP-i2600.yaml similarity index 100% rename from device-types/F5/BIG-IP_i2600.yaml rename to device-types/F5/BIG-IP-i2600.yaml diff --git a/device-types/F5/BIG-IP_i2800.yaml b/device-types/F5/BIG-IP-i2800.yaml similarity index 100% rename from device-types/F5/BIG-IP_i2800.yaml rename to device-types/F5/BIG-IP-i2800.yaml diff --git a/device-types/F5/BIG-IP_i4600.yaml b/device-types/F5/BIG-IP-i4600.yaml similarity index 100% rename from device-types/F5/BIG-IP_i4600.yaml rename to device-types/F5/BIG-IP-i4600.yaml diff --git a/device-types/F5/BIG-IP_i4800.yaml b/device-types/F5/BIG-IP-i4800.yaml similarity index 100% rename from device-types/F5/BIG-IP_i4800.yaml rename to device-types/F5/BIG-IP-i4800.yaml diff --git a/device-types/F5/BIG-IP_i5800.yaml b/device-types/F5/BIG-IP-i5800.yaml similarity index 100% rename from device-types/F5/BIG-IP_i5800.yaml rename to device-types/F5/BIG-IP-i5800.yaml diff --git a/device-types/Fortinet/FG-224E-POE.yaml b/device-types/Fortinet/FortiSwitch-224E-POE.yaml similarity index 100% rename from device-types/Fortinet/FG-224E-POE.yaml rename to device-types/Fortinet/FortiSwitch-224E-POE.yaml diff --git a/device-types/Fujitsu/primergy_bx2560_m1.yaml b/device-types/Fujitsu/primergy-bx2560-m1.yaml similarity index 100% rename from device-types/Fujitsu/primergy_bx2560_m1.yaml rename to device-types/Fujitsu/primergy-bx2560-m1.yaml diff --git a/device-types/Fujitsu/primergy_bx2560_m2.yaml b/device-types/Fujitsu/primergy-bx2560-m2.yaml similarity index 100% rename from device-types/Fujitsu/primergy_bx2560_m2.yaml rename to device-types/Fujitsu/primergy-bx2560-m2.yaml diff --git a/device-types/Fujitsu/primergy_bx924_s4.yaml b/device-types/Fujitsu/primergy-bx924-s4.yaml similarity index 100% rename from device-types/Fujitsu/primergy_bx924_s4.yaml rename to device-types/Fujitsu/primergy-bx924-s4.yaml diff --git a/device-types/Fujitsu/primergy_tx100_s1.yml b/device-types/Fujitsu/primergy-tx100-s1.yml similarity index 100% rename from device-types/Fujitsu/primergy_tx100_s1.yml rename to device-types/Fujitsu/primergy-tx100-s1.yml diff --git a/device-types/Fujitsu/primergy_tx1310_m1.yml b/device-types/Fujitsu/primergy-tx1310-m1.yml similarity index 100% rename from device-types/Fujitsu/primergy_tx1310_m1.yml rename to device-types/Fujitsu/primergy-tx1310-m1.yml diff --git a/device-types/Fujitsu/primergy_tx1310_m3.yml b/device-types/Fujitsu/primergy-tx1310-m3.yml similarity index 100% rename from device-types/Fujitsu/primergy_tx1310_m3.yml rename to device-types/Fujitsu/primergy-tx1310-m3.yml diff --git a/device-types/Fujitsu/primergy_tx1330_m4.yml b/device-types/Fujitsu/primergy-tx1330-m4.yml similarity index 100% rename from device-types/Fujitsu/primergy_tx1330_m4.yml rename to device-types/Fujitsu/primergy-tx1330-m4.yml diff --git a/device-types/Generic/24-port_copper_patch_panel_half.yaml b/device-types/Generic/24-port-copper-patch-panel-half.yaml similarity index 100% rename from device-types/Generic/24-port_copper_patch_panel_half.yaml rename to device-types/Generic/24-port-copper-patch-panel-half.yaml diff --git a/device-types/Generic/24-port_copper_patch_panel.yaml b/device-types/Generic/24-port-copper-patch-panel.yaml similarity index 100% rename from device-types/Generic/24-port_copper_patch_panel.yaml rename to device-types/Generic/24-port-copper-patch-panel.yaml diff --git a/device-types/Generic/48-port_copper_patch_panel_half.yaml b/device-types/Generic/48-port-copper-patch-panel-half.yaml similarity index 100% rename from device-types/Generic/48-port_copper_patch_panel_half.yaml rename to device-types/Generic/48-port-copper-patch-panel-half.yaml diff --git a/device-types/Generic/48-port_copper_patch_panel.yaml b/device-types/Generic/48-port-copper-patch-panel.yaml similarity index 100% rename from device-types/Generic/48-port_copper_patch_panel.yaml rename to device-types/Generic/48-port-copper-patch-panel.yaml diff --git a/device-types/Generic/LC-12-port_fiber_patch_panel_half.yaml b/device-types/Generic/LC-12-port-fiber-patch-panel-half.yaml similarity index 100% rename from device-types/Generic/LC-12-port_fiber_patch_panel_half.yaml rename to device-types/Generic/LC-12-port-fiber-patch-panel-half.yaml diff --git a/device-types/Generic/LC-12-port_fiber_patch_panel.yaml b/device-types/Generic/LC-12-port-fiber-patch-panel.yaml similarity index 100% rename from device-types/Generic/LC-12-port_fiber_patch_panel.yaml rename to device-types/Generic/LC-12-port-fiber-patch-panel.yaml diff --git a/device-types/Generic/LC-24-port_fiber_patch_panel_half.yaml b/device-types/Generic/LC-24-port-fiber-patch-panel-half.yaml similarity index 100% rename from device-types/Generic/LC-24-port_fiber_patch_panel_half.yaml rename to device-types/Generic/LC-24-port-fiber-patch-panel-half.yaml diff --git a/device-types/Generic/LC-24-port_fiber_patch_panel.yaml b/device-types/Generic/LC-24-port-fiber-patch-panel.yaml similarity index 100% rename from device-types/Generic/LC-24-port_fiber_patch_panel.yaml rename to device-types/Generic/LC-24-port-fiber-patch-panel.yaml diff --git a/device-types/Generic/LC-48-port_fiber_patch_panel_half.yaml b/device-types/Generic/LC-48-port-fiber-patch-panel-half.yaml similarity index 100% rename from device-types/Generic/LC-48-port_fiber_patch_panel_half.yaml rename to device-types/Generic/LC-48-port-fiber-patch-panel-half.yaml diff --git a/device-types/Generic/LC-48-port_fiber_patch_panel.yaml b/device-types/Generic/LC-48-port-fiber-patch-panel.yaml similarity index 100% rename from device-types/Generic/LC-48-port_fiber_patch_panel.yaml rename to device-types/Generic/LC-48-port-fiber-patch-panel.yaml diff --git a/device-types/Generic/SC-24-double-port_fiber_patch_panel_half.yaml b/device-types/Generic/SC-24-double-port-fiber-patch-panel-half.yaml similarity index 100% rename from device-types/Generic/SC-24-double-port_fiber_patch_panel_half.yaml rename to device-types/Generic/SC-24-double-port-fiber-patch-panel-half.yaml diff --git a/device-types/Generic/SC-24-double-port_fiber_patch_panel.yaml b/device-types/Generic/SC-24-double-port-fiber-patch-panel.yaml similarity index 100% rename from device-types/Generic/SC-24-double-port_fiber_patch_panel.yaml rename to device-types/Generic/SC-24-double-port-fiber-patch-panel.yaml diff --git a/device-types/Generic/SC-24-port_fiber_patch_panel_half.yaml b/device-types/Generic/SC-24-port-fiber-patch-panel-half.yaml similarity index 100% rename from device-types/Generic/SC-24-port_fiber_patch_panel_half.yaml rename to device-types/Generic/SC-24-port-fiber-patch-panel-half.yaml diff --git a/device-types/Generic/SC-24-port_fiber_patch_panel.yaml b/device-types/Generic/SC-24-port-fiber-patch-panel.yaml similarity index 100% rename from device-types/Generic/SC-24-port_fiber_patch_panel.yaml rename to device-types/Generic/SC-24-port-fiber-patch-panel.yaml diff --git a/device-types/HPE/Aruba-3810M-24G-1-slot.yaml b/device-types/HPE/Aruba-3810M-24G-1-slot-Switch.yaml similarity index 100% rename from device-types/HPE/Aruba-3810M-24G-1-slot.yaml rename to device-types/HPE/Aruba-3810M-24G-1-slot-Switch.yaml diff --git a/device-types/HPE/Aruba-6100-48G-JL676A.yaml b/device-types/HPE/Aruba-6100-48G-4SFPP.yaml similarity index 100% rename from device-types/HPE/Aruba-6100-48G-JL676A.yaml rename to device-types/HPE/Aruba-6100-48G-4SFPP.yaml diff --git a/device-types/HPE/Aruba-6200F-24G-PoE-370W-JL725A.yaml b/device-types/HPE/Aruba-6200F-24G-4SFPP.yaml similarity index 100% rename from device-types/HPE/Aruba-6200F-24G-PoE-370W-JL725A.yaml rename to device-types/HPE/Aruba-6200F-24G-4SFPP.yaml diff --git a/device-types/HPE/Aruba-6200F-24G-JL724A.yaml b/device-types/HPE/Aruba-6200F-24G-POE4-4SFPP-370W.yaml similarity index 100% rename from device-types/HPE/Aruba-6200F-24G-JL724A.yaml rename to device-types/HPE/Aruba-6200F-24G-POE4-4SFPP-370W.yaml diff --git a/device-types/HPE/FlexNetwork-5130-24G-4SFP+-EI.yml b/device-types/HPE/FlexNetwork-5130-24G-4SFPP-EI.yml similarity index 100% rename from device-types/HPE/FlexNetwork-5130-24G-4SFP+-EI.yml rename to device-types/HPE/FlexNetwork-5130-24G-4SFPP-EI.yml diff --git a/device-types/HPE/FlexNetwork-5130-24G-PoEP-4SFP+-EI.yml b/device-types/HPE/FlexNetwork-5130-24G-PoEP-4SFPP-EI.yml similarity index 100% rename from device-types/HPE/FlexNetwork-5130-24G-PoEP-4SFP+-EI.yml rename to device-types/HPE/FlexNetwork-5130-24G-PoEP-4SFPP-EI.yml diff --git a/device-types/HPE/FlexNetwork-5130-48G-4SFPP-HI.yml b/device-types/HPE/FlexNetwork-5130-48G-4SFPP-1-slot-HI.yml similarity index 100% rename from device-types/HPE/FlexNetwork-5130-48G-4SFPP-HI.yml rename to device-types/HPE/FlexNetwork-5130-48G-4SFPP-1-slot-HI.yml diff --git a/device-types/HPE/FlexNetwork-5130-48G-4SFP+-EI.yml b/device-types/HPE/FlexNetwork-5130-48G-4SFPP-EI.yml similarity index 100% rename from device-types/HPE/FlexNetwork-5130-48G-4SFP+-EI.yml rename to device-types/HPE/FlexNetwork-5130-48G-4SFPP-EI.yml diff --git a/device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-HI.yml b/device-types/HPE/FlexNetwork-5130-48G-POEP-4SFPP-1-slot-HI.yml similarity index 100% rename from device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-HI.yml rename to device-types/HPE/FlexNetwork-5130-48G-POEP-4SFPP-1-slot-HI.yml diff --git a/device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP.yml b/device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-EI.yml similarity index 100% rename from device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP.yml rename to device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-EI.yml diff --git a/device-types/HPE/FlexNetwork-5510-48G-POEP-4SFPP-HI.yaml b/device-types/HPE/FlexNetwork-5510-48G-PoEP-4SFPP-HI.yaml similarity index 100% rename from device-types/HPE/FlexNetwork-5510-48G-POEP-4SFPP-HI.yaml rename to device-types/HPE/FlexNetwork-5510-48G-PoEP-4SFPP-HI.yaml diff --git a/device-types/HPE/HP-5500-24G-4SFP-HI.yaml b/device-types/HPE/HPE-5500-24G-4SFP-HI.yaml similarity index 100% rename from device-types/HPE/HP-5500-24G-4SFP-HI.yaml rename to device-types/HPE/HPE-5500-24G-4SFP-HI.yaml diff --git a/device-types/HPE/OfficeConnect-1920S-48-PoE+-4SFP.yml b/device-types/HPE/OfficeConnect-1920S-48G-4SFP-PPOEP.yml similarity index 100% rename from device-types/HPE/OfficeConnect-1920S-48-PoE+-4SFP.yml rename to device-types/HPE/OfficeConnect-1920S-48G-4SFP-PPOEP.yml diff --git a/device-types/HPE/Synergy-12000.yaml b/device-types/HPE/Synergy-12000-Frame.yaml similarity index 100% rename from device-types/HPE/Synergy-12000.yaml rename to device-types/HPE/Synergy-12000-Frame.yaml diff --git a/device-types/Huawei/S5732-H48XUM2CC.yaml b/device-types/Huawei/CloudEngine-S5732-H48XUM2CC.yaml similarity index 100% rename from device-types/Huawei/S5732-H48XUM2CC.yaml rename to device-types/Huawei/CloudEngine-S5732-H48XUM2CC.yaml diff --git a/device-types/Huawei/Huawei_2288H_V5.yaml b/device-types/Huawei/Huawei-2288H-V5.yaml similarity index 100% rename from device-types/Huawei/Huawei_2288H_V5.yaml rename to device-types/Huawei/Huawei-2288H-V5.yaml diff --git a/device-types/Huawei/Huawei_CE6820H-48S6CQ.yaml b/device-types/Huawei/Huawei-CE6820H-48S6CQ.yaml similarity index 100% rename from device-types/Huawei/Huawei_CE6820H-48S6CQ.yaml rename to device-types/Huawei/Huawei-CE6820H-48S6CQ.yaml diff --git a/device-types/Huawei/Huawei_Dorado_3000_v6.yaml b/device-types/Huawei/Huawei-Dorado-3000-v6.yaml similarity index 100% rename from device-types/Huawei/Huawei_Dorado_3000_v6.yaml rename to device-types/Huawei/Huawei-Dorado-3000-v6.yaml diff --git a/device-types/Huawei/Huawei_S5732-H24UM2CC.yaml b/device-types/Huawei/Huawei-S5732-H24UM2CC.yaml similarity index 100% rename from device-types/Huawei/Huawei_S5732-H24UM2CC.yaml rename to device-types/Huawei/Huawei-S5732-H24UM2CC.yaml diff --git a/device-types/Juniper/ACX710-DC.yaml b/device-types/Juniper/ACX710DC.yaml similarity index 100% rename from device-types/Juniper/ACX710-DC.yaml rename to device-types/Juniper/ACX710DC.yaml diff --git a/device-types/Juniper/SRX-1500.yaml b/device-types/Juniper/SRX1500.yaml similarity index 100% rename from device-types/Juniper/SRX-1500.yaml rename to device-types/Juniper/SRX1500.yaml diff --git a/device-types/Juniper/SRX-4100.yaml b/device-types/Juniper/SRX4100.yaml similarity index 100% rename from device-types/Juniper/SRX-4100.yaml rename to device-types/Juniper/SRX4100.yaml diff --git a/device-types/Lenovo/ThinkSystem_AUKJ.yaml b/device-types/Lenovo/ThinkSystem-10Gb-2-port-SFPP-LOM.yaml similarity index 100% rename from device-types/Lenovo/ThinkSystem_AUKJ.yaml rename to device-types/Lenovo/ThinkSystem-10Gb-2-port-SFPP-LOM.yaml diff --git a/device-types/Lenovo/ThinkSystem_AUKK.yaml b/device-types/Lenovo/ThinkSystem-10Gb-4-port-SFPP-LOM.yaml similarity index 100% rename from device-types/Lenovo/ThinkSystem_AUKK.yaml rename to device-types/Lenovo/ThinkSystem-10Gb-4-port-SFPP-LOM.yaml diff --git a/device-types/Lenovo/SR530.yaml b/device-types/Lenovo/ThinkSystem-SR530.yaml similarity index 100% rename from device-types/Lenovo/SR530.yaml rename to device-types/Lenovo/ThinkSystem-SR530.yaml diff --git a/device-types/Lenovo/SR550.yaml b/device-types/Lenovo/ThinkSystem-SR550.yaml similarity index 100% rename from device-types/Lenovo/SR550.yaml rename to device-types/Lenovo/ThinkSystem-SR550.yaml diff --git a/device-types/Lenovo/SR630.yaml b/device-types/Lenovo/ThinkSystem-SR630.yaml similarity index 100% rename from device-types/Lenovo/SR630.yaml rename to device-types/Lenovo/ThinkSystem-SR630.yaml diff --git a/device-types/Lenovo/SR650.yaml b/device-types/Lenovo/ThinkSystem-SR650.yaml similarity index 100% rename from device-types/Lenovo/SR650.yaml rename to device-types/Lenovo/ThinkSystem-SR650.yaml diff --git a/device-types/Lenovo/system_x3250_M6.yaml b/device-types/Lenovo/system-x3250-M6.yaml similarity index 100% rename from device-types/Lenovo/system_x3250_M6.yaml rename to device-types/Lenovo/system-x3250-M6.yaml diff --git a/device-types/Lenovo/system_x3550_M5.yaml b/device-types/Lenovo/system-x3550-M5.yaml similarity index 100% rename from device-types/Lenovo/system_x3550_M5.yaml rename to device-types/Lenovo/system-x3550-M5.yaml diff --git a/device-types/Lenovo/system_x3750_M4.yaml b/device-types/Lenovo/system-x3750-M4.yaml similarity index 100% rename from device-types/Lenovo/system_x3750_M4.yaml rename to device-types/Lenovo/system-x3750-M4.yaml diff --git a/device-types/MikroTik/CCR2116-12G-4SX.yaml b/device-types/MikroTik/CCR2116-12G-4S+.yaml similarity index 100% rename from device-types/MikroTik/CCR2116-12G-4SX.yaml rename to device-types/MikroTik/CCR2116-12G-4S+.yaml diff --git a/device-types/Netgear/GSM7252PS.yaml b/device-types/Netgear/ProSafe-GS752TP.yaml similarity index 100% rename from device-types/Netgear/GSM7252PS.yaml rename to device-types/Netgear/ProSafe-GS752TP.yaml diff --git a/device-types/Nokia/7210-SAS-Sx.yaml b/device-types/Nokia/7210-SAS-Sx-10-100GE.yaml similarity index 100% rename from device-types/Nokia/7210-SAS-Sx.yaml rename to device-types/Nokia/7210-SAS-Sx-10-100GE.yaml diff --git a/device-types/Nokia/7220-IXR-D1.yaml b/device-types/Nokia/7220-IXR-D1-88G-48baseT-4SFPP.yaml similarity index 100% rename from device-types/Nokia/7220-IXR-D1.yaml rename to device-types/Nokia/7220-IXR-D1-88G-48baseT-4SFPP.yaml diff --git a/device-types/Nokia/7220-IXR-D2.yaml b/device-types/Nokia/7220-IXR-D2-25-100GE.yaml similarity index 100% rename from device-types/Nokia/7220-IXR-D2.yaml rename to device-types/Nokia/7220-IXR-D2-25-100GE.yaml diff --git a/device-types/Nokia/7220-IXR-D2L.yaml b/device-types/Nokia/7220-IXR-D2L-25-100GE.yaml similarity index 100% rename from device-types/Nokia/7220-IXR-D2L.yaml rename to device-types/Nokia/7220-IXR-D2L-25-100GE.yaml diff --git a/device-types/Nokia/7220-IXR-D3.yaml b/device-types/Nokia/7220-IXR-D3-32-100GE.yaml similarity index 100% rename from device-types/Nokia/7220-IXR-D3.yaml rename to device-types/Nokia/7220-IXR-D3-32-100GE.yaml diff --git a/device-types/Nokia/7220-IXR-D3L.yaml b/device-types/Nokia/7220-IXR-D3L-32-100GE.yaml similarity index 100% rename from device-types/Nokia/7220-IXR-D3L.yaml rename to device-types/Nokia/7220-IXR-D3L-32-100GE.yaml diff --git a/device-types/Nokia/7220-IXR-H3.yaml b/device-types/Nokia/7220-IXR-H3-32QSFPDD-2SFPP.yaml similarity index 100% rename from device-types/Nokia/7220-IXR-H3.yaml rename to device-types/Nokia/7220-IXR-H3-32QSFPDD-2SFPP.yaml diff --git a/device-types/Nokia/7250 IXR-s.yaml b/device-types/Nokia/7250-IXR-s.yaml similarity index 100% rename from device-types/Nokia/7250 IXR-s.yaml rename to device-types/Nokia/7250-IXR-s.yaml diff --git a/device-types/Parks/Fiberlink_30028.yaml b/device-types/Parks/Fiberlink-30028.yaml similarity index 100% rename from device-types/Parks/Fiberlink_30028.yaml rename to device-types/Parks/Fiberlink-30028.yaml diff --git a/device-types/QCT/D51B-2U_DUAL_1G_LOM.yml b/device-types/QCT/D51B-2U-DUAL-1G-LOM.yml similarity index 100% rename from device-types/QCT/D51B-2U_DUAL_1G_LOM.yml rename to device-types/QCT/D51B-2U-DUAL-1G-LOM.yml diff --git a/device-types/Rockwell Automation/5069-L4100ERW.yaml b/device-types/Rockwell Automation/5069-L4100ERMW.yaml similarity index 100% rename from device-types/Rockwell Automation/5069-L4100ERW.yaml rename to device-types/Rockwell Automation/5069-L4100ERMW.yaml diff --git a/device-types/Rockwell Automation/5069-L430ERW.yaml b/device-types/Rockwell Automation/5069-L430ERMW.yaml similarity index 100% rename from device-types/Rockwell Automation/5069-L430ERW.yaml rename to device-types/Rockwell Automation/5069-L430ERMW.yaml diff --git a/device-types/Rockwell Automation/5069-L450ERW.yaml b/device-types/Rockwell Automation/5069-L450ERMW.yaml similarity index 100% rename from device-types/Rockwell Automation/5069-L450ERW.yaml rename to device-types/Rockwell Automation/5069-L450ERMW.yaml diff --git a/device-types/Rockwell Automation/5069-L4200ERW.yaml b/device-types/Rockwell Automation/CompactLogix-5480-L4200ERMW.yaml similarity index 100% rename from device-types/Rockwell Automation/5069-L4200ERW.yaml rename to device-types/Rockwell Automation/CompactLogix-5480-L4200ERMW.yaml diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-L 10G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-L-10G.yaml similarity index 100% rename from device-types/Rohde & Schwarz/SITLine-ETH-L 10G.yaml rename to device-types/Rohde & Schwarz/SITLine-ETH-L-10G.yaml diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-L 40G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-L-4x10G.yaml similarity index 100% rename from device-types/Rohde & Schwarz/SITLine-ETH-L 40G.yaml rename to device-types/Rohde & Schwarz/SITLine-ETH-L-4x10G.yaml diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-L 4G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-L-4x1G.yaml similarity index 100% rename from device-types/Rohde & Schwarz/SITLine-ETH-L 4G.yaml rename to device-types/Rohde & Schwarz/SITLine-ETH-L-4x1G.yaml diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-S 10G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-S-10G.yaml similarity index 100% rename from device-types/Rohde & Schwarz/SITLine-ETH-S 10G.yaml rename to device-types/Rohde & Schwarz/SITLine-ETH-S-10G.yaml diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-S 1G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-S-1G.yaml similarity index 100% rename from device-types/Rohde & Schwarz/SITLine-ETH-S 1G.yaml rename to device-types/Rohde & Schwarz/SITLine-ETH-S-1G.yaml diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-40G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH40G.yaml similarity index 100% rename from device-types/Rohde & Schwarz/SITLine-ETH-40G.yaml rename to device-types/Rohde & Schwarz/SITLine-ETH40G.yaml diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-4G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH4G.yaml similarity index 100% rename from device-types/Rohde & Schwarz/SITLine-ETH-4G.yaml rename to device-types/Rohde & Schwarz/SITLine-ETH4G.yaml diff --git a/device-types/Rohde & Schwarz/TrustedVPN-L VS-NfD.yaml b/device-types/Rohde & Schwarz/TrustedVPN-L-VS-NfD.yaml similarity index 100% rename from device-types/Rohde & Schwarz/TrustedVPN-L VS-NfD.yaml rename to device-types/Rohde & Schwarz/TrustedVPN-L-VS-NfD.yaml diff --git a/device-types/Synology/RS1219plus.yaml b/device-types/Synology/RS1219-plus.yaml similarity index 100% rename from device-types/Synology/RS1219plus.yaml rename to device-types/Synology/RS1219-plus.yaml diff --git a/device-types/Synology/RS1221plus.yaml b/device-types/Synology/RS1221-plus.yaml similarity index 100% rename from device-types/Synology/RS1221plus.yaml rename to device-types/Synology/RS1221-plus.yaml diff --git a/device-types/Thales/K6.yaml b/device-types/Thales/Luna-K6.yaml similarity index 100% rename from device-types/Thales/K6.yaml rename to device-types/Thales/Luna-K6.yaml diff --git a/device-types/Thales/T2000.yaml b/device-types/Thales/Luna-T7.yaml similarity index 100% rename from device-types/Thales/T2000.yaml rename to device-types/Thales/Luna-T7.yaml diff --git a/device-types/Ubiquiti/NBE-2AC-13.yaml b/device-types/Ubiquiti/NanoBeam-2AC-13.yaml similarity index 75% rename from device-types/Ubiquiti/NBE-2AC-13.yaml rename to device-types/Ubiquiti/NanoBeam-2AC-13.yaml index 06162684..c430a917 100644 --- a/device-types/Ubiquiti/NBE-2AC-13.yaml +++ b/device-types/Ubiquiti/NanoBeam-2AC-13.yaml @@ -1,7 +1,7 @@ --- manufacturer: Ubiquiti -model: NBE-2AC-13 -slug: ubiquiti-nbe-2ac-13 +model: NanoBeam 2AC-13 +slug: ubiquiti-nanobeam-2ac-13 part_number: NBE-2AC-13 u_height: 0 is_full_depth: false diff --git a/device-types/Ubiquiti/NBE-5AC-19.yaml b/device-types/Ubiquiti/NanoBeam-5AC-19.yaml similarity index 100% rename from device-types/Ubiquiti/NBE-5AC-19.yaml rename to device-types/Ubiquiti/NanoBeam-5AC-19.yaml diff --git a/device-types/Ubiquiti/NBE-5AC-Gen2.yaml b/device-types/Ubiquiti/NanoBeam-5AC-Gen2.yaml similarity index 100% rename from device-types/Ubiquiti/NBE-5AC-Gen2.yaml rename to device-types/Ubiquiti/NanoBeam-5AC-Gen2.yaml diff --git a/device-types/Ubiquiti/NBE-M5-19.yaml b/device-types/Ubiquiti/NanoBeam-M5-19.yaml similarity index 100% rename from device-types/Ubiquiti/NBE-M5-19.yaml rename to device-types/Ubiquiti/NanoBeam-M5-19.yaml diff --git a/device-types/Ubiquiti/NS-5AC.yaml b/device-types/Ubiquiti/NanoStation-5AC.yaml similarity index 100% rename from device-types/Ubiquiti/NS-5AC.yaml rename to device-types/Ubiquiti/NanoStation-5AC.yaml diff --git a/device-types/Ubiquiti/NS-LOCO-M2.yaml b/device-types/Ubiquiti/NanoStation-LOCO-M2.yaml similarity index 100% rename from device-types/Ubiquiti/NS-LOCO-M2.yaml rename to device-types/Ubiquiti/NanoStation-LOCO-M2.yaml diff --git a/device-types/Ubiquiti/NS-LOCO-M5.yaml b/device-types/Ubiquiti/NanoStation-LOCO-M5.yaml similarity index 100% rename from device-types/Ubiquiti/NS-LOCO-M5.yaml rename to device-types/Ubiquiti/NanoStation-LOCO-M5.yaml diff --git a/device-types/Ubiquiti/NS-LOCO-M900.yaml b/device-types/Ubiquiti/NanoStation-LOCO-M900.yaml similarity index 100% rename from device-types/Ubiquiti/NS-LOCO-M900.yaml rename to device-types/Ubiquiti/NanoStation-LOCO-M900.yaml diff --git a/device-types/Ubiquiti/NS-LOCO5AC.yaml b/device-types/Ubiquiti/NanoStation-LOCO5AC.yaml similarity index 100% rename from device-types/Ubiquiti/NS-LOCO5AC.yaml rename to device-types/Ubiquiti/NanoStation-LOCO5AC.yaml diff --git a/device-types/Ubiquiti/NS-M2.yaml b/device-types/Ubiquiti/NanoStation-M2.yaml similarity index 100% rename from device-types/Ubiquiti/NS-M2.yaml rename to device-types/Ubiquiti/NanoStation-M2.yaml diff --git a/device-types/Ubiquiti/NS-M5.yaml b/device-types/Ubiquiti/NanoStation-M5.yaml similarity index 100% rename from device-types/Ubiquiti/NS-M5.yaml rename to device-types/Ubiquiti/NanoStation-M5.yaml diff --git a/device-types/Ubiquiti/PS-M2.yaml b/device-types/Ubiquiti/PicoStation-M2.yaml similarity index 100% rename from device-types/Ubiquiti/PS-M2.yaml rename to device-types/Ubiquiti/PicoStation-M2.yaml diff --git a/device-types/Ubiquiti/PBE-2AC-400.yaml b/device-types/Ubiquiti/PowerBeam-2AC-400.yaml similarity index 100% rename from device-types/Ubiquiti/PBE-2AC-400.yaml rename to device-types/Ubiquiti/PowerBeam-2AC-400.yaml diff --git a/device-types/Ubiquiti/PBE-5AC-300.yaml b/device-types/Ubiquiti/PowerBeam-5AC-300.yaml similarity index 100% rename from device-types/Ubiquiti/PBE-5AC-300.yaml rename to device-types/Ubiquiti/PowerBeam-5AC-300.yaml diff --git a/device-types/Ubiquiti/PBE-5AC-500.yaml b/device-types/Ubiquiti/PowerBeam-5AC-500.yaml similarity index 100% rename from device-types/Ubiquiti/PBE-5AC-500.yaml rename to device-types/Ubiquiti/PowerBeam-5AC-500.yaml diff --git a/device-types/Ubiquiti/PBE-5AC-Gen2.yaml b/device-types/Ubiquiti/PowerBeam-5AC-Gen2.yaml similarity index 100% rename from device-types/Ubiquiti/PBE-5AC-Gen2.yaml rename to device-types/Ubiquiti/PowerBeam-5AC-Gen2.yaml diff --git a/device-types/Ubiquiti/PBE-M2-400.yaml b/device-types/Ubiquiti/PowerBeam-M2-400.yaml similarity index 100% rename from device-types/Ubiquiti/PBE-M2-400.yaml rename to device-types/Ubiquiti/PowerBeam-M2-400.yaml diff --git a/device-types/Ubiquiti/SurgeProtector.yaml b/device-types/Ubiquiti/Surge-Protector.yaml similarity index 100% rename from device-types/Ubiquiti/SurgeProtector.yaml rename to device-types/Ubiquiti/Surge-Protector.yaml diff --git a/device-types/Ubiquiti/USIP-R.yml b/device-types/Ubiquiti/UISP-Router.yml similarity index 100% rename from device-types/Ubiquiti/USIP-R.yml rename to device-types/Ubiquiti/UISP-Router.yml diff --git a/device-types/Ubiquiti/UDM-Pro-SE.yaml b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Special-Edition.yaml similarity index 100% rename from device-types/Ubiquiti/UDM-Pro-SE.yaml rename to device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Special-Edition.yaml diff --git a/device-types/Ubiquiti/UDM-Pro.yaml b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro.yaml similarity index 100% rename from device-types/Ubiquiti/UDM-Pro.yaml rename to device-types/Ubiquiti/UniFi-Dream-Machine-Pro.yaml diff --git a/device-types/Ubiquiti/UDM.yaml b/device-types/Ubiquiti/UniFi-Dream-Machine.yaml similarity index 100% rename from device-types/Ubiquiti/UDM.yaml rename to device-types/Ubiquiti/UniFi-Dream-Machine.yaml diff --git a/device-types/Ubiquiti/AF-5XHD.yml b/device-types/Ubiquiti/airFiber-5XHD.yml similarity index 95% rename from device-types/Ubiquiti/AF-5XHD.yml rename to device-types/Ubiquiti/airFiber-5XHD.yml index 60b4e9ef..20aa595f 100644 --- a/device-types/Ubiquiti/AF-5XHD.yml +++ b/device-types/Ubiquiti/airFiber-5XHD.yml @@ -1,6 +1,6 @@ --- manufacturer: Ubiquiti -model: airFiber AF-5XHD +model: airFiber 5XHD slug: ubiquiti-airfiber-af-5xhd part_number: AF-5XHD comments: | diff --git a/device-types/Ubiquiti/AF-60-HD.yml b/device-types/Ubiquiti/airFiber-60-HD.yml similarity index 100% rename from device-types/Ubiquiti/AF-60-HD.yml rename to device-types/Ubiquiti/airFiber-60-HD.yml diff --git a/device-types/Ubiquiti/AF-60-LR.yml b/device-types/Ubiquiti/airFiber-60-LR.yml similarity index 100% rename from device-types/Ubiquiti/AF-60-LR.yml rename to device-types/Ubiquiti/airFiber-60-LR.yml diff --git a/device-types/Ubiquiti/AF-60.yml b/device-types/Ubiquiti/airFiber-60.yml similarity index 100% rename from device-types/Ubiquiti/AF-60.yml rename to device-types/Ubiquiti/airFiber-60.yml diff --git a/device-types/V-Solution/V-Solution_V1600D2.yaml b/device-types/V-Solution/V-Solution-V1600D2.yaml similarity index 100% rename from device-types/V-Solution/V-Solution_V1600D2.yaml rename to device-types/V-Solution/V-Solution-V1600D2.yaml diff --git a/device-types/Zyxel/USG310.yaml b/device-types/Zyxel/USG-310.yaml similarity index 100% rename from device-types/Zyxel/USG310.yaml rename to device-types/Zyxel/USG-310.yaml diff --git a/scripts/align-filenames-models.py b/scripts/align-filenames-models.py new file mode 100644 index 00000000..e86a5d59 --- /dev/null +++ b/scripts/align-filenames-models.py @@ -0,0 +1,46 @@ +from os import walk, path, rename +import yaml + +root_dir = f"{path.dirname(path.realpath(__file__))}/../device-types" +# root_dir = f"{path.dirname(path.realpath(__file__))}/../device-types/Cisco" + +total = 0 + +for root, dirs, files in walk(root_dir): + for file in files: + if file.split(".")[1] == "yaml" or file.split(".")[1] == "yml": + fileChanged = False + if file.split(".")[0].count("_") > 0: + newname = file.replace("_", "-") + rename(f"{root}/{file}", f"{root}/{newname}") + + data = [] + with open(path.join(root, file), 'r') as stream: + try: + data = stream.readlines() + + model = "" + partNumber = "" + + for idx, line in enumerate(data): + if "model: " in line: + model = line.split(": ")[1].strip().replace(" ", "-") + if "part_number: " in line: + partNumber = line.split(": ")[1].strip() + + fileName = file.split('.')[0].casefold() + regModel = model.replace("sfp+", "sfpp").replace("poe+", "poep").replace("!", "").replace("/", "-").replace("SFP+", "SFPP").replace("POE+", "POEP").replace("!", "").replace("/", "-").replace("PoE+", "PoEP") + modModel = regModel.casefold().replace("'", "").replace("+", "-plus").replace("*", "-") + if modModel not in fileName and partNumber.casefold() not in fileName: + print("------------") + print(regModel.replace("sfp+", "sfpp").replace("poe+", "poep").replace("!", "").replace("/", "-").replace("SFP+", "SFPP").replace("POE+", "POEP").replace("!", "").replace("/", "-").replace("PoE+", "PoEP").replace("+", "-plus").replace("*", "-")) + print(partNumber.casefold()) + print(file.casefold()) + print("------------") + total = total + 1 + + except yaml.YAMLError as exc: + print(exc) + stream.close() + +print(f"Total Left: {total}") \ No newline at end of file diff --git a/scripts/fix-filename-underscores.py b/scripts/fix-filename-underscores.py new file mode 100644 index 00000000..75cf541c --- /dev/null +++ b/scripts/fix-filename-underscores.py @@ -0,0 +1,17 @@ +from os import walk, path, rename +import yaml + +root_dir = f"{path.dirname(path.realpath(__file__))}/../device-types" +# root_dir = f"{path.dirname(path.realpath(__file__))}/../device-types/Cisco" + +total = 0 + +for root, dirs, files in walk(root_dir): + for file in files: + if file.split(".")[1] == "yaml" or file.split(".")[1] == "yml": + fileChanged = False + if file.split(".")[0].count("_") > 0: + newname = file.replace("_", "-") + rename(f"{root}/{file}", f"{root}/{newname}") + +print(f"Total Left: {total}") \ No newline at end of file