From fa57d572154f3c3c53e881e75c5370c59750db36 Mon Sep 17 00:00:00 2001
From: Maciej Bieniek <bieniu@users.noreply.github.com>
Date: Thu, 13 Mar 2025 19:58:09 +0100
Subject: [PATCH] Fix Shelly diagnostics for devices without WebSocket Outbound
support (#140501)
* Don't assume that `ws` is always in config
* Fix device
---
homeassistant/components/shelly/diagnostics.py | 14 ++++++++------
tests/components/shelly/test_diagnostics.py | 18 ++++++++++++++++++
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/homeassistant/components/shelly/diagnostics.py b/homeassistant/components/shelly/diagnostics.py
index cac2bb2f16b..2a9699e0a08 100644
--- a/homeassistant/components/shelly/diagnostics.py
+++ b/homeassistant/components/shelly/diagnostics.py
@@ -79,12 +79,14 @@ async def async_get_config_entry_diagnostics(
device_settings = {
k: v for k, v in rpc_coordinator.device.config.items() if k in ["cloud"]
}
- ws_config = rpc_coordinator.device.config["ws"]
- device_settings["ws_outbound_enabled"] = ws_config["enable"]
- if ws_config["enable"]:
- device_settings["ws_outbound_server_valid"] = bool(
- ws_config["server"] == get_rpc_ws_url(hass)
- )
+ if not (ws_config := rpc_coordinator.device.config.get("ws", {})):
+ device_settings["ws_outbound"] = "not supported"
+ if (ws_outbound_enabled := ws_config.get("enable")) is not None:
+ device_settings["ws_outbound_enabled"] = ws_outbound_enabled
+ if ws_outbound_enabled:
+ device_settings["ws_outbound_server_valid"] = bool(
+ ws_config["server"] == get_rpc_ws_url(hass)
+ )
device_status = {
k: v
for k, v in rpc_coordinator.device.status.items()
diff --git a/tests/components/shelly/test_diagnostics.py b/tests/components/shelly/test_diagnostics.py
index 3826631c580..d89f21f5992 100644
--- a/tests/components/shelly/test_diagnostics.py
+++ b/tests/components/shelly/test_diagnostics.py
@@ -194,3 +194,21 @@ async def test_rpc_config_entry_diagnostics_ws_outbound(
result["device_settings"]["ws_outbound_server_valid"]
== ws_outbound_server_valid
)
+
+
+async def test_rpc_config_entry_diagnostics_no_ws(
+ hass: HomeAssistant,
+ hass_client: ClientSessionGenerator,
+ mock_rpc_device: Mock,
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
+ """Test config entry diagnostics for rpc device which doesn't support ws outbound."""
+ config = deepcopy(mock_rpc_device.config)
+ config.pop("ws")
+ monkeypatch.setattr(mock_rpc_device, "config", config)
+
+ entry = await init_integration(hass, 3)
+
+ result = await get_diagnostics_for_config_entry(hass, hass_client, entry)
+
+ assert result["device_settings"]["ws_outbound"] == "not supported"
--
GitLab