Merge pull request #142 from plugwise/fix_sm_thermostat

Fix/remove single_master_thermostat

Author: bouwew

plugwise/smile.py

@@ -71,14 +71,11 @@ def _all_device_data(self) -> None:
 
             self.gw_devices[device_id] = device
 
-        self.gw_data["active_device"] = self._opentherm_device or self._on_off_device
-        self.gw_data["cooling_present"] = self._cooling_present
-        self.gw_data["gateway_id"] = self.gateway_id
-        self.gw_data["heater_id"] = self._heater_id
-        self.gw_data["single_master_thermostat"] = (
-            self._is_thermostat and not self._multi_thermostats
-        )
         self.gw_data["smile_name"] = self.smile_name
+        self.gw_data["gateway_id"] = self.gateway_id
+        if self._is_thermostat:
+            self.gw_data["heater_id"] = self._heater_id
+            self.gw_data["cooling_present"] = self._cooling_present
 
     def get_all_devices(self) -> None:
         """Determine the devices present from the obtained XML-data."""

tests/test_smile.py

@@ -388,8 +388,8 @@ async def device_test(self, smile=pw_smile.Smile, testdata=None, preset=False):
         extra = data[0]
         device_list = data[1]
 
-        self.active_device_present = extra["active_device"]
-        self.cooling_present = extra["cooling_present"]
+        if "heater_id" in extra:
+            self.cooling_present = extra["cooling_present"]
         self.notifications = extra["notifications"]
         self._write_json("all_data", data)
         self._write_json("notifications", extra["notifications"])
@@ -650,10 +650,7 @@ async def test_connect_legacy_anna(self):
         assert smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert not smile._multi_thermostats
-        assert self.active_device_present
         assert not self.notifications
 
         await self.tinker_thermostat(
@@ -750,10 +747,7 @@ async def test_connect_legacy_anna_2(self):
         assert smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert not smile._multi_thermostats
-        assert self.active_device_present
         assert not self.notifications
 
         await self.tinker_thermostat(
@@ -823,9 +817,6 @@ async def test_connect_smile_p1_v2(self):
         assert smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert no master thermostat")
-        # it's not a thermostat :)
-        assert not smile._is_thermostat
         assert not self.notifications
 
         await smile.close_connection()
@@ -861,9 +852,6 @@ async def test_connect_smile_p1_v2_2(self):
         assert smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert no master thermostat")
-        # it's not a thermostat :)
-        assert not smile._is_thermostat
         assert not self.notifications
 
         await smile.close_connection()
@@ -946,10 +934,7 @@ async def test_connect_anna_v4(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert not smile._multi_thermostats
-        assert self.active_device_present
         assert not self.notifications
 
         await self.tinker_thermostat(
@@ -992,8 +977,6 @@ async def test_connect_anna_v4_no_tag(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert not smile._multi_thermostats
 
         await self.tinker_thermostat(
@@ -1044,10 +1027,7 @@ async def test_connect_anna_without_boiler_fw3(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert not smile._multi_thermostats
-        assert self.active_device_present
         assert not self.notifications
 
         await self.tinker_thermostat(
@@ -1094,10 +1074,7 @@ async def test_connect_anna_without_boiler_fw4(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert not smile._multi_thermostats
-        assert self.active_device_present
         assert not self.notifications
 
         await self.tinker_thermostat(
@@ -1186,10 +1163,7 @@ async def test_connect_anna_without_boiler_fw42(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert not smile._multi_thermostats
-        assert self.active_device_present
         assert not self.notifications
 
         await self.tinker_thermostat(
@@ -1252,10 +1226,7 @@ async def test_connect_adam_plus_anna(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert not smile._multi_thermostats
-        assert self.active_device_present
         assert not self.notifications
 
         await self.tinker_thermostat(
@@ -1454,10 +1425,7 @@ async def test_connect_adam_plus_anna_new(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert smile._multi_thermostats
-        assert self.active_device_present
 
         switch_change = await self.tinker_switch(
             smile,
@@ -1601,10 +1569,7 @@ async def test_connect_adam_zone_per_device(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert smile._multi_thermostats
-        assert self.active_device_present
 
         assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
         await smile.delete_notification()
@@ -2008,10 +1973,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert smile._multi_thermostats
-        assert self.active_device_present
 
         assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
 
@@ -2109,9 +2071,6 @@ async def test_connect_p1v3(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        # it's not a thermostat :)
-        assert not smile._is_thermostat
-        assert not self.cooling_present
         assert not self.notifications
 
         await smile.close_connection()
@@ -2145,9 +2104,6 @@ async def test_connect_p1v3solarfake(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert nomaster thermostat")
-        # it's not a thermostat :)
-        assert not smile._is_thermostat
         assert not self.notifications
 
         await smile.close_connection()
@@ -2199,9 +2155,6 @@ async def test_connect_p1v3_full_option(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert no master thermostat")
-        # it's not a thermostat :)
-        assert not smile._is_thermostat
         assert not self.notifications
 
         await smile.close_connection()
@@ -2255,10 +2208,7 @@ async def test_connect_anna_heatpump(self):
 
         # Preset cooling_active to True, will turn to False due to the lowered outdoor temp
         await self.device_test(smile, testdata, True)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert not smile._multi_thermostats
-        assert self.active_device_present
         assert self.cooling_present
         assert not self.notifications
 
@@ -2312,10 +2262,7 @@ async def test_connect_anna_heatpump_cooling(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert not smile._multi_thermostats
-        assert self.active_device_present
         assert self.cooling_present
         assert not self.notifications
 
@@ -2345,8 +2292,6 @@ async def test_connect_adam_plus_anna_copy_with_error_domain_added(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata, True)
-        _LOGGER.info(" # Assert master thermostat")
-        assert smile._is_thermostat
         assert not smile._multi_thermostats
 
         assert "3d28a20e17cb47dca210a132463721d5" in self.notifications
@@ -2495,9 +2440,6 @@ async def test_connect_stretch_v31(self):
         assert smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert no master thermostat")
-        # it's not a thermostat :)
-        assert not smile._is_thermostat
 
         await smile.close_connection()
         await self.disconnect(server, client)
@@ -2775,9 +2717,6 @@ async def test_connect_stretch_v23(self):
         assert smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert no master thermostat")
-        # it's not a thermostat :)
-        assert not smile._is_thermostat
 
         switch_change = await self.tinker_switch(
             smile, "2587a7fcdd7e482dab03fda256076b4b"
@@ -2825,8 +2764,6 @@ async def test_connect_stretch_v27_no_domain(self):
 
         await self.device_test(smile, testdata)
         _LOGGER.info(" # Assert no master thermostat")
-        # it's not a thermostat :)
-        assert not smile._is_thermostat
 
         switch_change = await self.tinker_switch(
             smile, "8b8d14b242e24cd789743c828b9a2ea9"
@@ -2880,9 +2817,6 @@ async def test_connect_p1v4(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        _LOGGER.info(" # Assert no master thermostat")
-        # it's not a thermostat :)
-        assert not smile._is_thermostat
         assert not self.notifications
 
         await smile.close_connection()