diff --git a/module-types/HPE/Aruba-JL087A.yaml b/module-types/HPE/Aruba-JL087A.yaml deleted file mode 100644 index 3a84a864b..000000000 --- a/module-types/HPE/Aruba-JL087A.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -manufacturer: HPE -model: Aruba JL087A -part_number: JL087A -weight: 880 -weight_unit: g -comments: Aruba X372 54VDC 1050W 110-240VAC Power Supply -power-ports: - - name: 1/{module} - type: iec-60320-c16 - maximum_draw: 1050 diff --git a/module-types/HPE/Aruba-JL086A.yaml b/module-types/HPE/JL086A.yaml similarity index 100% rename from module-types/HPE/Aruba-JL086A.yaml rename to module-types/HPE/JL086A.yaml diff --git a/module-types/HPE/JL087A.yaml b/module-types/HPE/JL087A.yaml index 361c4e205..9345a0b47 100644 --- a/module-types/HPE/JL087A.yaml +++ b/module-types/HPE/JL087A.yaml @@ -1,9 +1,10 @@ --- manufacturer: HPE -model: Aruba X372 1050W AC Power Supply +model: Aruba Networking X372 54VDC 1050W 110-240VAC Power Supply part_number: JL087A -comments: Aruba X372 1050W AC Power Supply +weight: 880 +weight_unit: g power-ports: - - name: PS {module} - type: iec-60320-c14 + - name: 1/{module} + type: iec-60320-c16 maximum_draw: 1050 diff --git a/module-types/HPE/Aruba-JL670A.yaml b/module-types/HPE/JL670A.yaml similarity index 66% rename from module-types/HPE/Aruba-JL670A.yaml rename to module-types/HPE/JL670A.yaml index 6df8136c2..8ace46fa5 100644 --- a/module-types/HPE/Aruba-JL670A.yaml +++ b/module-types/HPE/JL670A.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba JL670A +model: Aruba Networking X372 54VDC 1600W 110-240VAC Power Supply part_number: JL670A weight: 997.9 weight_unit: g -comments: Aruba X372 54VDC 1600W 110-240VAC Power Supply power-ports: - name: 1/{module} type: iec-60320-c16 diff --git a/module-types/HPE/Aruba-R0X31A.yaml b/module-types/HPE/R0X31A.yaml similarity index 78% rename from module-types/HPE/Aruba-R0X31A.yaml rename to module-types/HPE/R0X31A.yaml index 885de074c..fc96db9df 100644 --- a/module-types/HPE/Aruba-R0X31A.yaml +++ b/module-types/HPE/R0X31A.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X31A +model: Aruba Networking CX 6400 Management Module part_number: R0X31A weight: 1.2 weight_unit: kg -comments: HPE Aruba Networking CX 6400 Management Module console-ports: - name: Auxiliary Port type: usb-a diff --git a/module-types/HPE/Aruba-R0X35A.yaml b/module-types/HPE/R0X35A.yaml similarity index 59% rename from module-types/HPE/Aruba-R0X35A.yaml rename to module-types/HPE/R0X35A.yaml index f8f3ab1c9..ff9c06c92 100644 --- a/module-types/HPE/Aruba-R0X35A.yaml +++ b/module-types/HPE/R0X35A.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X35A +model: Aruba Networking CX 6400 1800W Power Supply with C16 Inlet Accessory part_number: R0X35A weight: 1.9 weight_unit: kg -comments: HPE Aruba Networking CX 6400 1800W Power Supply with C16 Inlet Accessory power-ports: - name: PS{module} type: iec-60320-c16 diff --git a/module-types/HPE/Aruba-R0X36A.yaml b/module-types/HPE/R0X36A.yaml similarity index 59% rename from module-types/HPE/Aruba-R0X36A.yaml rename to module-types/HPE/R0X36A.yaml index 56c417500..d15f0da9b 100644 --- a/module-types/HPE/Aruba-R0X36A.yaml +++ b/module-types/HPE/R0X36A.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X36A +model: Aruba Networking CX 6400 3000W Power Supply with C20 Inlet Accessory part_number: R0X36A weight: 2.0 weight_unit: kg -comments: HPE Aruba Networking CX 6400 3000W Power Supply with C20 Inlet Accessory power-ports: - name: PS{module} type: iec-60320-c20 diff --git a/module-types/HPE/Aruba-R0X38B.yaml b/module-types/HPE/R0X38B.yaml similarity index 98% rename from module-types/HPE/Aruba-R0X38B.yaml rename to module-types/HPE/R0X38B.yaml index ef89a319e..26c389450 100644 --- a/module-types/HPE/Aruba-R0X38B.yaml +++ b/module-types/HPE/R0X38B.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X38B +model: Aruba Networking CX 6400 48-port 1GbE Class 4 PoE Module part_number: R0X38B weight: 3.0 weight_unit: kg -comments: HPE Aruba Networking CX 6400 48-port 1GbE Class 4 PoE Module interfaces: - name: 1/{module}/1 type: 1000base-t diff --git a/module-types/HPE/Aruba-R0X38C.yaml b/module-types/HPE/R0X38C.yaml similarity index 98% rename from module-types/HPE/Aruba-R0X38C.yaml rename to module-types/HPE/R0X38C.yaml index b1cd71bfc..eb0d64af8 100644 --- a/module-types/HPE/Aruba-R0X38C.yaml +++ b/module-types/HPE/R0X38C.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X38C +model: Aruba Networking CX 6400 48-port 1GbE Class 4 PoE v2 Module part_number: R0X38C weight: 3.0 weight_unit: kg -comments: HPE Aruba Networking CX 6400 48-port 1GbE Class 4 PoE v2 Module interfaces: - name: 1/{module}/1 type: 1000base-t diff --git a/module-types/HPE/Aruba-R0X39B.yaml b/module-types/HPE/R0X39B.yaml similarity index 97% rename from module-types/HPE/Aruba-R0X39B.yaml rename to module-types/HPE/R0X39B.yaml index 5011613fb..a83f0dbee 100644 --- a/module-types/HPE/Aruba-R0X39B.yaml +++ b/module-types/HPE/R0X39B.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X39B +model: Aruba Networking CX 6400 48-port 1GbE Class 4 PoE and 4-port SFP56 Module part_number: R0X39B weight: 3.1 weight_unit: kg -comments: HPE Aruba Networking CX 6400 48-port 1GbE Class 4 PoE and 4-port SFP56 Module interfaces: - name: 1/{module}/1 type: 1000base-t diff --git a/module-types/HPE/Aruba-R0X39C.yaml b/module-types/HPE/R0X39C.yaml similarity index 97% rename from module-types/HPE/Aruba-R0X39C.yaml rename to module-types/HPE/R0X39C.yaml index 3aac82ac4..761b5cf50 100644 --- a/module-types/HPE/Aruba-R0X39C.yaml +++ b/module-types/HPE/R0X39C.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X39C +model: Aruba Networking CX 6400 48-port 1GbE Class 4 PoE and 4-port SFP56 v2 Module part_number: R0X39C weight: 3.1 weight_unit: kg -comments: HPE Aruba Networking CX 6400 48-port 1GbE Class 4 PoE and 4-port SFP56 v2 Module interfaces: - name: 1/{module}/1 type: 1000base-t diff --git a/module-types/HPE/Aruba-R0X40A.yaml b/module-types/HPE/R0X40A.yaml similarity index 97% rename from module-types/HPE/Aruba-R0X40A.yaml rename to module-types/HPE/R0X40A.yaml index 7177c715a..b7a53b897 100644 --- a/module-types/HPE/Aruba-R0X40A.yaml +++ b/module-types/HPE/R0X40A.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X40A +model: Aruba Networking CX 6400 48-port 1GbE Class 6 PoE and 4-port SFP56 Module part_number: R0X40A weight: 3.2 weight_unit: kg -comments: HPE Aruba Networking CX 6400 48-port 1GbE Class 6 PoE and 4-port SFP56 Module interfaces: - name: 1/{module}/1 type: 1000base-t diff --git a/module-types/HPE/Aruba-R0X40C.yaml b/module-types/HPE/R0X40C.yaml similarity index 97% rename from module-types/HPE/Aruba-R0X40C.yaml rename to module-types/HPE/R0X40C.yaml index 518da6680..e4c409ee3 100644 --- a/module-types/HPE/Aruba-R0X40C.yaml +++ b/module-types/HPE/R0X40C.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X40C +model: Aruba Networking CX 6400 48-port 1GbE Class 6 PoE and 4-port SFP56 v2 Module part_number: R0X40C weight: 3.2 weight_unit: kg -comments: HPE Aruba Networking CX 6400 48-port 1GbE Class 6 PoE and 4-port SFP56 v2 Module interfaces: - name: 1/{module}/1 type: 1000base-t diff --git a/module-types/HPE/Aruba-R0X41A.yaml b/module-types/HPE/R0X41A.yaml similarity index 97% rename from module-types/HPE/Aruba-R0X41A.yaml rename to module-types/HPE/R0X41A.yaml index 18034ec67..4eaa1bc3f 100644 --- a/module-types/HPE/Aruba-R0X41A.yaml +++ b/module-types/HPE/R0X41A.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X41A +model: Aruba Networking CX 6400 48p Smart Rate 1/2.5/5GbE Class6 PoE 4p SFP56 Module part_number: R0X41A weight: 3.5 weight_unit: kg -comments: HPE Aruba Networking CX 6400 48p Smart Rate 1/2.5/5GbE Class6 PoE 4p SFP56 Module interfaces: - name: 1/{module}/1 type: 5gbase-t diff --git a/module-types/HPE/Aruba-R0X41C.yaml b/module-types/HPE/R0X41C.yaml similarity index 97% rename from module-types/HPE/Aruba-R0X41C.yaml rename to module-types/HPE/R0X41C.yaml index 6923d1f69..4f8f8ca95 100644 --- a/module-types/HPE/Aruba-R0X41C.yaml +++ b/module-types/HPE/R0X41C.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X41C +model: Aruba Networking CX 6400 48p Smart Rate 1/2.5/5GbE Class6 PoE 4p SFP56 v2 Module part_number: R0X41C weight: 3.5 weight_unit: kg -comments: HPE Aruba Networking CX 6400 48p Smart Rate 1/2.5/5GbE Class6 PoE 4p SFP56 v2 Module interfaces: - name: 1/{module}/1 type: 5gbase-t diff --git a/module-types/HPE/Aruba-R0X42A.yaml b/module-types/HPE/R0X42A.yaml similarity index 93% rename from module-types/HPE/Aruba-R0X42A.yaml rename to module-types/HPE/R0X42A.yaml index 1701bc8ea..3eab36554 100644 --- a/module-types/HPE/Aruba-R0X42A.yaml +++ b/module-types/HPE/R0X42A.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X42A +model: Aruba Networking CX 6400 24-port 10Gbase-T and 4-port SFP56 Module part_number: R0X42A weight: 3.0 weight_unit: kg -comments: HPE Aruba Networking CX 6400 24-port 10Gbase-T and 4-port SFP56 Module interfaces: - name: 1/{module}/1 type: 10gbase-t diff --git a/module-types/HPE/Aruba-R0X42C.yaml b/module-types/HPE/R0X42C.yaml similarity index 93% rename from module-types/HPE/Aruba-R0X42C.yaml rename to module-types/HPE/R0X42C.yaml index eef48e352..de8fbdbf1 100644 --- a/module-types/HPE/Aruba-R0X42C.yaml +++ b/module-types/HPE/R0X42C.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X42C +model: Aruba Networking CX 6400 24-port 10Gbase-T and 4-port SFP56 v2 Module part_number: R0X42C weight: 3.0 weight_unit: kg -comments: HPE Aruba Networking CX 6400 24-port 10Gbase-T and 4-port SFP56 v2 Module interfaces: - name: 1/{module}/1 type: 10gbase-t diff --git a/module-types/HPE/Aruba-R0X43A.yaml b/module-types/HPE/R0X43A.yaml similarity index 94% rename from module-types/HPE/Aruba-R0X43A.yaml rename to module-types/HPE/R0X43A.yaml index da6cdb812..af325c1ec 100644 --- a/module-types/HPE/Aruba-R0X43A.yaml +++ b/module-types/HPE/R0X43A.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X43A +model: Aruba Networking CX 6400 24-port SFP+ and 4-port SFP56 Module part_number: R0X43A weight: 2.9 weight_unit: kg -comments: HPE Aruba Networking CX 6400 24-port SFP+ and 4-port SFP56 Module interfaces: - name: 1/{module}/1 type: 10gbase-x-sfpp diff --git a/module-types/HPE/Aruba-R0X43C.yaml b/module-types/HPE/R0X43C.yaml similarity index 94% rename from module-types/HPE/Aruba-R0X43C.yaml rename to module-types/HPE/R0X43C.yaml index 099d91c72..290835030 100644 --- a/module-types/HPE/Aruba-R0X43C.yaml +++ b/module-types/HPE/R0X43C.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X43C +model: Aruba Networking CX 6400 24-port SFP+ and 4-port SFP56 v2 Module part_number: R0X43C weight: 2.9 weight_unit: kg -comments: HPE Aruba Networking CX 6400 24-port SFP+ and 4-port SFP56 v2 Module interfaces: - name: 1/{module}/1 type: 10gbase-x-sfpp diff --git a/module-types/HPE/Aruba-R0X44A.yaml b/module-types/HPE/R0X44A.yaml similarity index 96% rename from module-types/HPE/Aruba-R0X44A.yaml rename to module-types/HPE/R0X44A.yaml index 18b1c85bf..337658fea 100644 --- a/module-types/HPE/Aruba-R0X44A.yaml +++ b/module-types/HPE/R0X44A.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X44A +model: Aruba Networking CX 6400 48-port 1G/10G/25GbE SFP28 Module part_number: R0X44A weight: 4.4 weight_unit: kg -comments: HPE Aruba Networking CX 6400 48-port 1G/10G/25GbE SFP28 Module interfaces: - name: 1/{module}/1 type: 25gbase-x-sfp28 diff --git a/module-types/HPE/Aruba-R0X44C.yaml b/module-types/HPE/R0X44C.yaml similarity index 95% rename from module-types/HPE/Aruba-R0X44C.yaml rename to module-types/HPE/R0X44C.yaml index 507da9943..a8ffe7722 100644 --- a/module-types/HPE/Aruba-R0X44C.yaml +++ b/module-types/HPE/R0X44C.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X44C +model: Aruba Networking CX 6400 48-port 1G/10G/25GbE SFP28 v2 Extended Tables Module part_number: R0X44C weight: 4.4 weight_unit: kg -comments: HPE Aruba Networking CX 6400 48-port 1G/10G/25GbE SFP28 v2 Extended Tables Module interfaces: - name: 1/{module}/1 type: 25gbase-x-sfp28 diff --git a/module-types/HPE/Aruba-R0X45A.yaml b/module-types/HPE/R0X45A.yaml similarity index 88% rename from module-types/HPE/Aruba-R0X45A.yaml rename to module-types/HPE/R0X45A.yaml index 0cf64122f..e3b4a4aa3 100644 --- a/module-types/HPE/Aruba-R0X45A.yaml +++ b/module-types/HPE/R0X45A.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X45A +model: Aruba Networking CX 6400 12-port 40/100GbE QSFP28 Module part_number: R0X45A weight: 4.0 weight_unit: kg -comments: HPE Aruba Networking CX 6400 12-port 40/100GbE QSFP28 Module interfaces: - name: 1/{module}/1 type: 100gbase-x-qsfp28 diff --git a/module-types/HPE/Aruba-R0X45C.yaml b/module-types/HPE/R0X45C.yaml similarity index 86% rename from module-types/HPE/Aruba-R0X45C.yaml rename to module-types/HPE/R0X45C.yaml index 86cdebe4e..5c4e2622f 100644 --- a/module-types/HPE/Aruba-R0X45C.yaml +++ b/module-types/HPE/R0X45C.yaml @@ -1,10 +1,9 @@ --- manufacturer: HPE -model: Aruba R0X45C +model: Aruba Networking CX 6400 12-port 40/100GbE QSFP28 v2 Extended Tables Module part_number: R0X45C weight: 4.0 weight_unit: kg -comments: HPE Aruba Networking CX 6400 12-port 40/100GbE QSFP28 v2 Extended Tables Module interfaces: - name: 1/{module}/1 type: 100gbase-x-qsfp28