From ee45431d0eeb629afe038c72d686a5cc5e4b0792 Mon Sep 17 00:00:00 2001
From: Mark Coombes <mark@markcoombes.ca>
Date: Tue, 1 Oct 2019 17:28:13 -0400
Subject: [PATCH] Add entity registry support to ecobee integration (#27088)

* Add unique id to platforms

Add unique id for binary sensor, climate, and sensor.

* Add unique id to weather platform

* Simplify unique_id for weather platform

* Fix lint for unique_id in sensor

* Fix lint for unique_id in binary sensor
---
 homeassistant/components/ecobee/binary_sensor.py | 9 +++++++++
 homeassistant/components/ecobee/climate.py       | 5 +++++
 homeassistant/components/ecobee/sensor.py        | 9 +++++++++
 homeassistant/components/ecobee/weather.py       | 5 +++++
 4 files changed, 28 insertions(+)

diff --git a/homeassistant/components/ecobee/binary_sensor.py b/homeassistant/components/ecobee/binary_sensor.py
index 8b7b819cfc7..68d8a88df47 100644
--- a/homeassistant/components/ecobee/binary_sensor.py
+++ b/homeassistant/components/ecobee/binary_sensor.py
@@ -43,6 +43,15 @@ class EcobeeBinarySensor(BinarySensorDevice):
         """Return the name of the Ecobee sensor."""
         return self._name.rstrip()
 
+    @property
+    def unique_id(self):
+        """Return a unique identifier for this sensor."""
+        for sensor in self.data.ecobee.get_remote_sensors(self.index):
+            if sensor["name"] == self.sensor_name:
+                if "code" in sensor:
+                    return f"{sensor['code']}-{self.device_class}"
+                return f"{sensor['id']}-{self.device_class}"
+
     @property
     def is_on(self):
         """Return the status of the sensor."""
diff --git a/homeassistant/components/ecobee/climate.py b/homeassistant/components/ecobee/climate.py
index 6eccdccf8c6..f930282ba7b 100644
--- a/homeassistant/components/ecobee/climate.py
+++ b/homeassistant/components/ecobee/climate.py
@@ -305,6 +305,11 @@ class Thermostat(ClimateDevice):
         """Return the name of the Ecobee Thermostat."""
         return self.thermostat["name"]
 
+    @property
+    def unique_id(self):
+        """Return a unique identifier for this ecobee thermostat."""
+        return self.thermostat["identifier"]
+
     @property
     def temperature_unit(self):
         """Return the unit of measurement."""
diff --git a/homeassistant/components/ecobee/sensor.py b/homeassistant/components/ecobee/sensor.py
index e62d68dc9bc..8cf9af0e3b4 100644
--- a/homeassistant/components/ecobee/sensor.py
+++ b/homeassistant/components/ecobee/sensor.py
@@ -54,6 +54,15 @@ class EcobeeSensor(Entity):
         """Return the name of the Ecobee sensor."""
         return self._name
 
+    @property
+    def unique_id(self):
+        """Return a unique identifier for this sensor."""
+        for sensor in self.data.ecobee.get_remote_sensors(self.index):
+            if sensor["name"] == self.sensor_name:
+                if "code" in sensor:
+                    return f"{sensor['code']}-{self.device_class}"
+                return f"{sensor['id']}-{self.device_class}"
+
     @property
     def device_class(self):
         """Return the device class of the sensor."""
diff --git a/homeassistant/components/ecobee/weather.py b/homeassistant/components/ecobee/weather.py
index dd3112b636e..6175405638e 100644
--- a/homeassistant/components/ecobee/weather.py
+++ b/homeassistant/components/ecobee/weather.py
@@ -61,6 +61,11 @@ class EcobeeWeather(WeatherEntity):
         """Return the name of the sensor."""
         return self._name
 
+    @property
+    def unique_id(self):
+        """Return a unique identifier for the weather platform."""
+        return self.data.ecobee.get_thermostat(self._index)["identifier"]
+
     @property
     def condition(self):
         """Return the current condition."""