Simplify availability collection

Author: bouwew

plugwise/common.py

@@ -101,6 +101,7 @@ def _appl_thermostat_info(self, appl: Munch, xml_1: etree, xml_2: etree = None)
             appl.model_id = appl.model
             appl.model = check_model(appl.model, appl.vendor_name)
 
+        appl.available = module_data["reachable"]
         appl.hardware = module_data["hardware_version"]
         appl.firmware = module_data["firmware_version"]
         appl.zigbee_mac = module_data["zigbee_mac_address"]
@@ -190,6 +191,7 @@ def _create_gw_devices(self, appl: Munch) -> None:
         self.gw_devices[appl.dev_id] = {"dev_class": appl.pwclass}
         self._count += 1
         for key, value in {
+            "available": appl.available,
             "firmware": appl.firmware,
             "hardware": appl.hardware,
             "location": appl.location,

plugwise/helper.py

@@ -300,6 +300,7 @@ def _all_appliances(self) -> None:
             if appl.pwclass in THERMOSTAT_CLASSES and appl.location is None:
                 continue
 
+            appl.available = None
             appl.dev_id = appliance.attrib["id"]
             appl.name = appliance.find("name").text
             appl.model = None
@@ -402,6 +403,7 @@ def _appliance_info_finder(self, appl: Munch, appliance: etree) -> Munch:
                 if not module_data["contents"]:
                     return Munch()
 
+                appl.available = module_data["reachable"]
                 appl.firmware = module_data["firmware_version"]
                 appl.hardware = module_data["hardware_version"]
                 appl.model_id = module_data["vendor_model"]
@@ -514,9 +516,6 @@ def _get_measurement_data(self, dev_id: str) -> DeviceData:
             if appliance.find("type").text in ACTUATOR_CLASSES:
                 self._get_actuator_functionalities(appliance, device, data)
 
-            # Collect availability-status for wireless connected devices to Adam
-            self._wireless_availability(appliance, data)
-
         if dev_id == self.gateway_id and self.smile(ADAM):
             self._get_regulation_mode(appliance, data)
             self._get_gateway_mode(appliance, data)
@@ -709,22 +708,6 @@ def _get_actuator_functionalities(
                 act_item = cast(ActuatorType, item)
                 data[act_item] = temp_dict
 
-    def _wireless_availability(self, appliance: etree, data: DeviceData) -> None:
-        """Helper-function for _get_measurement_data().
-
-        Collect the availability-status for wireless connected devices.
-        """
-        if self.smile(ADAM):
-            locator = MODULE_LOCATOR
-            module_data = self._get_module_data(appliance, locator)
-            if not module_data["contents"]:
-                LOGGER.error("No module data found for Plug or wireless thermostat")  # pragma: no cover
-                return None  # pragma: no cover
-
-            if module_data["reachable"] is not None:
-                data["available"] = module_data["reachable"]
-                self._count += 1
-
     def _get_regulation_mode(self, appliance: etree, data: DeviceData) -> None:
         """Helper-function for _get_measurement_data().
 

plugwise/legacy/helper.py

@@ -125,6 +125,7 @@ def _all_appliances(self) -> None:
                 appl.pwclass = "heater_central_plug"
 
             appl.model = appl.pwclass.replace("_", " ").title()
+            appl.available = None
             appl.model_id = None
             appl.firmware = None
             appl.hardware = None
@@ -251,6 +252,7 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch:
     def _p1_smartmeter_info_finder(self, appl: Munch) -> None:
         """Collect P1 DSMR Smartmeter info."""
         loc_id = next(iter(self.loc_data.keys()))
+        appl.available = None
         appl.dev_id = loc_id
         appl.location = loc_id
         appl.mac = None