diff --git a/homeassistant/components/binary_sensor/netatmo.py b/homeassistant/components/binary_sensor/netatmo.py index 4d8aaa7d0d9..dd7e0ee8d50 100644 --- a/homeassistant/components/binary_sensor/netatmo.py +++ b/homeassistant/components/binary_sensor/netatmo.py @@ -131,8 +131,6 @@ class NetatmoBinarySensor(BinarySensorDevice): self._name += ' / ' + module_name self._sensor_name = sensor self._name += ' ' + sensor - self._unique_id = data.camera_data.cameraByName( - camera=camera_name, home=home)['id'] self._cameratype = camera_type self._state = None @@ -141,11 +139,6 @@ class NetatmoBinarySensor(BinarySensorDevice): """Return the name of the Netatmo device and this sensor.""" return self._name - @property - def unique_id(self): - """Return the unique ID for this sensor.""" - return self._unique_id - @property def device_class(self): """Return the class of this sensor, from DEVICE_CLASSES.""" diff --git a/homeassistant/components/camera/netatmo.py b/homeassistant/components/camera/netatmo.py index 0a9a3fbdca4..48f2710ce2e 100644 --- a/homeassistant/components/camera/netatmo.py +++ b/homeassistant/components/camera/netatmo.py @@ -67,8 +67,6 @@ class NetatmoCamera(Camera): self._vpnurl, self._localurl = self._data.camera_data.cameraUrls( camera=camera_name ) - self._unique_id = data.camera_data.cameraByName( - camera=camera_name, home=home)['id'] self._cameratype = camera_type def camera_image(self): @@ -112,8 +110,3 @@ class NetatmoCamera(Camera): elif self._cameratype == "NACamera": return "Welcome" return None - - @property - def unique_id(self): - """Return the unique ID for this camera.""" - return self._unique_id diff --git a/homeassistant/components/sensor/netatmo.py b/homeassistant/components/sensor/netatmo.py index c20e0a59408..8ec6de60fb9 100644 --- a/homeassistant/components/sensor/netatmo.py +++ b/homeassistant/components/sensor/netatmo.py @@ -113,18 +113,12 @@ class NetAtmoSensor(Entity): module_id = self.netatmo_data.\ station_data.moduleByName(module=module_name)['_id'] self.module_id = module_id[1] - self._unique_id = '{}-{}'.format(self.module_id, self.type) @property def name(self): """Return the name of the sensor.""" return self._name - @property - def unique_id(self): - """Return the unique ID for this sensor.""" - return self._unique_id - @property def icon(self): """Icon to use in the frontend, if any.""" diff --git a/homeassistant/helpers/entity_platform.py b/homeassistant/helpers/entity_platform.py index 5c1d437c7cf..9035973e015 100644 --- a/homeassistant/helpers/entity_platform.py +++ b/homeassistant/helpers/entity_platform.py @@ -240,8 +240,12 @@ class EntityPlatform(object): raise HomeAssistantError( 'Invalid entity id: {}'.format(entity.entity_id)) elif entity.entity_id in component_entities: + msg = 'Entity id already exists: {}'.format(entity.entity_id) + if entity.unique_id is not None: + msg += '. Platform {} does not generate unique IDs'.format( + self.platform_name) raise HomeAssistantError( - 'Entity id already exists: {}'.format(entity.entity_id)) + msg) self.entities[entity.entity_id] = entity component_entities.add(entity.entity_id)