evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-enable multi-PAN (#86533)

Browse source 
Revert "Disable multi-pan (#83603)"

This reverts commit 9c7b80090a.
This commit is contained in:
puddly 2023-01-24 13:05:17 -05:00 • committed by GitHub
parent ff5c1ce2d3
commit 4b88a71d60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py
View file

@ -236,15 +236,7 @@ class OptionsFlowHandler(BaseMultiPanFlow, config_entries.OptionsFlow):
if not is_hassio(self.hass):
return self.async_abort(reason="not_hassio")
return self.async_abort(
reason="disabled_due_to_bug",
description_placeholders={
"url": "https://developers.home-assistant.io/blog/2022/12/08/multi-pan-rollback"
},
)
# pylint: disable-next=unreachable
return await self.async_step_on_supervisor() # type: ignore[unreachable]
return await self.async_step_on_supervisor()
async def async_step_on_supervisor(
self, user_input: dict[str, Any] | None = None

3
homeassistant/components/homeassistant_hardware/strings.json
View file

@ -32,8 +32,7 @@
"addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.",
"addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.",
"not_hassio": "The hardware options can only be configured on HassOS installations.",
"zha_migration_failed": "The ZHA migration did not succeed.",
"disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})"
"zha_migration_failed": "The ZHA migration did not succeed."
},
"progress": {
"install_addon": "Please wait while the Silicon Labs Multiprotocol add-on installation finishes. This can take several minutes.",

1
homeassistant/components/homeassistant_hardware/translations/en.json
View file

@ -6,7 +6,6 @@
"addon_install_failed": "Failed to install the Silicon Labs Multiprotocol add-on.",
"addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.",
"addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.",
"disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})",
"not_hassio": "The hardware options can only be configured on HassOS installations.",
"zha_migration_failed": "The ZHA migration did not succeed."
},

3
homeassistant/components/homeassistant_sky_connect/strings.json
View file

@ -31,8 +31,7 @@
"addon_set_config_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_set_config_failed%]",
"addon_start_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_start_failed%]",
"not_hassio": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::not_hassio%]",
"zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]",
"disabled_due_to_bug": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::disabled_due_to_bug%]"
"zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]"
},
"progress": {
"install_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::progress::install_addon%]",

1
homeassistant/components/homeassistant_sky_connect/translations/en.json
View file

@ -5,7 +5,6 @@
"addon_install_failed": "Failed to install the Silicon Labs Multiprotocol add-on.",
"addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.",
"addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.",
"disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})",
"not_hassio": "The hardware options can only be configured on HassOS installations.",
"zha_migration_failed": "The ZHA migration did not succeed."
},

3
homeassistant/components/homeassistant_yellow/strings.json
View file

@ -31,8 +31,7 @@
"addon_set_config_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_set_config_failed%]",
"addon_start_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_start_failed%]",
"not_hassio": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::not_hassio%]",
"zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]",
"disabled_due_to_bug": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::disabled_due_to_bug%]"
"zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]"
},
"progress": {
"install_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::progress::install_addon%]",

1
homeassistant/components/homeassistant_yellow/translations/en.json
View file

@ -5,7 +5,6 @@
"addon_install_failed": "Failed to install the Silicon Labs Multiprotocol add-on.",
"addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.",
"addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.",
"disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})",
"not_hassio": "The hardware options can only be configured on HassOS installations.",
"zha_migration_failed": "The ZHA migration did not succeed."
},

3
tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py
View file

@ -20,9 +20,6 @@ from tests.common import MockConfigEntry, MockModule, mock_integration, mock_pla
TEST_DOMAIN = "test"
pytest.skip(reason="Temporarily disabled", allow_module_level=True)
class TestConfigFlow(ConfigFlow, domain=TEST_DOMAIN):
"""Handle a config flow for the silabs multiprotocol add-on."""

4
tests/components/homeassistant_sky_connect/test_config_flow.py
View file

@ -2,8 +2,6 @@
import copy
from unittest.mock import Mock, patch
import pytest
from homeassistant.components import homeassistant_sky_connect, usb
from homeassistant.components.homeassistant_sky_connect.const import DOMAIN
from homeassistant.components.zha.core.const import (
@ -152,7 +150,6 @@ async def test_config_flow_update_device(hass: HomeAssistant) -> None:
assert len(mock_unload_entry.mock_calls) == 1
@pytest.mark.skip(reason="Temporarily disabled")
async def test_option_flow_install_multi_pan_addon(
hass: HomeAssistant,
addon_store_info,
@ -243,7 +240,6 @@ def mock_detect_radio_type(radio_type=RadioType.ezsp, ret=True):
return detect
@pytest.mark.skip(reason="Temporarily disabled")
@patch(
"homeassistant.components.zha.radio_manager.ZhaRadioManager.detect_radio_type",
mock_detect_radio_type(),

4
tests/components/homeassistant_yellow/test_config_flow.py
View file

@ -1,8 +1,6 @@
"""Test the Home Assistant Yellow config flow."""
from unittest.mock import Mock, patch
import pytest
from homeassistant.components.homeassistant_yellow.const import DOMAIN
from homeassistant.components.zha.core.const import DOMAIN as ZHA_DOMAIN
from homeassistant.core import HomeAssistant
@ -61,7 +59,6 @@ async def test_config_flow_single_entry(hass: HomeAssistant) -> None:
mock_setup_entry.assert_not_called()
@pytest.mark.skip(reason="Temporarily disabled")
async def test_option_flow_install_multi_pan_addon(
hass: HomeAssistant,
addon_store_info,
@ -130,7 +127,6 @@ async def test_option_flow_install_multi_pan_addon(
assert result["type"] == FlowResultType.CREATE_ENTRY
@pytest.mark.skip(reason="Temporarily disabled")
async def test_option_flow_install_multi_pan_addon_zha(
hass: HomeAssistant,
addon_store_info,