Fix unique_id issue on onewire config entries (home-assistant#50161)

jborup · May 7, 2021 · 5d5122c · 5d5122c
1 parent 0c288bc
commit 5d5122c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/homeassistant/components/onewire/__init__.py b/homeassistant/components/onewire/__init__.py
@@ -23,7 +23,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry):
     except CannotConnect as exc:
         raise ConfigEntryNotReady() from exc
 
-    hass.data[DOMAIN][config_entry.unique_id] = onewirehub
+    hass.data[DOMAIN][config_entry.entry_id] = onewirehub
 
     async def cleanup_registry() -> None:
         # Get registries
@@ -71,5 +71,5 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry):
         config_entry, PLATFORMS
     )
     if unload_ok:
-        hass.data[DOMAIN].pop(config_entry.unique_id)
+        hass.data[DOMAIN].pop(config_entry.entry_id)
     return unload_ok
diff --git a/homeassistant/components/onewire/binary_sensor.py b/homeassistant/components/onewire/binary_sensor.py
@@ -81,7 +81,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up 1-Wire platform."""
     # Only OWServer implementation works with binary sensors
     if config_entry.data[CONF_TYPE] == CONF_TYPE_OWSERVER:
-        onewirehub = hass.data[DOMAIN][config_entry.unique_id]
+        onewirehub = hass.data[DOMAIN][config_entry.entry_id]
 
         entities = await hass.async_add_executor_job(get_entities, onewirehub)
         async_add_entities(entities, True)

diff --git a/homeassistant/components/onewire/sensor.py b/homeassistant/components/onewire/sensor.py
@@ -250,7 +250,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up 1-Wire platform."""
-    onewirehub = hass.data[DOMAIN][config_entry.unique_id]
+    onewirehub = hass.data[DOMAIN][config_entry.entry_id]
     entities = await hass.async_add_executor_job(
         get_entities, onewirehub, config_entry.data
     )

diff --git a/homeassistant/components/onewire/switch.py b/homeassistant/components/onewire/switch.py
@@ -144,7 +144,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up 1-Wire platform."""
     # Only OWServer implementation works with switches
     if config_entry.data[CONF_TYPE] == CONF_TYPE_OWSERVER:
-        onewirehub = hass.data[DOMAIN][config_entry.unique_id]
+        onewirehub = hass.data[DOMAIN][config_entry.entry_id]
 
         entities = await hass.async_add_executor_job(get_entities, onewirehub)
         async_add_entities(entities, True)

diff --git a/tests/components/onewire/test_init.py b/tests/components/onewire/test_init.py
@@ -35,7 +35,6 @@ async def test_owserver_connect_failure(hass):
             CONF_HOST: "1.2.3.4",
             CONF_PORT: "1234",
         },
-        unique_id=f"{CONF_TYPE_OWSERVER}:1.2.3.4:1234",
         options={},
         entry_id="2",
     )
@@ -63,7 +62,6 @@ async def test_failed_owserver_listing(hass):
             CONF_HOST: "1.2.3.4",
             CONF_PORT: "1234",
         },
-        unique_id=f"{CONF_TYPE_OWSERVER}:1.2.3.4:1234",
         options={},
         entry_id="2",
     )