jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-24 05:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace SW version by model ID in renault device info (#125399)

Browse Source 
* Replace SW_VERSION by MODEL_ID in renault device info

* Simplify PR

* Fix tests
This commit is contained in:
epenet 2024-09-06 11:45:13 +02:00 committed by GitHub
parent 1db68327f9
commit 84dcfb6ddc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/renault/renault_hub.py
View File

@ -16,8 +16,8 @@ from homeassistant.const import (
ATTR_IDENTIFIERS,
ATTR_MANUFACTURER,
ATTR_MODEL,
ATTR_MODEL_ID,
ATTR_NAME,
ATTR_SW_VERSION,
)
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady
@ -106,7 +106,7 @@ class RenaultHub:
manufacturer=vehicle.device_info[ATTR_MANUFACTURER],
name=vehicle.device_info[ATTR_NAME],
model=vehicle.device_info[ATTR_MODEL],
sw_version=vehicle.device_info[ATTR_SW_VERSION],
model_id=vehicle.device_info[ATTR_MODEL_ID],
)
self._vehicles[vehicle_link.vin] = vehicle

2
homeassistant/components/renault/renault_vehicle.py
View File

@ -76,8 +76,8 @@ class RenaultVehicleProxy:
identifiers={(DOMAIN, cast(str, details.vin))},
manufacturer=(details.get_brand_label() or "").capitalize(),
model=(details.get_model_label() or "").capitalize(),
model_id=(details.get_model_code() or ""),
name=details.registrationNumber or "",
sw_version=details.get_model_code() or "",
)
self.coordinators: dict[str, RenaultDataUpdateCoordinator] = {}
self.hvac_target_temperature = 21

4
tests/components/renault/__init__.py
View File

@ -10,9 +10,9 @@ from homeassistant.const import (
ATTR_IDENTIFIERS,
ATTR_MANUFACTURER,
ATTR_MODEL,
ATTR_MODEL_ID,
ATTR_NAME,
ATTR_STATE,
ATTR_SW_VERSION,
STATE_UNAVAILABLE,
)
from homeassistant.core import HomeAssistant
@ -46,7 +46,7 @@ def check_device_registry(
assert registry_entry.manufacturer == expected_device[ATTR_MANUFACTURER]
assert registry_entry.name == expected_device[ATTR_NAME]
assert registry_entry.model == expected_device[ATTR_MODEL]
assert registry_entry.sw_version == expected_device[ATTR_SW_VERSION]
assert registry_entry.model_id == expected_device[ATTR_MODEL_ID]
def check_entities(

10
tests/components/renault/const.py
View File

@ -19,9 +19,9 @@ from homeassistant.const import (
ATTR_IDENTIFIERS,
ATTR_MANUFACTURER,
ATTR_MODEL,
ATTR_MODEL_ID,
ATTR_NAME,
ATTR_STATE,
ATTR_SW_VERSION,
ATTR_UNIT_OF_MEASUREMENT,
CONF_PASSWORD,
CONF_USERNAME,
@ -74,7 +74,7 @@ MOCK_VEHICLES = {
ATTR_MANUFACTURER: "Renault",
ATTR_MODEL: "Zoe",
ATTR_NAME: "REG-NUMBER",
ATTR_SW_VERSION: "X101VE",
ATTR_MODEL_ID: "X101VE",
},
"endpoints": {
"battery_status": "battery_status_charging.json",
@ -269,7 +269,7 @@ MOCK_VEHICLES = {
ATTR_MANUFACTURER: "Renault",
ATTR_MODEL: "Zoe",
ATTR_NAME: "REG-NUMBER",
ATTR_SW_VERSION: "X102VE",
ATTR_MODEL_ID: "X102VE",
},
"endpoints": {
"battery_status": "battery_status_not_charging.json",
@ -517,7 +517,7 @@ MOCK_VEHICLES = {
ATTR_MANUFACTURER: "Renault",
ATTR_MODEL: "Captur ii",
ATTR_NAME: "REG-NUMBER",
ATTR_SW_VERSION: "XJB1SU",
ATTR_MODEL_ID: "XJB1SU",
},
"endpoints": {
"battery_status": "battery_status_charging.json",
@ -755,7 +755,7 @@ MOCK_VEHICLES = {
ATTR_MANUFACTURER: "Renault",
ATTR_MODEL: "Captur ii",
ATTR_NAME: "REG-NUMBER",
ATTR_SW_VERSION: "XJB1SU",
ATTR_MODEL_ID: "XJB1SU",
},
"endpoints": {
"cockpit": "cockpit_fuel.json",

32
tests/components/renault/snapshots/test_binary_sensor.ambr
View File

@ -22,13 +22,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -322,13 +322,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -708,13 +708,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X101VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X101VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -878,13 +878,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X102VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X102VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -1306,13 +1306,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -1606,13 +1606,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -1992,13 +1992,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X101VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X101VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -2162,13 +2162,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X102VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X102VE',
'sw_version': None,
'via_device_id': None,
}),
])

32
tests/components/renault/snapshots/test_button.ambr
View File

@ -22,13 +22,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -106,13 +106,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -274,13 +274,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X101VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X101VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -442,13 +442,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X102VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X102VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -610,13 +610,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -694,13 +694,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -862,13 +862,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X101VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X101VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -1030,13 +1030,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X102VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X102VE',
'sw_version': None,
'via_device_id': None,
}),
])

