Separate BMW base entity into separate file (#120830)

* Refactor BMW base entity

* Update snapshots

* Changes from review

homeassistant/components/bmw_connected_drive/__init__.py

@@ -4,9 +4,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 import logging
-from typing import Any
 
-from bimmer_connected.vehicle import MyBMWVehicle
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
@@ -18,10 +16,8 @@ from homeassistant.helpers import (
     entity_registry as er,
 )
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import ATTR_VIN, ATTRIBUTION, CONF_READ_ONLY, DOMAIN
+from .const import ATTR_VIN, CONF_READ_ONLY, DOMAIN
 from .coordinator import BMWDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
@@ -175,37 +171,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return await hass.config_entries.async_unload_platforms(
         entry, [platform for platform in PLATFORMS if platform != Platform.NOTIFY]
     )
-
-
-class BMWBaseEntity(CoordinatorEntity[BMWDataUpdateCoordinator]):
-    """Common base for BMW entities."""
-
-    coordinator: BMWDataUpdateCoordinator
-    _attr_attribution = ATTRIBUTION
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: BMWDataUpdateCoordinator,
-        vehicle: MyBMWVehicle,
-    ) -> None:
-        """Initialize entity."""
-        super().__init__(coordinator)
-
-        self.vehicle = vehicle
-
-        self._attrs: dict[str, Any] = {
-            "car": self.vehicle.name,
-            "vin": self.vehicle.vin,
-        }
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self.vehicle.vin)},
-            manufacturer=vehicle.brand.name,
-            model=vehicle.name,
-            name=vehicle.name,
-        )
-
-    async def async_added_to_hass(self) -> None:
-        """When entity is added to hass."""
-        await super().async_added_to_hass()
-        self._handle_coordinator_update()

homeassistant/components/bmw_connected_drive/binary_sensor.py

@@ -21,9 +21,10 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.unit_system import UnitSystem
 
-from . import BMWBaseEntity, BMWConfigEntry
+from . import BMWConfigEntry
 from .const import UNIT_MAP
 from .coordinator import BMWDataUpdateCoordinator
+from .entity import BMWBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -240,9 +241,8 @@ class BMWBinarySensor(BMWBaseEntity, BinarySensorEntity):
         self._attr_is_on = self.entity_description.value_fn(self.vehicle)
 
         if self.entity_description.attr_fn:
