Skip to content

Use config entry id for unique id if serial number is missing #34154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 8 commits into from
Apr 16, 2020
Merged

Use config entry id for unique id if serial number is missing #34154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
725602c
Add a fallback unique id for nut
bdraco Apr 13, 2020
aba93d3
Use mac address for NUT unique_id if serial is not available.
bdraco Apr 15, 2020
34602aa
revert changes to format_host_port_alias as they are no longer needed
bdraco Apr 15, 2020
2bb4217
more reverts
bdraco Apr 15, 2020
3fd5c8b
Update tests
bdraco Apr 15, 2020
6855f68
fix test
bdraco Apr 16, 2020
78ed6fd
Much simpler solution
bdraco Apr 16, 2020
38d0f50
revert unneeded
bdraco Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion homeassistant/components/nut/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,15 @@ async def async_update_data():

undo_listener = entry.add_update_listener(_async_update_listener)

unique_id = _unique_id_from_status(status)

if unique_id is None:
unique_id = entry.entry_id

hass.data[DOMAIN][entry.entry_id] = {
COORDINATOR: coordinator,
PYNUT_DATA: data,
PYNUT_UNIQUE_ID: _unique_id_from_status(status),
PYNUT_UNIQUE_ID: unique_id,
PYNUT_MANUFACTURER: _manufacturer_from_status(status),
PYNUT_MODEL: _model_from_status(status),
PYNUT_FIRMWARE: _firmware_from_status(status),
Expand Down
40 changes: 21 additions & 19 deletions tests/components/nut/test_sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ async def test_pr3000rt2u(hass):
async def test_cp1350c(hass):
"""Test creation of CP1350C sensors."""

await async_init_integration(hass, "CP1350C", ["battery.charge"])
config_entry = await async_init_integration(hass, "CP1350C", ["battery.charge"])

registry = await hass.helpers.entity_registry.async_get_registry()
entry = registry.async_get("sensor.ups1_battery_charge")
# No unique id, no registry entry
assert not entry
assert entry
assert entry.unique_id == f"{config_entry.entry_id}_battery.charge"

state = hass.states.get("sensor.ups1_battery_charge")
assert state.state == "100"
Expand All @@ -58,11 +59,11 @@ async def test_cp1350c(hass):
async def test_5e850i(hass):
"""Test creation of 5E850I sensors."""

await async_init_integration(hass, "5E850I", ["battery.charge"])
config_entry = await async_init_integration(hass, "5E850I", ["battery.charge"])
registry = await hass.helpers.entity_registry.async_get_registry()
entry = registry.async_get("sensor.ups1_battery_charge")
# No unique id, no registry entry
assert not entry
assert entry
assert entry.unique_id == f"{config_entry.entry_id}_battery.charge"

state = hass.states.get("sensor.ups1_battery_charge")
assert state.state == "100"
Expand All @@ -83,11 +84,11 @@ async def test_5e850i(hass):
async def test_5e650i(hass):
"""Test creation of 5E650I sensors."""

await async_init_integration(hass, "5E650I", ["battery.charge"])
config_entry = await async_init_integration(hass, "5E650I", ["battery.charge"])
registry = await hass.helpers.entity_registry.async_get_registry()
entry = registry.async_get("sensor.ups1_battery_charge")
# No unique id, no registry entry
assert not entry
assert entry
assert entry.unique_id == f"{config_entry.entry_id}_battery.charge"

state = hass.states.get("sensor.ups1_battery_charge")
assert state.state == "100"
Expand All @@ -111,7 +112,6 @@ async def test_backupsses600m1(hass):
await async_init_integration(hass, "BACKUPSES600M1", ["battery.charge"])
registry = await hass.helpers.entity_registry.async_get_registry()
entry = registry.async_get("sensor.ups1_battery_charge")
# No unique id, no registry entry
assert entry
assert (
entry.unique_id
Expand All @@ -137,11 +137,13 @@ async def test_backupsses600m1(hass):
async def test_cp1500pfclcd(hass):
"""Test creation of CP1500PFCLCD sensors."""

await async_init_integration(hass, "CP1500PFCLCD", ["battery.charge"])
config_entry = await async_init_integration(
hass, "CP1500PFCLCD", ["battery.charge"]
)
registry = await hass.helpers.entity_registry.async_get_registry()
entry = registry.async_get("sensor.ups1_battery_charge")
# No unique id, no registry entry
assert not entry
assert entry
assert entry.unique_id == f"{config_entry.entry_id}_battery.charge"

state = hass.states.get("sensor.ups1_battery_charge")
assert state.state == "100"
Expand All @@ -162,11 +164,11 @@ async def test_cp1500pfclcd(hass):
async def test_dl650elcd(hass):
"""Test creation of DL650ELCD sensors."""

await async_init_integration(hass, "DL650ELCD", ["battery.charge"])
config_entry = await async_init_integration(hass, "DL650ELCD", ["battery.charge"])
registry = await hass.helpers.entity_registry.async_get_registry()
entry = registry.async_get("sensor.ups1_battery_charge")
# No unique id, no registry entry
assert not entry
assert entry
assert entry.unique_id == f"{config_entry.entry_id}_battery.charge"

state = hass.states.get("sensor.ups1_battery_charge")
assert state.state == "100"
Expand All @@ -187,11 +189,11 @@ async def test_dl650elcd(hass):
async def test_blazer_usb(hass):
"""Test creation of blazer_usb sensors."""

await async_init_integration(hass, "blazer_usb", ["battery.charge"])
config_entry = await async_init_integration(hass, "blazer_usb", ["battery.charge"])
registry = await hass.helpers.entity_registry.async_get_registry()
entry = registry.async_get("sensor.ups1_battery_charge")
# No unique id, no registry entry
assert not entry
assert entry
assert entry.unique_id == f"{config_entry.entry_id}_battery.charge"

state = hass.states.get("sensor.ups1_battery_charge")
assert state.state == "100"
Expand Down