From 7be3a4cd37950550344ae344115a8760e74e60de Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 18 Feb 2020 08:32:34 -0800
Subject: [PATCH] Fix entity registry not saving name/icon (#31932)

---
 homeassistant/helpers/entity_registry.py | 6 ++++++
 tests/helpers/test_entity_registry.py    | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py
index 05b687a8454..5996fb6eaf7 100644
--- a/homeassistant/helpers/entity_registry.py
+++ b/homeassistant/helpers/entity_registry.py
@@ -392,11 +392,14 @@ class EntityRegistry:
                     unique_id=entity["unique_id"],
                     platform=entity["platform"],
                     name=entity.get("name"),
+                    icon=entity.get("icon"),
                     disabled_by=entity.get("disabled_by"),
                     capabilities=entity.get("capabilities") or {},
                     supported_features=entity.get("supported_features", 0),
                     device_class=entity.get("device_class"),
                     unit_of_measurement=entity.get("unit_of_measurement"),
+                    original_name=entity.get("original_name"),
+                    original_icon=entity.get("original_icon"),
                 )
 
         self.entities = entities
@@ -419,11 +422,14 @@ class EntityRegistry:
                 "unique_id": entry.unique_id,
                 "platform": entry.platform,
                 "name": entry.name,
+                "icon": entry.icon,
                 "disabled_by": entry.disabled_by,
                 "capabilities": entry.capabilities,
                 "supported_features": entry.supported_features,
                 "device_class": entry.device_class,
                 "unit_of_measurement": entry.unit_of_measurement,
+                "original_name": entry.original_name,
+                "original_icon": entry.original_icon,
             }
             for entry in self.entities.values()
         ]
diff --git a/tests/helpers/test_entity_registry.py b/tests/helpers/test_entity_registry.py
index 6782007ebe7..e7a7b856da2 100644
--- a/tests/helpers/test_entity_registry.py
+++ b/tests/helpers/test_entity_registry.py
@@ -159,6 +159,11 @@ async def test_loading_saving_data(hass, registry):
         supported_features=5,
         device_class="mock-device-class",
         disabled_by=entity_registry.DISABLED_HASS,
+        original_name="Original Name",
+        original_icon="hass:original-icon",
+    )
+    orig_entry2 = registry.async_update_entity(
+        orig_entry2.entity_id, name="User Name", icon="hass:user-icon"
     )
 
     assert len(registry.entities) == 2
@@ -181,6 +186,10 @@ async def test_loading_saving_data(hass, registry):
     assert new_entry2.capabilities == {"max": 100}
     assert new_entry2.supported_features == 5
     assert new_entry2.device_class == "mock-device-class"
+    assert new_entry2.name == "User Name"
+    assert new_entry2.icon == "hass:user-icon"
+    assert new_entry2.original_name == "Original Name"
+    assert new_entry2.original_icon == "hass:original-icon"
 
 
 def test_generate_entity_considers_registered_entities(registry):