Add config flow and device registry to fritzbox integration

homeassistant/components/fritzbox/binary_sensor.py

@@ -1,10 +1,12 @@
 """Support for Fritzbox binary sensors."""
 import requests
 
-from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDevice
 
 from .const import DOMAIN as FRITZBOX_DOMAIN, LOGGER
 
+entities = set()
+
 
 async def async_setup_platform(
     hass, config, add_entities, discovery_info=None
@@ -21,8 +23,9 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     for fritz in fritz_list:
         device_list = fritz.get_devices()
         for device in device_list:
-            if device.has_alarm:
+            if device.has_alarm and device.ain not in entities:
                 devices.append(FritzboxBinarySensor(device, fritz))
+                entities.add(device.ain)
 
     async_add_entities(devices, True)
 
@@ -40,7 +43,7 @@ def device_info(self):
         """Return device specific attributes."""
         return {
             "name": self.name,
-            "identifiers": {(FRITZBOX_DOMAIN, self.unique_id)},
+            "identifiers": {(FRITZBOX_DOMAIN, self._device.ain)},
             "manufacturer": self._device.manufacturer,
             "model": self._device.productname,
             "sw_version": self._device.fw_version,
@@ -49,7 +52,7 @@ def device_info(self):
     @property
     def unique_id(self):
         """Return the unique ID of the device."""
-        return self._device.ain
+        return f"{self._device.ain}-{DOMAIN}"
 
     @property
     def name(self):

homeassistant/components/fritzbox/climate.py

@@ -4,6 +4,7 @@
 from homeassistant.components.climate import ClimateDevice
 from homeassistant.components.climate.const import (
     ATTR_HVAC_MODE,
+    DOMAIN,
     HVAC_MODE_HEAT,
     HVAC_MODE_OFF,
     PRESET_COMFORT,
@@ -44,6 +45,8 @@
 ON_REPORT_SET_TEMPERATURE = 30.0
 OFF_REPORT_SET_TEMPERATURE = 0.0
 
+entities = set()
+
 
 async def async_setup_platform(
     hass, config, add_entities, discovery_info=None
@@ -60,8 +63,9 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     for fritz in fritz_list:
         device_list = fritz.get_devices()
         for device in device_list:
-            if device.has_thermostat:
+            if device.has_thermostat and device.ain not in entities:
                 devices.append(FritzboxThermostat(device, fritz))
+                entities.add(device.ain)
 
     async_add_entities(devices)
 
@@ -83,7 +87,7 @@ def device_info(self):
         """Return device specific attributes."""
         return {
             "name": self.name,
-            "identifiers": {(FRITZBOX_DOMAIN, self.unique_id)},
+            "identifiers": {(FRITZBOX_DOMAIN, self._device.ain)},
             "manufacturer": self._device.manufacturer,
             "model": self._device.productname,
             "sw_version": self._device.fw_version,
@@ -92,7 +96,7 @@ def device_info(self):
     @property
     def unique_id(self):
         """Return the unique ID of the device."""
-        return self._device.ain
+        return f"{self._device.ain}-{DOMAIN}"
 
     @property
     def supported_features(self):

homeassistant/components/fritzbox/sensor.py

@@ -1,6 +1,7 @@
 """Support for AVM Fritz!Box smarthome temperature sensor only devices."""
 import requests
 
+from homeassistant.components.sensor import DOMAIN
 from homeassistant.const import TEMP_CELSIUS
 from homeassistant.helpers.entity import Entity
 
@@ -11,6 +12,8 @@
     LOGGER,
 )
 
+entities = set()
+
 
 async def async_setup_platform(
     hass, config, add_entities, discovery_info=None
@@ -21,7 +24,6 @@ async def async_setup_platform(
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Fritzbox smarthome sensor from config_entry."""
-    LOGGER.debug("Initializing fritzbox temperature sensors")
     devices = []
     fritz_list = hass.data[FRITZBOX_DOMAIN]
 
@@ -32,8 +34,10 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
                 device.has_temperature_sensor
                 and not device.has_switch
                 and not device.has_thermostat
+                and device.ain not in entities
             ):
                 devices.append(FritzBoxTempSensor(device, fritz))
+                entities.add(device.ain)
 
     async_add_entities(devices)
 
@@ -51,7 +55,7 @@ def device_info(self):
         """Return device specific attributes."""
         return {
             "name": self.name,
-            "identifiers": {(FRITZBOX_DOMAIN, self.unique_id)},
+            "identifiers": {(FRITZBOX_DOMAIN, self._device.ain)},
             "manufacturer": self._device.manufacturer,
             "model": self._device.productname,
             "sw_version": self._device.fw_version,
@@ -60,7 +64,7 @@ def device_info(self):
     @property
     def unique_id(self):
         """Return the unique ID of the device."""
-        return self._device.ain
+        return f"{self._device.ain}-{DOMAIN}"
 
     @property
     def name(self):

homeassistant/components/fritzbox/switch.py

@@ -1,7 +1,7 @@
 """Support for AVM Fritz!Box smarthome switch devices."""
 import requests
 
-from homeassistant.components.switch import SwitchDevice
+from homeassistant.components.switch import DOMAIN, SwitchDevice
 from homeassistant.const import ATTR_TEMPERATURE, ENERGY_KILO_WATT_HOUR, TEMP_CELSIUS
 
 from .const import (
@@ -17,6 +17,8 @@
 
 ATTR_TEMPERATURE_UNIT = "temperature_unit"
 
+entities = set()
+
 
 async def async_setup_platform(
     hass, config, add_entities, discovery_info=None
@@ -33,8 +35,9 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     for fritz in fritz_list:
         device_list = fritz.get_devices()
         for device in device_list:
-            if device.has_switch:
+            if device.has_switch and device.ain not in entities:
                 devices.append(FritzboxSwitch(device, fritz))
+                entities.add(device.ain)
 
     async_add_entities(devices)
 
@@ -52,7 +55,7 @@ def device_info(self):
         """Return device specific attributes."""
         return {
             "name": self.name,
-            "identifiers": {(FRITZBOX_DOMAIN, self.unique_id)},
+            "identifiers": {(FRITZBOX_DOMAIN, self._device.ain)},
             "manufacturer": self._device.manufacturer,
             "model": self._device.productname,
             "sw_version": self._device.fw_version,
@@ -61,7 +64,7 @@ def device_info(self):
     @property
     def unique_id(self):
         """Return the unique ID of the device."""
-        return self._device.ain
+        return f"{self._device.ain}-{DOMAIN}"
 
     @property
     def available(self):