home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-09-07 05:41:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Lower Z-Wave firmware check delay (#150411)

Browse Source
This commit is contained in:
Martin Hjelmare
2025-08-11 14:09:04 +02:00
committed by GitHub
parent 9595759fd1
commit d135d08813
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/components/zwave_js/update.py
View File

@@ -42,7 +42,7 @@ from .models import ZwaveJSConfigEntry
PARALLEL_UPDATES = 1 PARALLEL_UPDATES = 1
UPDATE_DELAY_STRING = "delay" UPDATE_DELAY_STRING = "delay"
UPDATE_DELAY_INTERVAL = 5 # In minutes UPDATE_DELAY_INTERVAL = 15 # In seconds
ATTR_LATEST_VERSION_FIRMWARE = "latest_version_firmware" ATTR_LATEST_VERSION_FIRMWARE = "latest_version_firmware"
@@ -129,11 +129,11 @@ async def async_setup_entry(
@callback @callback
def async_add_firmware_update_entity(node: ZwaveNode) -> None: def async_add_firmware_update_entity(node: ZwaveNode) -> None:
"""Add firmware update entity.""" """Add firmware update entity."""
# We need to delay the first update of each entity to avoid flooding the network # Delay the first update of each entity to avoid spamming the firmware server.
# so we maintain a counter to schedule first update in UPDATE_DELAY_INTERVAL # Maintain a counter to schedule first update in UPDATE_DELAY_INTERVAL
# minute increments. # second increments.
cnt[UPDATE_DELAY_STRING] += 1 cnt[UPDATE_DELAY_STRING] += 1
delay = timedelta(minutes=(cnt[UPDATE_DELAY_STRING] * UPDATE_DELAY_INTERVAL)) delay = timedelta(seconds=(cnt[UPDATE_DELAY_STRING] * UPDATE_DELAY_INTERVAL))
driver = client.driver driver = client.driver
assert driver is not None # Driver is ready before platforms are loaded. assert driver is not None # Driver is ready before platforms are loaded.
if node.is_controller_node: if node.is_controller_node:
@@ -413,7 +413,8 @@ class ZWaveFirmwareUpdateEntity(UpdateEntity):
): ):
self._attr_latest_version = self._attr_installed_version self._attr_latest_version = self._attr_installed_version
# Spread updates out in 5 minute increments to avoid flooding the network # Spread updates out in 15 second increments
# to avoid spamming the firmware server
self.async_on_remove( self.async_on_remove(
async_call_later(self.hass, self._delay, self._async_update) async_call_later(self.hass, self._delay, self._async_update)
) )

12
tests/components/zwave_js/test_discovery.py
View File

