Merge pull request #345 from plugwise/correct_adam_jip

Correct Adam_jip userdate: fix use of non-unique device names

Author: bouwew

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Ongoing
 
 - Repair coverage/fix testing - #294
+- Correct non-unique device names in adam_jip userdata
 
 ## V0.31.6: Fix domestic_hot_water_setpoint-related bug for Anna + Elga
 

fixtures/adam_jip/all_data.json

@@ -36,7 +36,7 @@
       "hardware": "1",
       "location": "d58fec52899f4f1c92e4f8fad6d8c48c",
       "model": "Tom/Floor",
-      "name": "Logeerkamer",
+      "name": "Tom Logeerkamer",
       "sensors": {
         "setpoint": 13.0,
         "temperature": 28.8,
@@ -53,7 +53,7 @@
       "hardware": "1",
       "location": "06aecb3d00354375924f50c47af36bd2",
       "model": "Tom/Floor",
-      "name": "Slaapkamer",
+      "name": "Tom Slaapkamer",
       "sensors": {
         "setpoint": 13.0,
         "temperature": 24.3,
@@ -115,7 +115,7 @@
       "hardware": "1",
       "location": "13228dab8ce04617af318a2888b3c548",
       "model": "Tom/Floor",
-      "name": "Woonkamer",
+      "name": "Tom Woonkamer",
       "sensors": {
         "setpoint": 9.0,
         "temperature": 24.0,
@@ -180,7 +180,7 @@
       "hardware": "1",
       "location": "d27aede973b54be484f6842d1b2802ad",
       "model": "Tom/Floor",
-      "name": "Kinderkamer",
+      "name": "Tom Kinderkamer",
       "sensors": {
         "setpoint": 13.0,
         "temperature": 28.7,

tests/test_smile.py

@@ -3354,7 +3354,7 @@ async def test_adam_plus_jip(self):
                 "hardware": "1",
                 "location": "13228dab8ce04617af318a2888b3c548",
                 "model": "Tom/Floor",
-                "name": "Woonkamer",
+                "name": "Tom Woonkamer",
                 "zigbee_mac_address": "ABCD012345670A09",
                 "vendor": "Plugwise",
                 "available": True,
@@ -3426,7 +3426,7 @@ async def test_adam_plus_jip(self):
                 "hardware": "1",
                 "location": "d27aede973b54be484f6842d1b2802ad",
                 "model": "Tom/Floor",
-                "name": "Kinderkamer",
+                "name": "Tom Kinderkamer",
                 "zigbee_mac_address": "ABCD012345670A04",
                 "vendor": "Plugwise",
                 "available": True,
@@ -3443,7 +3443,7 @@ async def test_adam_plus_jip(self):
                 "hardware": "1",
                 "location": "06aecb3d00354375924f50c47af36bd2",
                 "model": "Tom/Floor",
-                "name": "Slaapkamer",
+                "name": "Tom Slaapkamer",
                 "zigbee_mac_address": "ABCD012345670A05",
                 "vendor": "Plugwise",
                 "available": True,
@@ -3475,7 +3475,7 @@ async def test_adam_plus_jip(self):
                 "hardware": "1",
                 "location": "d58fec52899f4f1c92e4f8fad6d8c48c",
                 "model": "Tom/Floor",
-                "name": "Logeerkamer",
+                "name": "Tom Logeerkamer",
                 "zigbee_mac_address": "ABCD012345670A07",
                 "vendor": "Plugwise",
                 "available": True,

userdata/adam_jip/core.appliances.xml

@@ -596,7 +596,7 @@
 		</actuator_functionalities>
 	</appliance>
 	<appliance id='833de10f269c4deab58fb9df69901b4e'>
-		<name>Woonkamer</name>
+		<name>Tom Woonkamer</name>
 		<description>A thermostatic radiator valve allows hot water to be pumped into its radiator based on ambient temperature and the local temperature setpoint.</description>
 		<type>thermostatic_radiator_valve</type>
 		<created_date>2021-03-28T18:03:01.125+02:00</created_date>
@@ -885,7 +885,7 @@
 		</actuator_functionalities>
 	</appliance>
 	<appliance id='d4496250d0e942cfa7aea3476e9070d5'>
-		<name>Kinderkamer</name>
+		<name>Tom Kinderkamer</name>
 		<description>A thermostatic radiator valve allows hot water to be pumped into its radiator based on ambient temperature and the local temperature setpoint.</description>
 		<type>thermostatic_radiator_valve</type>
 		<created_date>2021-01-16T18:54:43.437+01:00</created_date>
@@ -981,7 +981,7 @@
 		</actuator_functionalities>
 	</appliance>
 	<appliance id='356b65335e274d769c338223e7af9c33'>
-		<name>Slaapkamer</name>
+		<name>Tom Slaapkamer</name>
 		<description>A thermostatic radiator valve allows hot water to be pumped into its radiator based on ambient temperature and the local temperature setpoint.</description>
 		<type>thermostatic_radiator_valve</type>
 		<created_date>2021-01-16T14:06:34.242+01:00</created_date>
@@ -1202,7 +1202,7 @@
 		</actuator_functionalities>
 	</appliance>
 	<appliance id='1da4d325838e4ad8aac12177214505c9'>
-		<name>Logeerkamer</name>
+		<name>Tom Logeerkamer</name>
 		<description>A thermostatic radiator valve allows hot water to be pumped into its radiator based on ambient temperature and the local temperature setpoint.</description>
 		<type>thermostatic_radiator_valve</type>
 		<created_date>2021-01-16T15:56:14.990+01:00</created_date>

userdata/adam_jip/core.domain_objects.xml

@@ -920,7 +920,7 @@
 		</actuator_functionalities>
 	</location>
 	<appliance id='d4496250d0e942cfa7aea3476e9070d5'>
-		<name>Kinderkamer</name>
+		<name>Tom Kinderkamer</name>
 		<description>A thermostatic radiator valve allows hot water to be pumped into its radiator based on ambient temperature and the local temperature setpoint.</description>
 		<type>thermostatic_radiator_valve</type>
 		<created_date>2021-01-16T18:54:43.437+01:00</created_date>
@@ -1090,7 +1090,7 @@
 		</actuator_functionalities>
 	</appliance>
 	<appliance id='833de10f269c4deab58fb9df69901b4e'>
-		<name>Woonkamer</name>
+		<name>Tom Woonkamer</name>
 		<description>A thermostatic radiator valve allows hot water to be pumped into its radiator based on ambient temperature and the local temperature setpoint.</description>
 		<type>thermostatic_radiator_valve</type>
 		<created_date>2021-03-28T18:03:01.125+02:00</created_date>
@@ -1204,7 +1204,7 @@
 		</contexts>
 	</rule>
 	<appliance id='356b65335e274d769c338223e7af9c33'>
-		<name>Slaapkamer</name>
+		<name>Tom Slaapkamer</name>
 		<description>A thermostatic radiator valve allows hot water to be pumped into its radiator based on ambient temperature and the local temperature setpoint.</description>
 		<type>thermostatic_radiator_valve</type>
 		<created_date>2021-01-16T14:06:34.242+01:00</created_date>
@@ -2489,7 +2489,7 @@
 		</features>
 	</gateway>
 	<appliance id='1da4d325838e4ad8aac12177214505c9'>
-		<name>Logeerkamer</name>
+		<name>Tom Logeerkamer</name>
 		<description>A thermostatic radiator valve allows hot water to be pumped into its radiator based on ambient temperature and the local temperature setpoint.</description>
 		<type>thermostatic_radiator_valve</type>
 		<created_date>2021-01-16T15:56:14.990+01:00</created_date>