32
tests/components/renault/snapshots/test_device_tracker.ambr
View File

@ -22,13 +22,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -107,13 +107,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -192,13 +192,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X101VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X101VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -234,13 +234,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X102VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X102VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -319,13 +319,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -407,13 +407,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -495,13 +495,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X101VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X101VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -537,13 +537,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X102VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X102VE',
'sw_version': None,
'via_device_id': None,
}),
])

32
tests/components/renault/snapshots/test_select.ambr
View File

@ -22,13 +22,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -64,13 +64,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -161,13 +161,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X101VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X101VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -258,13 +258,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X102VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X102VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -355,13 +355,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -397,13 +397,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -494,13 +494,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X101VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X101VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -591,13 +591,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X102VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X102VE',
'sw_version': None,
'via_device_id': None,
}),
])

32
tests/components/renault/snapshots/test_sensor.ambr
View File

@ -22,13 +22,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -332,13 +332,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -1087,13 +1087,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X101VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X101VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -1838,13 +1838,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X102VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X102VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -2632,13 +2632,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -2942,13 +2942,13 @@
}),
'manufacturer': 'Renault',
'model': 'Captur ii',
'model_id': None,
'model_id': 'XJB1SU',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'XJB1SU',
'sw_version': None,
'via_device_id': None,
}),
])
@ -3697,13 +3697,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X101VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X101VE',
'sw_version': None,
'via_device_id': None,
}),
])
@ -4448,13 +4448,13 @@
}),
'manufacturer': 'Renault',
'model': 'Zoe',
'model_id': None,
'model_id': 'X102VE',
'name': 'REG-NUMBER',
'name_by_user': None,
'primary_config_entry': <ANY>,
'serial_number': None,
'suggested_area': None,
'sw_version': 'X102VE',
'sw_version': None,
'via_device_id': None,
}),
])

4
tests/components/renault/test_services.py
View File

@ -25,8 +25,8 @@ from homeassistant.const import (
ATTR_IDENTIFIERS,
ATTR_MANUFACTURER,
ATTR_MODEL,
ATTR_MODEL_ID,
ATTR_NAME,
ATTR_SW_VERSION,
)
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
@ -268,7 +268,7 @@ async def test_service_invalid_device_id2(
manufacturer=extra_vehicle[ATTR_MANUFACTURER],
name=extra_vehicle[ATTR_NAME],
model=extra_vehicle[ATTR_MODEL],
sw_version=extra_vehicle[ATTR_SW_VERSION],
model_id=extra_vehicle[ATTR_MODEL_ID],
)
device_id = device_registry.async_get_device(
identifiers=extra_vehicle[ATTR_IDENTIFIERS]