@@ -28,7 +28,13 @@ from homeassistant.components.zwave_js.discovery_data_template import (
DynamicCurrentTempClimateDataTemplate, DynamicCurrentTempClimateDataTemplate,
) )
from homeassistant.config_entries import RELOAD_AFTER_UPDATE_DELAY from homeassistant.config_entries import RELOAD_AFTER_UPDATE_DELAY
from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_UNKNOWN, EntityCategory from homeassistant.const import (
ATTR_ENTITY_ID,
STATE_OFF,
STATE_UNKNOWN,
EntityCategory,
Platform,
)
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers import device_registry as dr, entity_registry as er from homeassistant.helpers import device_registry as dr, entity_registry as er
from homeassistant.util import dt as dt_util from homeassistant.util import dt as dt_util
@@ -253,6 +259,7 @@ async def test_merten_507801_disabled_enitites(
assert updated_entry.disabled is False assert updated_entry.disabled is False
@pytest.mark.parametrize("platforms", [[Platform.BUTTON, Platform.NUMBER]])
async def test_zooz_zen72( async def test_zooz_zen72(
hass: HomeAssistant, hass: HomeAssistant,
entity_registry: er.EntityRegistry, entity_registry: er.EntityRegistry,
@@ -324,6 +331,9 @@ async def test_zooz_zen72(
assert args["value"] is True assert args["value"] is True
@pytest.mark.parametrize(
"platforms", [[Platform.BINARY_SENSOR, Platform.SENSOR, Platform.SWITCH]]
)
async def test_indicator_test( async def test_indicator_test(
hass: HomeAssistant, hass: HomeAssistant,
device_registry: dr.DeviceRegistry, device_registry: dr.DeviceRegistry,

30
tests/components/zwave_js/test_update.py
View File

@@ -167,7 +167,7 @@ async def test_update_entity_states(
client.async_send_command.return_value = {"updates": []} client.async_send_command.return_value = {"updates": []}
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=1)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=1))
await hass.async_block_till_done() await hass.async_block_till_done()
state = hass.states.get(entity_id) state = hass.states.get(entity_id)
@@ -186,7 +186,7 @@ async def test_update_entity_states(
client.async_send_command.return_value = FIRMWARE_UPDATES client.async_send_command.return_value = FIRMWARE_UPDATES
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=2)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=2))
await hass.async_block_till_done() await hass.async_block_till_done()
state = hass.states.get(entity_id) state = hass.states.get(entity_id)
@@ -224,7 +224,7 @@ async def test_update_entity_states(
client.async_send_command.return_value = {"updates": []} client.async_send_command.return_value = {"updates": []}
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=3)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=3))
await hass.async_block_till_done() await hass.async_block_till_done()
state = hass.states.get(entity_id) state = hass.states.get(entity_id)
@@ -246,7 +246,7 @@ async def test_update_entity_install_raises(
"""Test update entity install raises exception.""" """Test update entity install raises exception."""
client.async_send_command.return_value = FIRMWARE_UPDATES client.async_send_command.return_value = FIRMWARE_UPDATES
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=1)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=1))
await hass.async_block_till_done() await hass.async_block_till_done()
# Test failed installation by driver # Test failed installation by driver
@@ -279,7 +279,7 @@ async def test_update_entity_sleep(
client.async_send_command.return_value = FIRMWARE_UPDATES client.async_send_command.return_value = FIRMWARE_UPDATES
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=1)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=1))
await hass.async_block_till_done() await hass.async_block_till_done()
# Two nodes in total, the controller node and the zen_31 node. # Two nodes in total, the controller node and the zen_31 node.
@@ -308,7 +308,7 @@ async def test_update_entity_dead(
client.async_send_command.return_value = FIRMWARE_UPDATES client.async_send_command.return_value = FIRMWARE_UPDATES
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=1)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=1))
await hass.async_block_till_done() await hass.async_block_till_done()
# Two nodes in total, the controller node and the zen_31 node. # Two nodes in total, the controller node and the zen_31 node.
@@ -352,14 +352,14 @@ async def test_update_entity_ha_not_running(
# Update should be delayed by a day because Home Assistant is not running # Update should be delayed by a day because Home Assistant is not running
hass.set_state(CoreState.starting) hass.set_state(CoreState.starting)
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15))
await hass.async_block_till_done() await hass.async_block_till_done()
assert client.async_send_command.call_count == 0 assert client.async_send_command.call_count == 0
hass.set_state(CoreState.running) hass.set_state(CoreState.running)
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=1)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=1))
await hass.async_block_till_done() await hass.async_block_till_done()
# Two nodes in total, the controller node and the zen_31 node. # Two nodes in total, the controller node and the zen_31 node.
@@ -385,7 +385,7 @@ async def test_update_entity_update_failure(
assert client.async_send_command.call_count == 0 assert client.async_send_command.call_count == 0
client.async_send_command.side_effect = FailedZWaveCommand("test", 260, "test") client.async_send_command.side_effect = FailedZWaveCommand("test", 260, "test")
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=1)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=1))
await hass.async_block_till_done() await hass.async_block_till_done()
entity_ids = (CONTROLLER_UPDATE_ENTITY, NODE_UPDATE_ENTITY) entity_ids = (CONTROLLER_UPDATE_ENTITY, NODE_UPDATE_ENTITY)
@@ -493,7 +493,7 @@ async def test_update_entity_progress(
client.async_send_command.return_value = FIRMWARE_UPDATES client.async_send_command.return_value = FIRMWARE_UPDATES
driver = client.driver driver = client.driver
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=1)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=1))
await hass.async_block_till_done() await hass.async_block_till_done()
state = hass.states.get(entity_id) state = hass.states.get(entity_id)
@@ -641,7 +641,7 @@ async def test_update_entity_install_failed(
driver = client.driver driver = client.driver
client.async_send_command.return_value = FIRMWARE_UPDATES client.async_send_command.return_value = FIRMWARE_UPDATES
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=1)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=1))
await hass.async_block_till_done() await hass.async_block_till_done()
state = hass.states.get(entity_id) state = hass.states.get(entity_id)
@@ -717,7 +717,7 @@ async def test_update_entity_reload(
client.async_send_command.return_value = {"updates": []} client.async_send_command.return_value = {"updates": []}
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=1)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=1))
await hass.async_block_till_done() await hass.async_block_till_done()
state = hass.states.get(entity_id) state = hass.states.get(entity_id)
@@ -726,7 +726,7 @@ async def test_update_entity_reload(
client.async_send_command.return_value = FIRMWARE_UPDATES client.async_send_command.return_value = FIRMWARE_UPDATES
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=2)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=2))
await hass.async_block_till_done() await hass.async_block_till_done()
state = hass.states.get(entity_id) state = hass.states.get(entity_id)
@@ -758,7 +758,7 @@ async def test_update_entity_reload(
await hass.async_block_till_done() await hass.async_block_till_done()
# Trigger another update and make sure the skipped version is still skipped # Trigger another update and make sure the skipped version is still skipped
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5, days=4)) async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15, days=4))
await hass.async_block_till_done() await hass.async_block_till_done()
state = hass.states.get(entity_id) state = hass.states.get(entity_id)
@@ -793,7 +793,7 @@ async def test_update_entity_delay(
assert client.async_send_command.call_count == 0 assert client.async_send_command.call_count == 0
update_interval = timedelta(minutes=5) update_interval = timedelta(seconds=15)
freezer.tick(update_interval) freezer.tick(update_interval)
async_fire_time_changed(hass) async_fire_time_changed(hass)
await hass.async_block_till_done() await hass.async_block_till_done()