Update IDs for rename node/value (#24646)
* Update IDs for rename node/value * Rename devices and entities * Improved coverage
This commit is contained in:
1 parent
7f90a1cab2
commit
23dd644f4a
7 files changed
+250
-19
No files matched your search
@@ -68,12 +68,14 @@ SUPPORTED_PLATFORMS = ['binary_sensor', 'climate', 'cover', 'fan',
|
||||
RENAME_NODE_SCHEMA = vol.Schema({
|
||||
vol.Required(const.ATTR_NODE_ID): vol.Coerce(int),
|
||||
vol.Required(const.ATTR_NAME): cv.string,
|
||||
vol.Optional(const.ATTR_UPDATE_IDS, default=False): cv.boolean,
|
||||
})
|
||||
|
||||
RENAME_VALUE_SCHEMA = vol.Schema({
|
||||
vol.Required(const.ATTR_NODE_ID): vol.Coerce(int),
|
||||
vol.Required(const.ATTR_VALUE_ID): vol.Coerce(int),
|
||||
vol.Required(const.ATTR_NAME): cv.string,
|
||||
vol.Optional(const.ATTR_UPDATE_IDS, default=False): cv.boolean,
|
||||
})
|
||||
|
||||
SET_CONFIG_PARAMETER_SCHEMA = vol.Schema({
|
||||
@@ -389,8 +391,7 @@ async def async_setup_entry(hass, config_entry):
|
||||
entity.node_id, sec)
|
||||
hass.async_add_job(_add_node_to_component)
|
||||
|
||||
hass.add_job(check_has_unique_id, entity, _on_ready, _on_timeout,
|
||||
hass.loop)
|
||||
hass.add_job(check_has_unique_id, entity, _on_ready, _on_timeout)
|
||||
|
||||
def node_removed(node):
|
||||
node_id = node.node_id
|
||||
@@ -491,6 +492,7 @@ async def async_setup_entry(hass, config_entry):
|
||||
if hass.state == CoreState.running:
|
||||
hass.bus.fire(const.EVENT_NETWORK_STOP)
|
||||
|
||||
@callback
|
||||
def rename_node(service):
|
||||
"""Rename a node."""
|
||||
node_id = service.data.get(const.ATTR_NODE_ID)
|
||||
@@ -499,7 +501,19 @@ async def async_setup_entry(hass, config_entry):
|
||||
node.name = name
|
||||
_LOGGER.info(
|
||||
"Renamed Z-Wave node %d to %s", node_id, name)
|
||||
update_ids = service.data.get(const.ATTR_UPDATE_IDS)
|
||||
# We want to rename the device, the node entity,
|
||||
# and all the contained entities
|
||||
node_key = 'node-{}'.format(node_id)
|
||||
entity = hass.data[DATA_DEVICES][node_key]
|
||||
hass.async_create_task(entity.node_renamed(update_ids))
|
||||
for key in list(hass.data[DATA_DEVICES]):
|
||||
if not key.startswith('{}-'.format(node_id)):
|
||||
continue
|
||||
entity = hass.data[DATA_DEVICES][key]
|
||||
hass.async_create_task(entity.value_renamed(update_ids))
|
||||
|
||||
@callback
|
||||
def rename_value(service):
|
||||
"""Rename a node value."""
|
||||
node_id = service.data.get(const.ATTR_NODE_ID)
|
||||
@@ -511,6 +525,10 @@ async def async_setup_entry(hass, config_entry):
|
||||
_LOGGER.info(
|
||||
"Renamed Z-Wave value (Node %d Value %d) to %s",
|
||||
node_id, value_id, name)
|
||||
update_ids = service.data.get(const.ATTR_UPDATE_IDS)
|
||||
value_key = '{}-{}'.format(node_id, value_id)
|
||||
entity = hass.data[DATA_DEVICES][value_key]
|
||||
hass.async_create_task(entity.value_renamed(update_ids))
|
||||
|
||||
def set_poll_intensity(service):
|
||||
"""Set the polling intensity of a node value."""
|
||||
@@ -996,7 +1014,7 @@ class ZWaveDeviceEntityValues():
|
||||
self._hass.add_job(discover_device, component, device)
|
||||
else:
|
||||
self._hass.add_job(check_has_unique_id, device, _on_ready,
|
||||
_on_timeout, self._hass.loop)
|
||||
_on_timeout)
|
||||
|
||||
|
||||
class ZWaveDeviceEntity(ZWaveBaseEntity):
|
||||
@@ -1034,6 +1052,25 @@ class ZWaveDeviceEntity(ZWaveBaseEntity):
|
||||
self.update_properties()
|
||||
self.maybe_schedule_update()
|
||||
|
||||
async def value_renamed(self, update_ids=False):
|
||||
"""Rename the node and update any IDs."""
|
||||
self._name = _value_name(self.values.primary)
|
||||
if update_ids:
|
||||
# Update entity ID.
|
||||
ent_reg = await async_get_registry(self.hass)
|
||||
new_entity_id = ent_reg.async_generate_entity_id(
|
||||
self.platform.domain,
|
||||
self._name,
|
||||
self.platform.entities.keys() - {self.entity_id})
|
||||
if new_entity_id != self.entity_id:
|
||||
# Don't change the name attribute, it will be None unless
|
||||
# customised and if it's been customised, keep the
|
||||
# customisation.
|
||||
ent_reg.async_update_entity(
|
||||
self.entity_id, new_entity_id=new_entity_id)
|
||||
return
|
||||
self.async_schedule_update_ha_state()
|
||||
|
||||
async def async_added_to_hass(self):
|
||||
"""Add device to dict."""
|
||||
async_dispatcher_connect(
|
||||
|
||||
Reference in new issue
Block a user