Merge pull request #377 from plugwise/p1v4_442_triple-notify

Add Plugwise-notification to test-fixture used in Core/PW-beta

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Ongoing
+
+- Extend p1v4_442_triple userdata to include a Plugwise notification, extending the related fixture which is used in PW-beta and Core Plugwise.
+
 ## v0.32.1 Improve typing, bugfix
 
 - Integrate the process of creating binary_sensors, sensors, and switches dicts. Should make typing simpler.

fixtures/p1v4_442_triple/all_data.json

@@ -2,7 +2,7 @@
   "devices": {
     "03e65b16e4b247a29ae0d75a78cb492e": {
       "binary_sensors": {
-        "plugwise_notification": false
+        "plugwise_notification": true
       },
       "dev_class": "gateway",
       "firmware": "4.4.2",
@@ -14,7 +14,7 @@
       "vendor": "Plugwise"
     },
     "b82b6b3322484f2ea4e25e0bd5f3d61f": {
-      "available": true,
+      "available": false,
       "dev_class": "smartmeter",
       "location": "03e65b16e4b247a29ae0d75a78cb492e",
       "model": "XMX5LGF0010453051839",
@@ -51,7 +51,11 @@
   },
   "gateway": {
     "gateway_id": "03e65b16e4b247a29ae0d75a78cb492e",
-    "notifications": {},
+    "notifications": {
+      "97a04c0c263049b29350a660b4cdd01e": {
+        "warning": "The Smile P1 does not seem to be connected to a smart meter."
+      }
+    },
     "smile_name": "Smile P1"
   }
 }

fixtures/p1v4_442_triple/notifications.json

@@ -1 +1,5 @@
-{}
+{
+  "97a04c0c263049b29350a660b4cdd01e": {
+    "warning": "The Smile P1 does not seem to be connected to a smart meter."
+  }
+}

tests/test_smile.py

@@ -5190,15 +5190,15 @@ async def test_connect_p1v4_442_triple(self):
                 "model": "Gateway",
                 "name": "Smile P1",
                 "vendor": "Plugwise",
-                "binary_sensors": {"plugwise_notification": False},
+                "binary_sensors": {"plugwise_notification": True},
             },
             "b82b6b3322484f2ea4e25e0bd5f3d61f": {
                 "dev_class": "smartmeter",
                 "location": "03e65b16e4b247a29ae0d75a78cb492e",
                 "model": "XMX5LGF0010453051839",
                 "name": "P1",
                 "vendor": "XEMEX NV",
-                "available": True,
+                "available": False,
                 "sensors": {
                     "net_electricity_point": 5553,
                     "electricity_consumed_peak_point": 0,
@@ -5244,7 +5244,7 @@ async def test_connect_p1v4_442_triple(self):
         await self.device_test(smile, testdata)
         assert smile.gateway_id == "03e65b16e4b247a29ae0d75a78cb492e"
         assert self.device_items == 40
-        assert not self.notifications
+        assert self.notifications
 
         await smile.close_connection()
         await self.disconnect(server, client)

userdata/p1v4_442_triple/core.domain_objects.xml

@@ -432,6 +432,18 @@
 			</dsmr_gas>
 		</protocols>
 	</module>
+	<notification id='97a04c0c263049b29350a660b4cdd01e'>
+		<type>warning</type>
+		<origin>local</origin>
+		<title>Smart meter not found.</title>
+		<message>The Smile P1 does not seem to be connected to a smart meter.</message>
+		<valid_from></valid_from>
+		<valid_to></valid_to>
+		<read_date>2020-01-23T10:54:59.710+01:00</read_date>
+		<created_date>2020-01-18T23:03:43.689+01:00</created_date>
+		<modified_date>2020-01-18T23:03:43.749+01:00</modified_date>
+		<deleted_date></deleted_date>
+	</notification>
 	<module id='b0ea732032ce4656a5c409ca3903c1a2'>
 		<vendor_name>Plugwise</vendor_name>
 		<vendor_model>Gateway</vendor_model>