mirror of
https://github.com/home-assistant/core.git
synced 2025-07-29 16:17:20 +00:00
Handle all zero serial numbers in NUT (#34045)
* Handle all zero serial numbers in NUT * Add additional nut tests * Update homeassistant/components/nut/__init__.py Co-Authored-By: Paulus Schoutsen <paulus@home-assistant.io> * remove re Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>
This commit is contained in:
parent
908e044db1
commit
fc286900d3
@ -109,7 +109,7 @@ def _firmware_from_status(status):
|
|||||||
def _serial_from_status(status):
|
def _serial_from_status(status):
|
||||||
"""Find the best serialvalue from the status."""
|
"""Find the best serialvalue from the status."""
|
||||||
serial = status.get("device.serial") or status.get("ups.serial")
|
serial = status.get("device.serial") or status.get("ups.serial")
|
||||||
if serial and serial == "unknown":
|
if serial and (serial.lower() == "unknown" or serial.count("0") == len(serial)):
|
||||||
return None
|
return None
|
||||||
return serial
|
return serial
|
||||||
|
|
||||||
|
47
tests/fixtures/nut/BACKUPSES600M1.json
vendored
Normal file
47
tests/fixtures/nut/BACKUPSES600M1.json
vendored
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
{
|
||||||
|
"ups.realpower.nominal" : "330",
|
||||||
|
"input.voltage" : "123.0",
|
||||||
|
"ups.mfr" : "American Power Conversion",
|
||||||
|
"driver.version" : "2.7.4",
|
||||||
|
"ups.test.result" : "No test initiated",
|
||||||
|
"input.voltage.nominal" : "120",
|
||||||
|
"input.transfer.low" : "92",
|
||||||
|
"driver.parameter.pollinterval" : "15",
|
||||||
|
"driver.version.data" : "APC HID 0.96",
|
||||||
|
"driver.parameter.pollfreq" : "30",
|
||||||
|
"battery.mfr.date" : "2017/04/01",
|
||||||
|
"ups.beeper.status" : "enabled",
|
||||||
|
"battery.date" : "2001/09/25",
|
||||||
|
"driver.name" : "usbhid-ups",
|
||||||
|
"battery.charge" : "100",
|
||||||
|
"ups.status" : "OL",
|
||||||
|
"ups.model" : "Back-UPS ES 600M1",
|
||||||
|
"battery.runtime.low" : "120",
|
||||||
|
"ups.firmware" : "928.a5 .D",
|
||||||
|
"ups.delay.shutdown" : "20",
|
||||||
|
"device.model" : "Back-UPS ES 600M1",
|
||||||
|
"device.serial" : "4B1713P32195 ",
|
||||||
|
"input.sensitivity" : "medium",
|
||||||
|
"ups.firmware.aux" : "a5 ",
|
||||||
|
"input.transfer.reason" : "input voltage out of range",
|
||||||
|
"ups.timer.reboot" : "0",
|
||||||
|
"battery.voltage.nominal" : "12.0",
|
||||||
|
"ups.vendorid" : "051d",
|
||||||
|
"input.transfer.high" : "139",
|
||||||
|
"battery.voltage" : "13.7",
|
||||||
|
"battery.charge.low" : "10",
|
||||||
|
"battery.type" : "PbAc",
|
||||||
|
"ups.mfr.date" : "2017/04/01",
|
||||||
|
"ups.timer.shutdown" : "-1",
|
||||||
|
"device.mfr" : "American Power Conversion",
|
||||||
|
"driver.parameter.port" : "auto",
|
||||||
|
"battery.charge.warning" : "50",
|
||||||
|
"device.type" : "ups",
|
||||||
|
"driver.parameter.vendorid" : "051d",
|
||||||
|
"ups.serial" : "4B1713P32195 ",
|
||||||
|
"ups.load" : "22",
|
||||||
|
"driver.version.internal" : "0.41",
|
||||||
|
"battery.runtime" : "1968",
|
||||||
|
"driver.parameter.synchronous" : "no",
|
||||||
|
"ups.productid" : "0002"
|
||||||
|
}
|
43
tests/fixtures/nut/CP1500PFCLCD.json
vendored
Normal file
43
tests/fixtures/nut/CP1500PFCLCD.json
vendored
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
{
|
||||||
|
"battery.runtime.low" : "300",
|
||||||
|
"driver.parameter.port" : "auto",
|
||||||
|
"ups.delay.shutdown" : "20",
|
||||||
|
"driver.parameter.pollfreq" : "30",
|
||||||
|
"ups.beeper.status" : "disabled",
|
||||||
|
"input.voltage.nominal" : "120",
|
||||||
|
"device.serial" : "000000000000",
|
||||||
|
"ups.timer.shutdown" : "-60",
|
||||||
|
"input.voltage" : "122.0",
|
||||||
|
"ups.status" : "OL",
|
||||||
|
"ups.model" : "CP1500PFCLCD",
|
||||||
|
"device.mfr" : "CPS",
|
||||||
|
"device.model" : "CP1500PFCLCD",
|
||||||
|
"input.transfer.low" : "88",
|
||||||
|
"battery.mfr.date" : "CPS",
|
||||||
|
"driver.version" : "2.7.4",
|
||||||
|
"driver.version.data" : "CyberPower HID 0.4",
|
||||||
|
"driver.parameter.synchronous" : "no",
|
||||||
|
"ups.realpower.nominal" : "900",
|
||||||
|
"ups.productid" : "0501",
|
||||||
|
"ups.mfr" : "CPS",
|
||||||
|
"ups.vendorid" : "0764",
|
||||||
|
"driver.version.internal" : "0.41",
|
||||||
|
"output.voltage" : "138.0",
|
||||||
|
"battery.runtime" : "10530",
|
||||||
|
"device.type" : "ups",
|
||||||
|
"battery.charge.low" : "10",
|
||||||
|
"ups.timer.start" : "-60",
|
||||||
|
"driver.parameter.pollinterval" : "15",
|
||||||
|
"ups.load" : "0",
|
||||||
|
"ups.serial" : "000000000000",
|
||||||
|
"input.transfer.high" : "139",
|
||||||
|
"battery.charge.warning" : "20",
|
||||||
|
"battery.voltage.nominal" : "24",
|
||||||
|
"driver.parameter.vendorid" : "0764",
|
||||||
|
"driver.name" : "usbhid-ups",
|
||||||
|
"battery.type" : "PbAcid",
|
||||||
|
"ups.delay.start" : "30",
|
||||||
|
"battery.voltage" : "24.0",
|
||||||
|
"battery.charge" : "100",
|
||||||
|
"ups.test.result" : "No test initiated"
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user