starred/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2026-09-26 09:23:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add friendly name to ZHA config entities (#79926)

Browse Source 
* Add friendly name to ZHA config entities

* Follow HA capitalization conventions

* Change from "Start-up level" to "Start-up current level"

* Remove siren select friendly names (temporarily)

* Change tests to expect new entity ids

* Re-add siren select friendly names

* Change siren tests to expect new entity ids
This commit is contained in:
TheJulianJES
2022-10-09 09:11:42 -04:00
committed by GitHub
parent 031370358c
commit 3126762707
8 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/components/zha/test_device_action.py
+4 -4
View File
@@ -125,28 +125,28 @@ async def test_get_actions(hass, device_ias):
"domain": Platform.SELECT,
"type": "select_option",
"device_id": reg_device.id,
"entity_id": "select.fakemanufacturer_fakemodel_defaulttoneselect",
"entity_id": "select.fakemanufacturer_fakemodel_default_siren_tone",
"metadata": {"secondary": True},
},
{
"domain": Platform.SELECT,
"type": "select_option",
"device_id": reg_device.id,
"entity_id": "select.fakemanufacturer_fakemodel_defaultsirenlevelselect",
"entity_id": "select.fakemanufacturer_fakemodel_default_siren_level",
"metadata": {"secondary": True},
},
{
"domain": Platform.SELECT,
"type": "select_option",
"device_id": reg_device.id,
"entity_id": "select.fakemanufacturer_fakemodel_defaultstrobelevelselect",
"entity_id": "select.fakemanufacturer_fakemodel_default_strobe_level",
"metadata": {"secondary": True},
},
{
"domain": Platform.SELECT,
"type": "select_option",
"device_id": reg_device.id,
"entity_id": "select.fakemanufacturer_fakemodel_defaultstrobeselect",
"entity_id": "select.fakemanufacturer_fakemodel_default_strobe",
"metadata": {"secondary": True},
},
]
tests/components/zha/test_number.py
+1 -1
View File
@@ -211,7 +211,7 @@ async def test_level_control_number(
Platform.NUMBER,
zha_device,
hass,
qualifier=attr.replace("_", ""),
qualifier=attr,
)
assert entity_id is not None
tests/components/zha/test_select.py
+5 -5
View File
@@ -163,7 +163,7 @@ async def test_select_restore_state(
):
"""Test zha select entity restore state."""
entity_id = "select.fakemanufacturer_fakemodel_defaulttoneselect"
entity_id = "select.fakemanufacturer_fakemodel_default_siren_tone"
core_rs(entity_id, state="Burglar")
zigpy_device = zigpy_device_mock(
@@ -202,12 +202,12 @@ async def test_on_off_select_new_join(hass, light, zha_device_joined):
"start_up_on_off": general.OnOff.StartUpOnOff.On
}
zha_device = await zha_device_joined(light)
select_name = general.OnOff.StartUpOnOff.__name__
select_name = "start_up_behavior"
entity_id = await find_entity_id(
Platform.SELECT,
zha_device,
hass,
qualifier=select_name.lower(),
qualifier=select_name,
)
assert entity_id is not None
@@ -285,12 +285,12 @@ async def test_on_off_select_restored(hass, light, zha_device_restored):
in on_off_cluster.read_attributes.call_args_list
)
select_name = general.OnOff.StartUpOnOff.__name__
select_name = "start_up_behavior"
entity_id = await find_entity_id(
Platform.SELECT,
zha_device,
hass,
qualifier=select_name.lower(),
qualifier=select_name,
)
assert entity_id is not None
tests/components/zha/zha_devices_list.py
+24 -24
View File
@@ -649,10 +649,10 @@ DEVICES = [
"binary_sensor.climaxtechnology_sd8sc_00_00_03_12tc_iaszone",
"sensor.climaxtechnology_sd8sc_00_00_03_12tc_rssi",
"sensor.climaxtechnology_sd8sc_00_00_03_12tc_lqi",
"select.climaxtechnology_sd8sc_00_00_03_12tc_defaulttoneselect",
"select.climaxtechnology_sd8sc_00_00_03_12tc_defaultsirenlevelselect",
"select.climaxtechnology_sd8sc_00_00_03_12tc_defaultstrobelevelselect",
"select.climaxtechnology_sd8sc_00_00_03_12tc_defaultstrobeselect",
"select.climaxtechnology_sd8sc_00_00_03_12tc_default_siren_tone",
"select.climaxtechnology_sd8sc_00_00_03_12tc_default_siren_level",
"select.climaxtechnology_sd8sc_00_00_03_12tc_default_strobe_level",
"select.climaxtechnology_sd8sc_00_00_03_12tc_default_strobe",
"siren.climaxtechnology_sd8sc_00_00_03_12tc_siren",
],
DEV_SIG_ENT_MAP: {
@@ -679,22 +679,22 @@ DEVICES = [
("select", "00:11:22:33:44:55:66:77-1-1282-WarningMode"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultToneSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.climaxtechnology_sd8sc_00_00_03_12tc_defaulttoneselect",
DEV_SIG_ENT_MAP_ID: "select.climaxtechnology_sd8sc_00_00_03_12tc_default_siren_tone",
},
("select", "00:11:22:33:44:55:66:77-1-1282-SirenLevel"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultSirenLevelSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.climaxtechnology_sd8sc_00_00_03_12tc_defaultsirenlevelselect",
DEV_SIG_ENT_MAP_ID: "select.climaxtechnology_sd8sc_00_00_03_12tc_default_siren_level",
},
("select", "00:11:22:33:44:55:66:77-1-1282-StrobeLevel"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultStrobeLevelSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.climaxtechnology_sd8sc_00_00_03_12tc_defaultstrobelevelselect",
DEV_SIG_ENT_MAP_ID: "select.climaxtechnology_sd8sc_00_00_03_12tc_default_strobe_level",
},
("select", "00:11:22:33:44:55:66:77-1-1282-Strobe"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultStrobeSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.climaxtechnology_sd8sc_00_00_03_12tc_defaultstrobeselect",
DEV_SIG_ENT_MAP_ID: "select.climaxtechnology_sd8sc_00_00_03_12tc_default_strobe",
},
("siren", "00:11:22:33:44:55:66:77-1-1282"): {
DEV_SIG_CHANNELS: ["ias_wd"],
@@ -819,10 +819,10 @@ DEVICES = [
"binary_sensor.heiman_smokesensor_em_iaszone",
"sensor.heiman_smokesensor_em_rssi",
"sensor.heiman_smokesensor_em_lqi",
"select.heiman_smokesensor_em_defaulttoneselect",
"select.heiman_smokesensor_em_defaultsirenlevelselect",
"select.heiman_smokesensor_em_defaultstrobelevelselect",
"select.heiman_smokesensor_em_defaultstrobeselect",
"select.heiman_smokesensor_em_default_siren_tone",
"select.heiman_smokesensor_em_default_siren_level",
"select.heiman_smokesensor_em_default_strobe_level",
"select.heiman_smokesensor_em_default_strobe",
"siren.heiman_smokesensor_em_siren",
],
DEV_SIG_ENT_MAP: {
@@ -854,22 +854,22 @@ DEVICES = [
("select", "00:11:22:33:44:55:66:77-1-1282-WarningMode"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultToneSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.heiman_smokesensor_em_defaulttoneselect",
DEV_SIG_ENT_MAP_ID: "select.heiman_smokesensor_em_default_siren_tone",
},
("select", "00:11:22:33:44:55:66:77-1-1282-SirenLevel"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultSirenLevelSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.heiman_smokesensor_em_defaultsirenlevelselect",
DEV_SIG_ENT_MAP_ID: "select.heiman_smokesensor_em_default_siren_level",
},
("select", "00:11:22:33:44:55:66:77-1-1282-StrobeLevel"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultStrobeLevelSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.heiman_smokesensor_em_defaultstrobelevelselect",
DEV_SIG_ENT_MAP_ID: "select.heiman_smokesensor_em_default_strobe_level",
},
("select", "00:11:22:33:44:55:66:77-1-1282-Strobe"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultStrobeSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.heiman_smokesensor_em_defaultstrobeselect",
DEV_SIG_ENT_MAP_ID: "select.heiman_smokesensor_em_default_strobe",
},
("siren", "00:11:22:33:44:55:66:77-1-1282"): {
DEV_SIG_CHANNELS: ["ias_wd"],
@@ -942,32 +942,32 @@ DEVICES = [
"binary_sensor.heiman_warningdevice_iaszone",
"sensor.heiman_warningdevice_rssi",
"sensor.heiman_warningdevice_lqi",
"select.heiman_warningdevice_defaulttoneselect",
"select.heiman_warningdevice_defaultsirenlevelselect",
"select.heiman_warningdevice_defaultstrobelevelselect",
"select.heiman_warningdevice_defaultstrobeselect",
"select.heiman_warningdevice_default_siren_tone",
"select.heiman_warningdevice_default_siren_level",
"select.heiman_warningdevice_default_strobe_level",
"select.heiman_warningdevice_default_strobe",
"siren.heiman_warningdevice_siren",
],
DEV_SIG_ENT_MAP: {
("select", "00:11:22:33:44:55:66:77-1-1282-WarningMode"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultToneSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.heiman_warningdevice_defaulttoneselect",
DEV_SIG_ENT_MAP_ID: "select.heiman_warningdevice_default_siren_tone",
},
("select", "00:11:22:33:44:55:66:77-1-1282-SirenLevel"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultSirenLevelSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.heiman_warningdevice_defaultsirenlevelselect",
DEV_SIG_ENT_MAP_ID: "select.heiman_warningdevice_default_siren_level",
},
("select", "00:11:22:33:44:55:66:77-1-1282-StrobeLevel"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultStrobeLevelSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.heiman_warningdevice_defaultstrobelevelselect",
DEV_SIG_ENT_MAP_ID: "select.heiman_warningdevice_default_strobe_level",
},
("select", "00:11:22:33:44:55:66:77-1-1282-Strobe"): {
DEV_SIG_CHANNELS: ["ias_wd"],
DEV_SIG_ENT_MAP_CLASS: "ZHADefaultStrobeSelectEntity",
DEV_SIG_ENT_MAP_ID: "select.heiman_warningdevice_defaultstrobeselect",
DEV_SIG_ENT_MAP_ID: "select.heiman_warningdevice_default_strobe",
},
("siren", "00:11:22:33:44:55:66:77-1"): {
DEV_SIG_CHANNELS: ["ias_wd"],