From 68cfb1928783933a7c9ec9288d66ca2591663b20 Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Fri, 3 Jan 2020 13:35:51 -0500 Subject: [PATCH 1/5] schema update to handle rj12 serial on some PDUs --- tests/schema.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/schema.json b/tests/schema.json index b33c4f57..ce5d3d3d 100644 --- a/tests/schema.json +++ b/tests/schema.json @@ -92,6 +92,7 @@ "enum": [ "de-9", "db-25", + "rj-12", "rj-45", "usb-a", "usb-b", @@ -118,6 +119,7 @@ "enum": [ "de-9", "db-25", + "rj-12", "rj-45", "usb-a", "usb-b", From 5965a596ab21479be784133d450a8ecc90a0b81e Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Fri, 3 Jan 2020 14:43:57 -0500 Subject: [PATCH 2/5] California Style Connectors added --- tests/schema.json | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/tests/schema.json b/tests/schema.json index ce5d3d3d..f649a051 100644 --- a/tests/schema.json +++ b/tests/schema.json @@ -187,7 +187,19 @@ "ita-l", "ita-m", "ita-n", - "ita-o" + "ita-o", + "cs6360c", + "cs6361c", + "cs6364c", + "cs6365c", + "cs8164c", + "cs8165c", + "cs8264c", + "cs8265c", + "cs8364c", + "cs8365c", + "cs8464c", + "cs8465c" ] }, "maximum_draw": { @@ -251,7 +263,19 @@ "ita-l", "ita-m", "ita-n", - "ita-o" + "ita-o", + "cs6360c", + "cs6361c", + "cs6364c", + "cs6365c", + "cs8164c", + "cs8165c", + "cs8264c", + "cs8265c", + "cs8364c", + "cs8365c", + "cs8464c", + "cs8465c" ] }, "power_port": { From a6e5f8f70b496e23e81a6d5d3d8f503c74659222 Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Fri, 3 Jan 2020 15:22:22 -0500 Subject: [PATCH 3/5] Various APC PDUs --- device-types/APC/AP8868.yaml | 184 +++++++++++++++++++++++++++++++++++ device-types/APC/AP8886.yaml | 184 +++++++++++++++++++++++++++++++++++ device-types/APC/AP8932.yaml | 116 ++++++++++++++++++++++ 3 files changed, 484 insertions(+) create mode 100644 device-types/APC/AP8868.yaml create mode 100644 device-types/APC/AP8886.yaml create mode 100644 device-types/APC/AP8932.yaml diff --git a/device-types/APC/AP8868.yaml b/device-types/APC/AP8868.yaml new file mode 100644 index 00000000..e164d6c0 --- /dev/null +++ b/device-types/APC/AP8868.yaml @@ -0,0 +1,184 @@ +manufacturer: APC +model: AP8868 +slug: ap8868 +# comments: Rack PDU 2G, Metered, ZeroU, 10.0kW, 208V, (36) C13 & (6) C19 +u_height: 0 +console-ports: + - name: Serial + type: rj12 +power-ports: + - name: Power Port 1 + type: cs8365c +power-outlets: + - name: Bank1-C13-1 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-2 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-3 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-4 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-5 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-6 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-7 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-8 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-9 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-10 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-11 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-12 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C19-1 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C19-2 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-1 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-2 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-3 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-4 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-5 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-6 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-7 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-8 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-9 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-10 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-11 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-12 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C19-1 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C19-2 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-1 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-2 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-3 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-4 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-5 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-6 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-7 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-8 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-9 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-10 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-11 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank4-C13-12 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C19-1 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C19-2 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A +interfaces: + - name: Network + type: 100base-tx + mgmt_only: true diff --git a/device-types/APC/AP8886.yaml b/device-types/APC/AP8886.yaml new file mode 100644 index 00000000..b90478ac --- /dev/null +++ b/device-types/APC/AP8886.yaml @@ -0,0 +1,184 @@ +manufacturer: APC +model: AP8886 +slug: ap8886 +# comments: Rack PDU 2G, Metered, ZeroU, 22.0kW(32A) 17.3kW(24A), 230V, (30) C13 & (12) C19 +u_height: 0 +console-ports: + - name: Serial + type: rj12 +power-ports: + - name: Power Port 1 + type: cs8365c +power-outlets: + - name: Bank1-C13-1 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-2 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-3 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-4 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-5 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-6 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-7 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-8 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-9 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C13-10 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C19-1 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C19-2 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C19-3 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank1-C19-4 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-1 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-2 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-3 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-4 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-5 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-6 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-7 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-8 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-9 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C13-10 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C19-1 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C19-2 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C19-3 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank2-C19-4 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-1 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-2 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-3 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-4 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-5 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-6 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-7 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-8 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-9 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C13-10 + type: iec-60320-c13 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C19-1 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C19-2 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C19-3 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A + - name: Bank3-C19-4 + type: iec-60320-c19 + power_port: Power Port 1 + feed_leg: A +interfaces: + - name: Network + type: 100base-tx + mgmt_only: true diff --git a/device-types/APC/AP8932.yaml b/device-types/APC/AP8932.yaml new file mode 100644 index 00000000..95f92ee3 --- /dev/null +++ b/device-types/APC/AP8932.yaml @@ -0,0 +1,116 @@ +manufacturer: APC +model: AP8932 +slug: ap8932 +# comments: Rack PDU 2G, Switched, ZeroU, 30A, 100-120V, (24) 5-20R +u_height: 0 +console-ports: + - name: Serial + type: rj12 +power-ports: + - name: Power Port 1 + type: nema-l5-30p +power-outlets: + - name: Power Outlet 1 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 2 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 3 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 4 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 5 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 6 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 7 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 8 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 9 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 10 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 11 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 12 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 13 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 14 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 15 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 16 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 17 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 18 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 19 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 20 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 20 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 21 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 22 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 23 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A + - name: Power Outlet 24 + type: nema-5-20r + power_port: Power Port 1 + feed_leg: A +interfaces: + - name: Network + type: 100base-tx + mgmt_only: true From 143d71f6dbb101fe11bcb5e1463bebd1f7d310e3 Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Fri, 3 Jan 2020 17:32:00 -0500 Subject: [PATCH 4/5] Fixed RJ-12 typo that broke schema --- device-types/APC/AP8868.yaml | 2 +- device-types/APC/AP8886.yaml | 2 +- device-types/APC/AP8932.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-types/APC/AP8868.yaml b/device-types/APC/AP8868.yaml index e164d6c0..34d5b9f0 100644 --- a/device-types/APC/AP8868.yaml +++ b/device-types/APC/AP8868.yaml @@ -5,7 +5,7 @@ slug: ap8868 u_height: 0 console-ports: - name: Serial - type: rj12 + type: rj-12 power-ports: - name: Power Port 1 type: cs8365c diff --git a/device-types/APC/AP8886.yaml b/device-types/APC/AP8886.yaml index b90478ac..026795e6 100644 --- a/device-types/APC/AP8886.yaml +++ b/device-types/APC/AP8886.yaml @@ -5,7 +5,7 @@ slug: ap8886 u_height: 0 console-ports: - name: Serial - type: rj12 + type: rj-12 power-ports: - name: Power Port 1 type: cs8365c diff --git a/device-types/APC/AP8932.yaml b/device-types/APC/AP8932.yaml index 95f92ee3..84dbe769 100644 --- a/device-types/APC/AP8932.yaml +++ b/device-types/APC/AP8932.yaml @@ -5,7 +5,7 @@ slug: ap8932 u_height: 0 console-ports: - name: Serial - type: rj12 + type: rj-12 power-ports: - name: Power Port 1 type: nema-l5-30p From 097af3d0cfde0564137d7edbce9ca66d6949858f Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Fri, 3 Jan 2020 18:00:39 -0500 Subject: [PATCH 5/5] fix AP8886 power-port type --- device-types/APC/AP8886.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-types/APC/AP8886.yaml b/device-types/APC/AP8886.yaml index 026795e6..739b9d1a 100644 --- a/device-types/APC/AP8886.yaml +++ b/device-types/APC/AP8886.yaml @@ -8,7 +8,7 @@ console-ports: type: rj-12 power-ports: - name: Power Port 1 - type: cs8365c + type: iec-60309-3p-n-e-9h power-outlets: - name: Bank1-C13-1 type: iec-60320-c13