-            self._attr_extra_state_attributes = dict(
+            self._attr_extra_state_attributes = self.entity_description.attr_fn(
-                self._attrs,
+                self.vehicle, self._unit_system
-                **self.entity_description.attr_fn(self.vehicle, self._unit_system),
             )
 
         super()._handle_coordinator_update()

homeassistant/components/bmw_connected_drive/button.py

@@ -16,7 +16,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BMWBaseEntity, BMWConfigEntry
+from . import BMWConfigEntry
+from .entity import BMWBaseEntity
 
 if TYPE_CHECKING:
     from .coordinator import BMWDataUpdateCoordinator

homeassistant/components/bmw_connected_drive/const.py

@@ -3,7 +3,6 @@
 from homeassistant.const import UnitOfLength, UnitOfVolume
 
 DOMAIN = "bmw_connected_drive"
-ATTRIBUTION = "Data provided by MyBMW"
 
 ATTR_DIRECTION = "direction"
 ATTR_VIN = "vin"

homeassistant/components/bmw_connected_drive/device_tracker.py

@@ -11,9 +11,10 @@ from homeassistant.components.device_tracker import SourceType, TrackerEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BMWBaseEntity, BMWConfigEntry
+from . import BMWConfigEntry
 from .const import ATTR_DIRECTION
 from .coordinator import BMWDataUpdateCoordinator
+from .entity import BMWBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -62,7 +63,7 @@ class BMWDeviceTracker(BMWBaseEntity, TrackerEntity):
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return entity specific state attributes."""
-        return {**self._attrs, ATTR_DIRECTION: self.vehicle.vehicle_location.heading}
+        return {ATTR_DIRECTION: self.vehicle.vehicle_location.heading}
 
     @property
     def latitude(self) -> float | None:

homeassistant/components/bmw_connected_drive/entity.py

@@ -0,0 +1,40 @@
+"""Base for all BMW entities."""
+
+from __future__ import annotations
+
+from bimmer_connected.vehicle import MyBMWVehicle
+
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import BMWDataUpdateCoordinator
+
+
+class BMWBaseEntity(CoordinatorEntity[BMWDataUpdateCoordinator]):
+    """Common base for BMW entities."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: BMWDataUpdateCoordinator,
+        vehicle: MyBMWVehicle,
+    ) -> None:
+        """Initialize entity."""
+        super().__init__(coordinator)
+
+        self.vehicle = vehicle
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, vehicle.vin)},
+            manufacturer=vehicle.brand.name,
+            model=vehicle.name,
+            name=vehicle.name,
+            serial_number=vehicle.vin,
+        )
+
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to hass."""
+        await super().async_added_to_hass()
+        self._handle_coordinator_update()

homeassistant/components/bmw_connected_drive/lock.py

@@ -14,8 +14,9 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BMWBaseEntity, BMWConfigEntry
+from . import BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
+from .entity import BMWBaseEntity
 
 DOOR_LOCK_STATE = "door_lock_state"
 _LOGGER = logging.getLogger(__name__)
@@ -95,8 +96,6 @@ class BMWLock(BMWBaseEntity, LockEntity):
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
         _LOGGER.debug("Updating lock data of %s", self.vehicle.name)
-        # Set default attributes
-        self._attr_extra_state_attributes = self._attrs
 
         # Only update the HA state machine if the vehicle reliably reports its lock state
         if self.door_lock_state_available:
@@ -104,8 +103,8 @@ class BMWLock(BMWBaseEntity, LockEntity):
                 LockState.LOCKED,
                 LockState.SECURED,
             }
-            self._attr_extra_state_attributes["door_lock_state"] = (
+            self._attr_extra_state_attributes = {
-                self.vehicle.doors_and_windows.door_lock_state.value
+                DOOR_LOCK_STATE: self.vehicle.doors_and_windows.door_lock_state.value
-            )
+            }
 
         super()._handle_coordinator_update()

homeassistant/components/bmw_connected_drive/number.py

@@ -18,8 +18,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BMWBaseEntity, BMWConfigEntry
+from . import BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
+from .entity import BMWBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/bmw_connected_drive/select.py

@@ -15,8 +15,9 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BMWBaseEntity, BMWConfigEntry
+from . import BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
+from .entity import BMWBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/bmw_connected_drive/sensor.py

@@ -29,8 +29,9 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-from . import BMWBaseEntity, BMWConfigEntry
+from . import BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
+from .entity import BMWBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/bmw_connected_drive/switch.py

@@ -14,8 +14,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BMWBaseEntity, BMWConfigEntry
+from . import BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
+from .entity import BMWBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
 

tests/components/bmw_connected_drive/snapshots/test_binary_sensor.ambr

@@ -35,7 +35,6 @@
 # name: test_entity_state_attrs[binary_sensor.i3_rex_charging_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'battery_charging',
       'friendly_name': 'i3 (+ REX) Charging status',
     }),
@@ -83,11 +82,8 @@
 # name: test_entity_state_attrs[binary_sensor.i3_rex_check_control_messages-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'i3 (+ REX)',
       'device_class': 'problem',
       'friendly_name': 'i3 (+ REX) Check control messages',
-      'vin': 'WBY00000000REXI01',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.i3_rex_check_control_messages',
@@ -133,17 +129,14 @@
 # name: test_entity_state_attrs[binary_sensor.i3_rex_condition_based_services-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'brake_fluid': 'OK',
       'brake_fluid_date': '2022-10-01',
-      'car': 'i3 (+ REX)',
       'device_class': 'problem',
       'friendly_name': 'i3 (+ REX) Condition based services',
       'vehicle_check': 'OK',
       'vehicle_check_date': '2023-05-01',
       'vehicle_tuv': 'OK',
       'vehicle_tuv_date': '2023-05-01',
-      'vin': 'WBY00000000REXI01',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.i3_rex_condition_based_services',
@@ -189,7 +182,6 @@
 # name: test_entity_state_attrs[binary_sensor.i3_rex_connection_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'plug',
       'friendly_name': 'i3 (+ REX) Connection status',
     }),
@@ -237,12 +229,9 @@
 # name: test_entity_state_attrs[binary_sensor.i3_rex_door_lock_state-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'i3 (+ REX)',
       'device_class': 'lock',
       'door_lock_state': 'UNLOCKED',
       'friendly_name': 'i3 (+ REX) Door lock state',
-      'vin': 'WBY00000000REXI01',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.i3_rex_door_lock_state',
@@ -288,8 +277,6 @@
 # name: test_entity_state_attrs[binary_sensor.i3_rex_lids-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'i3 (+ REX)',
       'device_class': 'opening',
       'friendly_name': 'i3 (+ REX) Lids',
       'hood': 'CLOSED',
@@ -299,7 +286,6 @@
       'rightRear': 'CLOSED',
       'sunRoof': 'CLOSED',
       'trunk': 'CLOSED',
-      'vin': 'WBY00000000REXI01',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.i3_rex_lids',
@@ -345,7 +331,6 @@
 # name: test_entity_state_attrs[binary_sensor.i3_rex_pre_entry_climatization-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i3 (+ REX) Pre entry climatization',
     }),
     'context': <ANY>,
@@ -392,13 +377,10 @@
 # name: test_entity_state_attrs[binary_sensor.i3_rex_windows-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'i3 (+ REX)',
       'device_class': 'opening',
       'friendly_name': 'i3 (+ REX) Windows',
       'leftFront': 'CLOSED',
       'rightFront': 'CLOSED',
-      'vin': 'WBY00000000REXI01',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.i3_rex_windows',
@@ -444,7 +426,6 @@
 # name: test_entity_state_attrs[binary_sensor.i4_edrive40_charging_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'battery_charging',
       'friendly_name': 'i4 eDrive40 Charging status',
     }),
@@ -492,12 +473,9 @@
 # name: test_entity_state_attrs[binary_sensor.i4_edrive40_check_control_messages-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'i4 eDrive40',
       'device_class': 'problem',
       'friendly_name': 'i4 eDrive40 Check control messages',
       'tire_pressure': 'LOW',
-      'vin': 'WBA00000000DEMO02',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.i4_edrive40_check_control_messages',
@@ -543,11 +521,9 @@
 # name: test_entity_state_attrs[binary_sensor.i4_edrive40_condition_based_services-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'brake_fluid': 'OK',
       'brake_fluid_date': '2024-12-01',
       'brake_fluid_distance': '50000 km',
-      'car': 'i4 eDrive40',
       'device_class': 'problem',
       'friendly_name': 'i4 eDrive40 Condition based services',
       'tire_wear_front': 'OK',
@@ -558,7 +534,6 @@
       'vehicle_tuv': 'OK',
       'vehicle_tuv_date': '2024-12-01',
       'vehicle_tuv_distance': '50000 km',
-      'vin': 'WBA00000000DEMO02',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.i4_edrive40_condition_based_services',
@@ -604,7 +579,6 @@
 # name: test_entity_state_attrs[binary_sensor.i4_edrive40_connection_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'plug',
       'friendly_name': 'i4 eDrive40 Connection status',
     }),
@@ -652,12 +626,9 @@
 # name: test_entity_state_attrs[binary_sensor.i4_edrive40_door_lock_state-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'i4 eDrive40',
       'device_class': 'lock',
       'door_lock_state': 'LOCKED',
       'friendly_name': 'i4 eDrive40 Door lock state',
-      'vin': 'WBA00000000DEMO02',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.i4_edrive40_door_lock_state',
@@ -703,8 +674,6 @@
 # name: test_entity_state_attrs[binary_sensor.i4_edrive40_lids-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'i4 eDrive40',
       'device_class': 'opening',
       'friendly_name': 'i4 eDrive40 Lids',
       'hood': 'CLOSED',
@@ -713,7 +682,6 @@
       'rightFront': 'CLOSED',
       'rightRear': 'CLOSED',
       'trunk': 'CLOSED',
-      'vin': 'WBA00000000DEMO02',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.i4_edrive40_lids',
@@ -759,7 +727,6 @@
 # name: test_entity_state_attrs[binary_sensor.i4_edrive40_pre_entry_climatization-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i4 eDrive40 Pre entry climatization',
     }),
     'context': <ANY>,
@@ -806,8 +773,6 @@
 # name: test_entity_state_attrs[binary_sensor.i4_edrive40_windows-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'i4 eDrive40',
       'device_class': 'opening',
       'friendly_name': 'i4 eDrive40 Windows',
       'leftFront': 'CLOSED',
@@ -815,7 +780,6 @@
       'rear': 'CLOSED',
       'rightFront': 'CLOSED',
       'rightRear': 'CLOSED',
-      'vin': 'WBA00000000DEMO02',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.i4_edrive40_windows',
@@ -861,7 +825,6 @@
 # name: test_entity_state_attrs[binary_sensor.ix_xdrive50_charging_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'battery_charging',
       'friendly_name': 'iX xDrive50 Charging status',
     }),
@@ -909,12 +872,9 @@
 # name: test_entity_state_attrs[binary_sensor.ix_xdrive50_check_control_messages-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'iX xDrive50',
       'device_class': 'problem',
       'friendly_name': 'iX xDrive50 Check control messages',
       'tire_pressure': 'LOW',
-      'vin': 'WBA00000000DEMO01',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.ix_xdrive50_check_control_messages',
@@ -960,11 +920,9 @@
 # name: test_entity_state_attrs[binary_sensor.ix_xdrive50_condition_based_services-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'brake_fluid': 'OK',
       'brake_fluid_date': '2024-12-01',
       'brake_fluid_distance': '50000 km',
-      'car': 'iX xDrive50',
       'device_class': 'problem',
       'friendly_name': 'iX xDrive50 Condition based services',
       'tire_wear_front': 'OK',
@@ -975,7 +933,6 @@
       'vehicle_tuv': 'OK',
       'vehicle_tuv_date': '2024-12-01',
       'vehicle_tuv_distance': '50000 km',
-      'vin': 'WBA00000000DEMO01',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.ix_xdrive50_condition_based_services',
@@ -1021,7 +978,6 @@
 # name: test_entity_state_attrs[binary_sensor.ix_xdrive50_connection_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'plug',
       'friendly_name': 'iX xDrive50 Connection status',
     }),
@@ -1069,12 +1025,9 @@
 # name: test_entity_state_attrs[binary_sensor.ix_xdrive50_door_lock_state-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'iX xDrive50',
       'device_class': 'lock',
       'door_lock_state': 'LOCKED',
       'friendly_name': 'iX xDrive50 Door lock state',
-      'vin': 'WBA00000000DEMO01',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.ix_xdrive50_door_lock_state',
@@ -1120,8 +1073,6 @@
 # name: test_entity_state_attrs[binary_sensor.ix_xdrive50_lids-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'iX xDrive50',
       'device_class': 'opening',
       'friendly_name': 'iX xDrive50 Lids',
       'hood': 'CLOSED',
@@ -1131,7 +1082,6 @@
       'rightRear': 'CLOSED',
       'sunRoof': 'CLOSED',
       'trunk': 'CLOSED',
-      'vin': 'WBA00000000DEMO01',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.ix_xdrive50_lids',
@@ -1177,7 +1127,6 @@
 # name: test_entity_state_attrs[binary_sensor.ix_xdrive50_pre_entry_climatization-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'iX xDrive50 Pre entry climatization',
     }),
     'context': <ANY>,
@@ -1224,8 +1173,6 @@
 # name: test_entity_state_attrs[binary_sensor.ix_xdrive50_windows-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'iX xDrive50',
       'device_class': 'opening',
       'friendly_name': 'iX xDrive50 Windows',
       'leftFront': 'CLOSED',
@@ -1233,7 +1180,6 @@
       'rear': 'CLOSED',
       'rightFront': 'CLOSED',
       'rightRear': 'CLOSED',
-      'vin': 'WBA00000000DEMO01',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.ix_xdrive50_windows',
@@ -1279,13 +1225,10 @@
 # name: test_entity_state_attrs[binary_sensor.m340i_xdrive_check_control_messages-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'M340i xDrive',
       'device_class': 'problem',
       'engine_oil': 'LOW',
       'friendly_name': 'M340i xDrive Check control messages',
       'tire_pressure': 'LOW',
-      'vin': 'WBA00000000DEMO03',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.m340i_xdrive_check_control_messages',
@@ -1331,11 +1274,9 @@
 # name: test_entity_state_attrs[binary_sensor.m340i_xdrive_condition_based_services-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'brake_fluid': 'OK',
       'brake_fluid_date': '2024-12-01',
       'brake_fluid_distance': '50000 km',
-      'car': 'M340i xDrive',
       'device_class': 'problem',
       'friendly_name': 'M340i xDrive Condition based services',
       'oil': 'OK',
@@ -1349,7 +1290,6 @@
       'vehicle_tuv': 'OK',
       'vehicle_tuv_date': '2024-12-01',
       'vehicle_tuv_distance': '50000 km',
-      'vin': 'WBA00000000DEMO03',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.m340i_xdrive_condition_based_services',
@@ -1395,12 +1335,9 @@
 # name: test_entity_state_attrs[binary_sensor.m340i_xdrive_door_lock_state-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'M340i xDrive',
       'device_class': 'lock',
       'door_lock_state': 'LOCKED',
       'friendly_name': 'M340i xDrive Door lock state',
-      'vin': 'WBA00000000DEMO03',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.m340i_xdrive_door_lock_state',
@@ -1446,8 +1383,6 @@
 # name: test_entity_state_attrs[binary_sensor.m340i_xdrive_lids-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'M340i xDrive',
       'device_class': 'opening',
       'friendly_name': 'M340i xDrive Lids',
       'hood': 'CLOSED',
@@ -1456,7 +1391,6 @@
       'rightFront': 'CLOSED',
       'rightRear': 'CLOSED',
       'trunk': 'CLOSED',
-      'vin': 'WBA00000000DEMO03',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.m340i_xdrive_lids',
@@ -1502,8 +1436,6 @@
 # name: test_entity_state_attrs[binary_sensor.m340i_xdrive_windows-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'M340i xDrive',
       'device_class': 'opening',
       'friendly_name': 'M340i xDrive Windows',
       'leftFront': 'CLOSED',
@@ -1511,7 +1443,6 @@
       'rear': 'CLOSED',
       'rightFront': 'CLOSED',
       'rightRear': 'CLOSED',
-      'vin': 'WBA00000000DEMO03',
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.m340i_xdrive_windows',

tests/components/bmw_connected_drive/snapshots/test_button.ambr

@@ -35,7 +35,6 @@
 # name: test_entity_state_attrs[button.i3_rex_activate_air_conditioning-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i3 (+ REX) Activate air conditioning',
     }),
     'context': <ANY>,
@@ -82,7 +81,6 @@
 # name: test_entity_state_attrs[button.i3_rex_find_vehicle-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i3 (+ REX) Find vehicle',
     }),
     'context': <ANY>,
@@ -129,7 +127,6 @@
 # name: test_entity_state_attrs[button.i3_rex_flash_lights-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i3 (+ REX) Flash lights',
     }),
     'context': <ANY>,
@@ -176,7 +173,6 @@
 # name: test_entity_state_attrs[button.i3_rex_sound_horn-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i3 (+ REX) Sound horn',
     }),
     'context': <ANY>,
@@ -223,7 +219,6 @@
 # name: test_entity_state_attrs[button.i4_edrive40_activate_air_conditioning-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i4 eDrive40 Activate air conditioning',
     }),
     'context': <ANY>,
@@ -270,7 +265,6 @@
 # name: test_entity_state_attrs[button.i4_edrive40_deactivate_air_conditioning-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i4 eDrive40 Deactivate air conditioning',
     }),
     'context': <ANY>,
@@ -317,7 +311,6 @@
 # name: test_entity_state_attrs[button.i4_edrive40_find_vehicle-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i4 eDrive40 Find vehicle',
     }),
     'context': <ANY>,
@@ -364,7 +357,6 @@
 # name: test_entity_state_attrs[button.i4_edrive40_flash_lights-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i4 eDrive40 Flash lights',
     }),
     'context': <ANY>,
@@ -411,7 +403,6 @@
 # name: test_entity_state_attrs[button.i4_edrive40_sound_horn-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i4 eDrive40 Sound horn',
     }),
     'context': <ANY>,
@@ -458,7 +449,6 @@
 # name: test_entity_state_attrs[button.ix_xdrive50_activate_air_conditioning-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'iX xDrive50 Activate air conditioning',
     }),
     'context': <ANY>,
@@ -505,7 +495,6 @@
 # name: test_entity_state_attrs[button.ix_xdrive50_deactivate_air_conditioning-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'iX xDrive50 Deactivate air conditioning',
     }),
     'context': <ANY>,
@@ -552,7 +541,6 @@
 # name: test_entity_state_attrs[button.ix_xdrive50_find_vehicle-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'iX xDrive50 Find vehicle',
     }),
     'context': <ANY>,
@@ -599,7 +587,6 @@
 # name: test_entity_state_attrs[button.ix_xdrive50_flash_lights-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'iX xDrive50 Flash lights',
     }),
     'context': <ANY>,
@@ -646,7 +633,6 @@
 # name: test_entity_state_attrs[button.ix_xdrive50_sound_horn-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'iX xDrive50 Sound horn',
     }),
     'context': <ANY>,
@@ -693,7 +679,6 @@
 # name: test_entity_state_attrs[button.m340i_xdrive_activate_air_conditioning-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'M340i xDrive Activate air conditioning',
     }),
     'context': <ANY>,
@@ -740,7 +725,6 @@
 # name: test_entity_state_attrs[button.m340i_xdrive_deactivate_air_conditioning-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'M340i xDrive Deactivate air conditioning',
     }),
     'context': <ANY>,
@@ -787,7 +771,6 @@
 # name: test_entity_state_attrs[button.m340i_xdrive_find_vehicle-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'M340i xDrive Find vehicle',
     }),
     'context': <ANY>,
@@ -834,7 +817,6 @@
 # name: test_entity_state_attrs[button.m340i_xdrive_flash_lights-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'M340i xDrive Flash lights',
     }),
     'context': <ANY>,
@@ -881,7 +863,6 @@
 # name: test_entity_state_attrs[button.m340i_xdrive_sound_horn-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'M340i xDrive Sound horn',
     }),
     'context': <ANY>,

tests/components/bmw_connected_drive/snapshots/test_lock.ambr

@@ -35,12 +35,9 @@
 # name: test_entity_state_attrs[lock.i3_rex_lock-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'i3 (+ REX)',
       'door_lock_state': 'UNLOCKED',
       'friendly_name': 'i3 (+ REX) Lock',
       'supported_features': <LockEntityFeature: 0>,
-      'vin': 'WBY00000000REXI01',
     }),
     'context': <ANY>,
     'entity_id': 'lock.i3_rex_lock',
@@ -86,12 +83,9 @@
 # name: test_entity_state_attrs[lock.i4_edrive40_lock-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'i4 eDrive40',
       'door_lock_state': 'LOCKED',
       'friendly_name': 'i4 eDrive40 Lock',
       'supported_features': <LockEntityFeature: 0>,
-      'vin': 'WBA00000000DEMO02',
     }),
     'context': <ANY>,
     'entity_id': 'lock.i4_edrive40_lock',
@@ -137,12 +131,9 @@
 # name: test_entity_state_attrs[lock.ix_xdrive50_lock-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'iX xDrive50',
       'door_lock_state': 'LOCKED',
       'friendly_name': 'iX xDrive50 Lock',
       'supported_features': <LockEntityFeature: 0>,
-      'vin': 'WBA00000000DEMO01',
     }),
     'context': <ANY>,
     'entity_id': 'lock.ix_xdrive50_lock',
@@ -188,12 +179,9 @@
 # name: test_entity_state_attrs[lock.m340i_xdrive_lock-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
-      'car': 'M340i xDrive',
       'door_lock_state': 'LOCKED',
       'friendly_name': 'M340i xDrive Lock',
       'supported_features': <LockEntityFeature: 0>,
-      'vin': 'WBA00000000DEMO03',
     }),
     'context': <ANY>,
     'entity_id': 'lock.m340i_xdrive_lock',

tests/components/bmw_connected_drive/snapshots/test_number.ambr

@@ -40,7 +40,6 @@
 # name: test_entity_state_attrs[number.i4_edrive40_target_soc-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'battery',
       'friendly_name': 'i4 eDrive40 Target SoC',
       'max': 100.0,
@@ -97,7 +96,6 @@
 # name: test_entity_state_attrs[number.ix_xdrive50_target_soc-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'battery',
       'friendly_name': 'iX xDrive50 Target SoC',
       'max': 100.0,

tests/components/bmw_connected_drive/snapshots/test_select.ambr

@@ -40,7 +40,6 @@
 # name: test_entity_state_attrs[select.i3_rex_charging_mode-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i3 (+ REX) Charging Mode',
       'options': list([
         'immediate_charging',
@@ -107,7 +106,6 @@
 # name: test_entity_state_attrs[select.i4_edrive40_ac_charging_limit-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i4 eDrive40 AC Charging Limit',
       'options': list([
         '6',
@@ -175,7 +173,6 @@
 # name: test_entity_state_attrs[select.i4_edrive40_charging_mode-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i4 eDrive40 Charging Mode',
       'options': list([
         'immediate_charging',
@@ -242,7 +239,6 @@
 # name: test_entity_state_attrs[select.ix_xdrive50_ac_charging_limit-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'iX xDrive50 AC Charging Limit',
       'options': list([
         '6',
@@ -310,7 +306,6 @@
 # name: test_entity_state_attrs[select.ix_xdrive50_charging_mode-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'iX xDrive50 Charging Mode',
       'options': list([
         'immediate_charging',

tests/components/bmw_connected_drive/snapshots/test_sensor.ambr

@@ -38,7 +38,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_ac_current_limit-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'current',
       'friendly_name': 'i3 (+ REX) AC current limit',
       'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
@@ -87,7 +86,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_charging_end_time-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'timestamp',
       'friendly_name': 'i3 (+ REX) Charging end time',
     }),
@@ -135,7 +133,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_charging_start_time-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'timestamp',
       'friendly_name': 'i3 (+ REX) Charging start time',
     }),
@@ -198,7 +195,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_charging_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'enum',
       'friendly_name': 'i3 (+ REX) Charging status',
       'options': list([
@@ -263,7 +259,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_charging_target-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'battery',
       'friendly_name': 'i3 (+ REX) Charging target',
       'unit_of_measurement': '%',
@@ -317,7 +312,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_mileage-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'i3 (+ REX) Mileage',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
@@ -372,7 +366,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_remaining_battery_percent-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'battery',
       'friendly_name': 'i3 (+ REX) Remaining battery percent',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -427,7 +420,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_remaining_fuel-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'volume',
       'friendly_name': 'i3 (+ REX) Remaining fuel',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -482,7 +474,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_remaining_fuel_percent-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i3 (+ REX) Remaining fuel percent',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': '%',
@@ -536,7 +527,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_remaining_range_electric-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'i3 (+ REX) Remaining range electric',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -591,7 +581,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_remaining_range_fuel-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'i3 (+ REX) Remaining range fuel',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -646,7 +635,6 @@
 # name: test_entity_state_attrs[sensor.i3_rex_remaining_range_total-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'i3 (+ REX) Remaining range total',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -699,7 +687,6 @@
 # name: test_entity_state_attrs[sensor.i4_edrive40_ac_current_limit-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'current',
       'friendly_name': 'i4 eDrive40 AC current limit',
       'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
@@ -748,7 +735,6 @@
 # name: test_entity_state_attrs[sensor.i4_edrive40_charging_end_time-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'timestamp',
       'friendly_name': 'i4 eDrive40 Charging end time',
     }),
@@ -796,7 +782,6 @@
 # name: test_entity_state_attrs[sensor.i4_edrive40_charging_start_time-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'timestamp',
       'friendly_name': 'i4 eDrive40 Charging start time',
     }),
@@ -859,7 +844,6 @@
 # name: test_entity_state_attrs[sensor.i4_edrive40_charging_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'enum',
       'friendly_name': 'i4 eDrive40 Charging status',
       'options': list([
@@ -924,7 +908,6 @@
 # name: test_entity_state_attrs[sensor.i4_edrive40_charging_target-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'battery',
       'friendly_name': 'i4 eDrive40 Charging target',
       'unit_of_measurement': '%',
@@ -980,7 +963,6 @@
 # name: test_entity_state_attrs[sensor.i4_edrive40_climate_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'enum',
       'friendly_name': 'i4 eDrive40 Climate status',
       'options': list([
@@ -1039,7 +1021,6 @@
 # name: test_entity_state_attrs[sensor.i4_edrive40_mileage-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'i4 eDrive40 Mileage',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
@@ -1094,7 +1075,6 @@
 # name: test_entity_state_attrs[sensor.i4_edrive40_remaining_battery_percent-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'battery',
       'friendly_name': 'i4 eDrive40 Remaining battery percent',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -1149,7 +1129,6 @@
 # name: test_entity_state_attrs[sensor.i4_edrive40_remaining_range_electric-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'i4 eDrive40 Remaining range electric',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -1204,7 +1183,6 @@
 # name: test_entity_state_attrs[sensor.i4_edrive40_remaining_range_total-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'i4 eDrive40 Remaining range total',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -1257,7 +1235,6 @@
 # name: test_entity_state_attrs[sensor.ix_xdrive50_ac_current_limit-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'current',
       'friendly_name': 'iX xDrive50 AC current limit',
       'unit_of_measurement': <UnitOfElectricCurrent.AMPERE: 'A'>,
@@ -1306,7 +1283,6 @@
 # name: test_entity_state_attrs[sensor.ix_xdrive50_charging_end_time-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'timestamp',
       'friendly_name': 'iX xDrive50 Charging end time',
     }),
@@ -1354,7 +1330,6 @@
 # name: test_entity_state_attrs[sensor.ix_xdrive50_charging_start_time-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'timestamp',
       'friendly_name': 'iX xDrive50 Charging start time',
     }),
@@ -1417,7 +1392,6 @@
 # name: test_entity_state_attrs[sensor.ix_xdrive50_charging_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'enum',
       'friendly_name': 'iX xDrive50 Charging status',
       'options': list([
@@ -1482,7 +1456,6 @@
 # name: test_entity_state_attrs[sensor.ix_xdrive50_charging_target-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'battery',
       'friendly_name': 'iX xDrive50 Charging target',
       'unit_of_measurement': '%',
@@ -1538,7 +1511,6 @@
 # name: test_entity_state_attrs[sensor.ix_xdrive50_climate_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'enum',
       'friendly_name': 'iX xDrive50 Climate status',
       'options': list([
@@ -1597,7 +1569,6 @@
 # name: test_entity_state_attrs[sensor.ix_xdrive50_mileage-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'iX xDrive50 Mileage',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
@@ -1652,7 +1623,6 @@
 # name: test_entity_state_attrs[sensor.ix_xdrive50_remaining_battery_percent-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'battery',
       'friendly_name': 'iX xDrive50 Remaining battery percent',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -1707,7 +1677,6 @@
 # name: test_entity_state_attrs[sensor.ix_xdrive50_remaining_range_electric-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'iX xDrive50 Remaining range electric',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -1762,7 +1731,6 @@
 # name: test_entity_state_attrs[sensor.ix_xdrive50_remaining_range_total-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'iX xDrive50 Remaining range total',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -1819,7 +1787,6 @@
 # name: test_entity_state_attrs[sensor.m340i_xdrive_climate_status-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'enum',
       'friendly_name': 'M340i xDrive Climate status',
       'options': list([
@@ -1878,7 +1845,6 @@
 # name: test_entity_state_attrs[sensor.m340i_xdrive_mileage-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'M340i xDrive Mileage',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
@@ -1933,7 +1899,6 @@
 # name: test_entity_state_attrs[sensor.m340i_xdrive_remaining_fuel-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'volume',
       'friendly_name': 'M340i xDrive Remaining fuel',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -1988,7 +1953,6 @@
 # name: test_entity_state_attrs[sensor.m340i_xdrive_remaining_fuel_percent-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'M340i xDrive Remaining fuel percent',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': '%',
@@ -2042,7 +2006,6 @@
 # name: test_entity_state_attrs[sensor.m340i_xdrive_remaining_range_fuel-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'M340i xDrive Remaining range fuel',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
@@ -2097,7 +2060,6 @@
 # name: test_entity_state_attrs[sensor.m340i_xdrive_remaining_range_total-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'device_class': 'distance',
       'friendly_name': 'M340i xDrive Remaining range total',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,

tests/components/bmw_connected_drive/snapshots/test_switch.ambr

@@ -35,7 +35,6 @@
 # name: test_entity_state_attrs[switch.i4_edrive40_climate-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'i4 eDrive40 Climate',
     }),
     'context': <ANY>,
@@ -82,7 +81,6 @@
 # name: test_entity_state_attrs[switch.ix_xdrive50_charging-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'iX xDrive50 Charging',
     }),
     'context': <ANY>,
@@ -129,7 +127,6 @@
 # name: test_entity_state_attrs[switch.ix_xdrive50_climate-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'iX xDrive50 Climate',
     }),
     'context': <ANY>,
@@ -176,7 +173,6 @@
 # name: test_entity_state_attrs[switch.m340i_xdrive_climate-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by MyBMW',
       'friendly_name': 'M340i xDrive Climate',
     }),
     'context': <ANY>,