From 1f9c06e60606fd52c897a1e00292b7c0403899d6 Mon Sep 17 00:00:00 2001
From: Christopher Fenner <9592452+CFenner@users.noreply.github.com>
Date: Sun, 20 Oct 2024 17:17:46 +0200
Subject: [PATCH] Align consumption sensor names in ViCare integration
(#127888)
---
homeassistant/components/vicare/strings.json | 40 +++++++++----------
.../vicare/snapshots/test_sensor.ambr | 36 ++++++++---------
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/homeassistant/components/vicare/strings.json b/homeassistant/components/vicare/strings.json
index 15637a75b83..8c8ee43e898 100644
--- a/homeassistant/components/vicare/strings.json
+++ b/homeassistant/components/vicare/strings.json
@@ -234,28 +234,40 @@
"name": "DHW gas consumption last seven days"
},
"energy_summary_consumption_heating_currentday": {
- "name": "Heating energy consumption today"
+ "name": "Heating electricity consumption today"
},
"energy_summary_consumption_heating_currentmonth": {
- "name": "Heating energy consumption this month"
+ "name": "Heating electricity consumption this month"
},
"energy_summary_consumption_heating_currentyear": {
- "name": "Heating energy consumption this year"
+ "name": "Heating electricity consumption this year"
},
"energy_summary_consumption_heating_lastsevendays": {
- "name": "Heating energy consumption last seven days"
+ "name": "Heating electricity consumption last seven days"
},
"energy_dhw_summary_consumption_heating_currentday": {
- "name": "DHW energy consumption today"
+ "name": "DHW electricity consumption today"
},
"energy_dhw_summary_consumption_heating_currentmonth": {
- "name": "DHW energy consumption this month"
+ "name": "DHW electricity consumption this month"
},
"energy_dhw_summary_consumption_heating_currentyear": {
- "name": "DHW energy consumption this year"
+ "name": "DHW electricity consumption this year"
},
"energy_summary_dhw_consumption_heating_lastsevendays": {
- "name": "DHW energy consumption last seven days"
+ "name": "DHW electricity consumption last seven days"
+ },
+ "power_consumption_today": {
+ "name": "Electricity consumption today"
+ },
+ "power_consumption_this_week": {
+ "name": "Electricity consumption this week"
+ },
+ "power_consumption_this_month": {
+ "name": "Electricity consumption this month"
+ },
+ "power_consumption_this_year": {
+ "name": "Electricity consumption this year"
},
"power_production_current": {
"name": "Power production current"
@@ -290,18 +302,6 @@
"solar_power_production_this_year": {
"name": "Solar energy production this year"
},
- "power_consumption_today": {
- "name": "Energy consumption today"
- },
- "power_consumption_this_week": {
- "name": "Power consumption this week"
- },
- "power_consumption_this_month": {
- "name": "Energy consumption this month"
- },
- "power_consumption_this_year": {
- "name": "Energy consumption this year"
- },
"buffer_top_temperature": {
"name": "Buffer top temperature"
},
diff --git a/tests/components/vicare/snapshots/test_sensor.ambr b/tests/components/vicare/snapshots/test_sensor.ambr
index ed4caf8ea79..793f3e87611 100644
--- a/tests/components/vicare/snapshots/test_sensor.ambr
+++ b/tests/components/vicare/snapshots/test_sensor.ambr
@@ -548,7 +548,7 @@
'state': '7.843',
})
# ---
-# name: test_all_entities[sensor.model0_energy_consumption_this_year-entry]
+# name: test_all_entities[sensor.model0_electricity_consumption_this_year-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
@@ -562,7 +562,7 @@
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
- 'entity_id': 'sensor.model0_energy_consumption_this_year',
+ 'entity_id': 'sensor.model0_electricity_consumption_this_year',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -574,7 +574,7 @@
}),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_icon': None,
- 'original_name': 'Energy consumption this year',
+ 'original_name': 'Electricity consumption this year',
'platform': 'vicare',
'previous_unique_id': None,
'supported_features': 0,
@@ -583,23 +583,23 @@
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
-# name: test_all_entities[sensor.model0_energy_consumption_this_year-state]
+# name: test_all_entities[sensor.model0_electricity_consumption_this_year-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'energy',
- 'friendly_name': 'model0 Energy consumption this year',
+ 'friendly_name': 'model0 Electricity consumption this year',
'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
}),
'context': <ANY>,
- 'entity_id': 'sensor.model0_energy_consumption_this_year',
+ 'entity_id': 'sensor.model0_electricity_consumption_this_year',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '207.106',
})
# ---
-# name: test_all_entities[sensor.model0_energy_consumption_today-entry]
+# name: test_all_entities[sensor.model0_electricity_consumption_today-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
@@ -613,7 +613,7 @@
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
- 'entity_id': 'sensor.model0_energy_consumption_today',
+ 'entity_id': 'sensor.model0_electricity_consumption_today',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -625,7 +625,7 @@
}),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_icon': None,
- 'original_name': 'Energy consumption today',
+ 'original_name': 'Electricity consumption today',
'platform': 'vicare',
'previous_unique_id': None,
'supported_features': 0,
@@ -634,16 +634,16 @@
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
-# name: test_all_entities[sensor.model0_energy_consumption_today-state]
+# name: test_all_entities[sensor.model0_electricity_consumption_today-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'energy',
- 'friendly_name': 'model0 Energy consumption today',
+ 'friendly_name': 'model0 Electricity consumption today',
'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
}),
'context': <ANY>,
- 'entity_id': 'sensor.model0_energy_consumption_today',
+ 'entity_id': 'sensor.model0_electricity_consumption_today',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@@ -897,7 +897,7 @@
'state': '20.8',
})
# ---
-# name: test_all_entities[sensor.model0_power_consumption_this_week-entry]
+# name: test_all_entities[sensor.model0_electricity_consumption_this_week-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
@@ -911,7 +911,7 @@
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
- 'entity_id': 'sensor.model0_power_consumption_this_week',
+ 'entity_id': 'sensor.model0_electricity_consumption_this_week',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -923,7 +923,7 @@
}),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_icon': None,
- 'original_name': 'Power consumption this week',
+ 'original_name': 'Electricity consumption this week',
'platform': 'vicare',
'previous_unique_id': None,
'supported_features': 0,
@@ -932,16 +932,16 @@
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
})
# ---
-# name: test_all_entities[sensor.model0_power_consumption_this_week-state]
+# name: test_all_entities[sensor.model0_electricity_consumption_this_week-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'energy',
- 'friendly_name': 'model0 Power consumption this week',
+ 'friendly_name': 'model0 Electricity consumption this week',
'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
}),
'context': <ANY>,
- 'entity_id': 'sensor.model0_power_consumption_this_week',
+ 'entity_id': 'sensor.model0_electricity_consumption_this_week',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
--
GitLab