Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reverse unintended change of unique_id for solarlog (#127845)

pull/127915/head
dontinelli 2024-10-08 08:46:49 +02:00 committed by GitHub
parent ba4ed5a1bb
commit 99a40ae49f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/components/solarlog/entity.py
View File

@ -38,7 +38,7 @@ class SolarLogCoordinatorEntity(SolarLogBaseEntity):
"""Initialize the SolarLogCoordinator sensor."""
super().__init__(coordinator, description)
self._attr_unique_id = f"{coordinator.unique_id}-{description.key}"
self._attr_unique_id = f"{coordinator.unique_id}_{description.key}"
self._attr_device_info = DeviceInfo(
manufacturer="Solar-Log",
model="Controller",
@ -59,8 +59,8 @@ class SolarLogInverterEntity(SolarLogBaseEntity):
) -> None:
"""Initialize the SolarLogInverter sensor."""
super().__init__(coordinator, description)
name = f"{coordinator.unique_id}-{slugify(coordinator.solarlog.device_name(device_id))}"
self._attr_unique_id = f"{name}-{description.key}"
name = f"{coordinator.unique_id}_{slugify(coordinator.solarlog.device_name(device_id))}"
self._attr_unique_id = f"{name}_{description.key}"
self._attr_device_info = DeviceInfo(
manufacturer="Solar-Log",
model="Inverter",

105
tests/components/solarlog/snapshots/test_sensor.ambr
View File

@ -1,55 +1,4 @@
# serializer version: 1
# name: test_all_entities[sensor.inverter_1_consumption_total-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.TOTAL: 'total'>,
}),
'config_entry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.inverter_1_consumption_total',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'options': dict({
}),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_icon': None,
'original_name': 'Consumption total',
'platform': 'solarlog',
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'consumption_total',
'unique_id': 'ce5f5431554d101905d31797e1232da8-inverter_1-consumption_total',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
# name: test_all_entities[sensor.inverter_1_consumption_total-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'energy',
'friendly_name': 'Inverter 1 Consumption total',
'state_class': <SensorStateClass.TOTAL: 'total'>,
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
}),
'context': <ANY>,
'entity_id': 'sensor.inverter_1_consumption_total',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '354.687',
})
# ---
# name: test_all_entities[sensor.inverter_1_consumption_year-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
@ -85,7 +34,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'consumption_year',
'unique_id': 'ce5f5431554d101905d31797e1232da8-inverter_1-consumption_year',
'unique_id': 'ce5f5431554d101905d31797e1232da8_inverter_1_consumption_year',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -135,7 +84,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'current_power',
'unique_id': 'ce5f5431554d101905d31797e1232da8-inverter_1-current_power',
'unique_id': 'ce5f5431554d101905d31797e1232da8_inverter_1_current_power',
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
@ -190,7 +139,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'consumption_year',
'unique_id': 'ce5f5431554d101905d31797e1232da8-inverter_2-consumption_year',
'unique_id': 'ce5f5431554d101905d31797e1232da8_inverter_2_consumption_year',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -240,7 +189,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'current_power',
'unique_id': 'ce5f5431554d101905d31797e1232da8-inverter_2-current_power',
'unique_id': 'ce5f5431554d101905d31797e1232da8_inverter_2_current_power',
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
@ -291,7 +240,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'alternator_loss',
'unique_id': 'ce5f5431554d101905d31797e1232da8-alternator_loss',
'unique_id': 'ce5f5431554d101905d31797e1232da8_alternator_loss',
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
@ -345,7 +294,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'capacity',
'unique_id': 'ce5f5431554d101905d31797e1232da8-capacity',
'unique_id': 'ce5f5431554d101905d31797e1232da8_capacity',
'unit_of_measurement': '%',
})
# ---
@ -396,7 +345,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'consumption_ac',
'unique_id': 'ce5f5431554d101905d31797e1232da8-consumption_ac',
'unique_id': 'ce5f5431554d101905d31797e1232da8_consumption_ac',
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
@ -451,7 +400,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'consumption_day',
'unique_id': 'ce5f5431554d101905d31797e1232da8-consumption_day',
'unique_id': 'ce5f5431554d101905d31797e1232da8_consumption_day',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -505,7 +454,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'consumption_month',
'unique_id': 'ce5f5431554d101905d31797e1232da8-consumption_month',
'unique_id': 'ce5f5431554d101905d31797e1232da8_consumption_month',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -561,7 +510,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'consumption_total',
'unique_id': 'ce5f5431554d101905d31797e1232da8-consumption_total',
'unique_id': 'ce5f5431554d101905d31797e1232da8_consumption_total',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -616,7 +565,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'consumption_year',
'unique_id': 'ce5f5431554d101905d31797e1232da8-consumption_year',
'unique_id': 'ce5f5431554d101905d31797e1232da8_consumption_year',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -670,7 +619,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'consumption_yesterday',
'unique_id': 'ce5f5431554d101905d31797e1232da8-consumption_yesterday',
'unique_id': 'ce5f5431554d101905d31797e1232da8_consumption_yesterday',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -723,7 +672,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'efficiency',
'unique_id': 'ce5f5431554d101905d31797e1232da8-efficiency',
'unique_id': 'ce5f5431554d101905d31797e1232da8_efficiency',
'unit_of_measurement': '%',
})
# ---
@ -772,7 +721,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'total_power',
'unique_id': 'ce5f5431554d101905d31797e1232da8-total_power',
'unique_id': 'ce5f5431554d101905d31797e1232da8_total_power',
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
@ -820,7 +769,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'last_update',
'unique_id': 'ce5f5431554d101905d31797e1232da8-last_updated',
'unique_id': 'ce5f5431554d101905d31797e1232da8_last_updated',
'unit_of_measurement': None,
})
# ---
@ -869,7 +818,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'power_ac',
'unique_id': 'ce5f5431554d101905d31797e1232da8-power_ac',
'unique_id': 'ce5f5431554d101905d31797e1232da8_power_ac',
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
@ -920,7 +869,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'power_available',
'unique_id': 'ce5f5431554d101905d31797e1232da8-power_available',
'unique_id': 'ce5f5431554d101905d31797e1232da8_power_available',
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
@ -971,7 +920,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'power_dc',
'unique_id': 'ce5f5431554d101905d31797e1232da8-power_dc',
'unique_id': 'ce5f5431554d101905d31797e1232da8_power_dc',
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
@ -1022,7 +971,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'self_consumption_year',
'unique_id': 'ce5f5431554d101905d31797e1232da8-self_consumption_year',
'unique_id': 'ce5f5431554d101905d31797e1232da8_self_consumption_year',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -1076,7 +1025,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'usage',
'unique_id': 'ce5f5431554d101905d31797e1232da8-usage',
'unique_id': 'ce5f5431554d101905d31797e1232da8_usage',
'unit_of_measurement': '%',
})
# ---
@ -1127,7 +1076,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'voltage_ac',
'unique_id': 'ce5f5431554d101905d31797e1232da8-voltage_ac',
'unique_id': 'ce5f5431554d101905d31797e1232da8_voltage_ac',
'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
})
# ---
@ -1178,7 +1127,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'voltage_dc',
'unique_id': 'ce5f5431554d101905d31797e1232da8-voltage_dc',
'unique_id': 'ce5f5431554d101905d31797e1232da8_voltage_dc',
'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
})
# ---
@ -1233,7 +1182,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'yield_day',
'unique_id': 'ce5f5431554d101905d31797e1232da8-yield_day',
'unique_id': 'ce5f5431554d101905d31797e1232da8_yield_day',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -1287,7 +1236,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'yield_month',
'unique_id': 'ce5f5431554d101905d31797e1232da8-yield_month',
'unique_id': 'ce5f5431554d101905d31797e1232da8_yield_month',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -1343,7 +1292,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'yield_total',
'unique_id': 'ce5f5431554d101905d31797e1232da8-yield_total',
'unique_id': 'ce5f5431554d101905d31797e1232da8_yield_total',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -1395,7 +1344,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'yield_year',
'unique_id': 'ce5f5431554d101905d31797e1232da8-yield_year',
'unique_id': 'ce5f5431554d101905d31797e1232da8_yield_year',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
@ -1449,7 +1398,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'yield_yesterday',
'unique_id': 'ce5f5431554d101905d31797e1232da8-yield_yesterday',
'unique_id': 'ce5f5431554d101905d31797e1232da8_yield_yesterday',
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---