diff --git a/homeassistant/components/otbr/config_flow.py b/homeassistant/components/otbr/config_flow.py index 514f6c7617c..ebdf5ddeace 100644 --- a/homeassistant/components/otbr/config_flow.py +++ b/homeassistant/components/otbr/config_flow.py @@ -72,10 +72,7 @@ async def _title(hass: HomeAssistant, discovery_info: HassioServiceInfo) -> str: if _is_yellow(hass) and device == "/dev/ttyAMA1": return f"Home Assistant Yellow ({discovery_info.name})" - if device and "SkyConnect" in device: - return f"Home Assistant SkyConnect ({discovery_info.name})" - - if device and "Connect_ZBT-1" in device: + if device and ("Connect_ZBT-1" in device or "SkyConnect" in device): return f"Home Assistant Connect ZBT-1 ({discovery_info.name})" return discovery_info.name diff --git a/tests/components/otbr/test_config_flow.py b/tests/components/otbr/test_config_flow.py index 8384b905b9c..1b6926a863c 100644 --- a/tests/components/otbr/test_config_flow.py +++ b/tests/components/otbr/test_config_flow.py @@ -455,7 +455,7 @@ async def test_hassio_discovery_flow_yellow( [ ( "/dev/serial/by-id/usb-Nabu_Casa_SkyConnect_v1.0_9e2adbd75b8beb119fe564a0f320645d-if00-port0", - "Home Assistant SkyConnect (Silicon Labs Multiprotocol)", + "Home Assistant Connect ZBT-1 (Silicon Labs Multiprotocol)", ), ( "/dev/serial/by-id/usb-Nabu_Casa_Home_Assistant_Connect_ZBT-1_9e2adbd75b8beb119fe564a0f320645d-if00-port0", @@ -556,14 +556,16 @@ async def test_hassio_discovery_flow_2x_addons( assert results[0]["type"] is FlowResultType.CREATE_ENTRY assert ( - results[0]["title"] == "Home Assistant SkyConnect (Silicon Labs Multiprotocol)" + results[0]["title"] + == "Home Assistant Connect ZBT-1 (Silicon Labs Multiprotocol)" ) assert results[0]["data"] == expected_data assert results[0]["options"] == {} assert results[1]["type"] is FlowResultType.CREATE_ENTRY assert ( - results[1]["title"] == "Home Assistant SkyConnect (Silicon Labs Multiprotocol)" + results[1]["title"] + == "Home Assistant Connect ZBT-1 (Silicon Labs Multiprotocol)" ) assert results[1]["data"] == expected_data_2 assert results[1]["options"] == {} @@ -574,7 +576,8 @@ async def test_hassio_discovery_flow_2x_addons( assert config_entry.data == expected_data assert config_entry.options == {} assert ( - config_entry.title == "Home Assistant SkyConnect (Silicon Labs Multiprotocol)" + config_entry.title + == "Home Assistant Connect ZBT-1 (Silicon Labs Multiprotocol)" ) assert config_entry.unique_id == HASSIO_DATA.uuid @@ -582,7 +585,8 @@ async def test_hassio_discovery_flow_2x_addons( assert config_entry.data == expected_data_2 assert config_entry.options == {} assert ( - config_entry.title == "Home Assistant SkyConnect (Silicon Labs Multiprotocol)" + config_entry.title + == "Home Assistant Connect ZBT-1 (Silicon Labs Multiprotocol)" ) assert config_entry.unique_id == HASSIO_DATA_2.uuid @@ -641,7 +645,8 @@ async def test_hassio_discovery_flow_2x_addons_same_ext_address( assert results[0]["type"] is FlowResultType.CREATE_ENTRY assert ( - results[0]["title"] == "Home Assistant SkyConnect (Silicon Labs Multiprotocol)" + results[0]["title"] + == "Home Assistant Connect ZBT-1 (Silicon Labs Multiprotocol)" ) assert results[0]["data"] == expected_data assert results[0]["options"] == {} @@ -653,7 +658,8 @@ async def test_hassio_discovery_flow_2x_addons_same_ext_address( assert config_entry.data == expected_data assert config_entry.options == {} assert ( - config_entry.title == "Home Assistant SkyConnect (Silicon Labs Multiprotocol)" + config_entry.title + == "Home Assistant Connect ZBT-1 (Silicon Labs Multiprotocol)" ) assert config_entry.unique_id == HASSIO_DATA.uuid