From 5ab3c7b765c8b0556d554ee38fcd32795bfc0a63 Mon Sep 17 00:00:00 2001
From: Alexei Chetroi <lexoid@gmail.com>
Date: Fri, 11 Jan 2019 21:41:27 -0500
Subject: [PATCH] Don't set friendly_name in Zha entity. (#19991)

Use @property name instead of setting friendly_name device state attr.
---
 .../components/zha/entities/entity.py          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/zha/entities/entity.py b/homeassistant/components/zha/entities/entity.py
index 2b8ee2f1748..9247d6eeb00 100644
--- a/homeassistant/components/zha/entities/entity.py
+++ b/homeassistant/components/zha/entities/entity.py
@@ -13,7 +13,7 @@ from homeassistant.components.zha.const import (
     ATTR_VALUE, ATTR_MANUFACTURER, ATTR_COMMAND, SERVER, ATTR_COMMAND_TYPE,
     ATTR_ARGS, IN, OUT, CLIENT_COMMANDS, SERVER_COMMANDS)
 from homeassistant.components.zha.helpers import bind_configure_reporting
-from homeassistant.const import ATTR_ENTITY_ID, CONF_FRIENDLY_NAME
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import callback
 from homeassistant.helpers import entity
 from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE
@@ -34,6 +34,7 @@ class ZhaEntity(entity.Entity):
                  **kwargs):
         """Init ZHA entity."""
         self._device_state_attributes = {}
+        self._name = None
         ieee = endpoint.device.ieee
         ieeetail = ''.join(['%02x' % (o, ) for o in ieee[-4:]])
         if manufacturer and model is not None:
@@ -45,10 +46,7 @@ class ZhaEntity(entity.Entity):
                 endpoint.endpoint_id,
                 kwargs.get(ENTITY_SUFFIX, ''),
             )
-            self._device_state_attributes[CONF_FRIENDLY_NAME] = "{} {}".format(
-                manufacturer,
-                model,
-            )
+            self._name = "{} {}".format(manufacturer, model)
         else:
             self.entity_id = "{}.zha_{}_{}{}".format(
                 self._domain,
@@ -233,6 +231,11 @@ class ZhaEntity(entity.Entity):
                 cluster = self._out_clusters[cluster_id]
         return cluster
 
+    @property
+    def name(self):
+        """Return Entity's default name."""
+        return self._name
+
     @property
     def zcl_reporting_config(self):
         """Return a dict of ZCL attribute reporting configuration.
@@ -302,10 +305,7 @@ class ZhaEntity(entity.Entity):
             'identifiers': {(DOMAIN, ieee)},
             ATTR_MANUFACTURER: self._endpoint.manufacturer,
             'model': self._endpoint.model,
-            'name': self._device_state_attributes.get(
-                CONF_FRIENDLY_NAME,
-                ieee
-            ),
+            'name': self.name or ieee,
             'via_hub': (DOMAIN, self.hass.data[DATA_ZHA][DATA_ZHA_BRIDGE_ID]),
         }