From 0562c3085f1fe58b9f441d687882af2e8fc288de Mon Sep 17 00:00:00 2001
From: Robert Resch <robert@resch.dev>
Date: Wed, 5 Jun 2024 18:21:03 +0200
Subject: [PATCH] Replace slave by meter in v2c (#118893)

---
 homeassistant/components/v2c/icons.json         |  2 +-
 homeassistant/components/v2c/sensor.py          |  9 +++++++--
 homeassistant/components/v2c/strings.json       |  6 +++---
 tests/components/v2c/snapshots/test_sensor.ambr | 12 ++++++------
 tests/components/v2c/test_sensor.py             |  6 +++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/homeassistant/components/v2c/icons.json b/homeassistant/components/v2c/icons.json
index fa8449135bb..1b76b669956 100644
--- a/homeassistant/components/v2c/icons.json
+++ b/homeassistant/components/v2c/icons.json
@@ -16,7 +16,7 @@
       "fv_power": {
         "default": "mdi:solar-power-variant"
       },
-      "slave_error": {
+      "meter_error": {
         "default": "mdi:alert"
       },
       "battery_power": {
diff --git a/homeassistant/components/v2c/sensor.py b/homeassistant/components/v2c/sensor.py
index 799d6c3d03c..0c59993ac0e 100644
--- a/homeassistant/components/v2c/sensor.py
+++ b/homeassistant/components/v2c/sensor.py
@@ -35,7 +35,12 @@ class V2CSensorEntityDescription(SensorEntityDescription):
     value_fn: Callable[[TrydanData], StateType]
 
 
-_METER_ERROR_OPTIONS = [error.name.lower() for error in SlaveCommunicationState]
+def get_meter_value(value: SlaveCommunicationState) -> str:
+    """Return the value of the enum and replace slave by meter."""
+    return value.name.lower().replace("slave", "meter")
+
+
+_METER_ERROR_OPTIONS = [get_meter_value(error) for error in SlaveCommunicationState]
 
 TRYDAN_SENSORS = (
     V2CSensorEntityDescription(
@@ -82,7 +87,7 @@ TRYDAN_SENSORS = (
     V2CSensorEntityDescription(
         key="meter_error",
         translation_key="meter_error",
-        value_fn=lambda evse_data: evse_data.slave_error.name.lower(),
+        value_fn=lambda evse_data: get_meter_value(evse_data.slave_error),
         entity_registry_enabled_default=False,
         device_class=SensorDeviceClass.ENUM,
         options=_METER_ERROR_OPTIONS,
diff --git a/homeassistant/components/v2c/strings.json b/homeassistant/components/v2c/strings.json
index bc0d870b635..3342652cfb4 100644
--- a/homeassistant/components/v2c/strings.json
+++ b/homeassistant/components/v2c/strings.json
@@ -60,12 +60,12 @@
           "no_error": "No error",
           "communication": "Communication",
           "reading": "Reading",
-          "slave": "Meter",
+          "meter": "Meter",
           "waiting_wifi": "Waiting for Wi-Fi",
           "waiting_communication": "Waiting communication",
           "wrong_ip": "Wrong IP",
-          "slave_not_found": "Meter not found",
-          "wrong_slave": "Wrong Meter",
+          "meter_not_found": "Meter not found",
+          "wrong_meter": "Wrong meter",
           "no_response": "No response",
           "clamp_not_connected": "Clamp not connected",
           "illegal_function": "Illegal function",
diff --git a/tests/components/v2c/snapshots/test_sensor.ambr b/tests/components/v2c/snapshots/test_sensor.ambr
index 859e5f83e15..cc8077333cb 100644
--- a/tests/components/v2c/snapshots/test_sensor.ambr
+++ b/tests/components/v2c/snapshots/test_sensor.ambr
@@ -265,12 +265,12 @@
         'no_error',
         'communication',
         'reading',
-        'slave',
+        'meter',
         'waiting_wifi',
         'waiting_communication',
         'wrong_ip',
-        'slave_not_found',
-        'wrong_slave',
+        'meter_not_found',
+        'wrong_meter',
         'no_response',
         'clamp_not_connected',
         'illegal_function',
@@ -335,12 +335,12 @@
         'no_error',
         'communication',
         'reading',
-        'slave',
+        'meter',
         'waiting_wifi',
         'waiting_communication',
         'wrong_ip',
-        'slave_not_found',
-        'wrong_slave',
+        'meter_not_found',
+        'wrong_meter',
         'no_response',
         'clamp_not_connected',
         'illegal_function',
diff --git a/tests/components/v2c/test_sensor.py b/tests/components/v2c/test_sensor.py
index 4be62d02bd5..b48a173821c 100644
--- a/tests/components/v2c/test_sensor.py
+++ b/tests/components/v2c/test_sensor.py
@@ -33,12 +33,12 @@ async def test_sensor(
         "no_error",
         "communication",
         "reading",
-        "slave",
+        "meter",
         "waiting_wifi",
         "waiting_communication",
         "wrong_ip",
-        "slave_not_found",
-        "wrong_slave",
+        "meter_not_found",
+        "wrong_meter",
         "no_response",
         "clamp_not_connected",
         "illegal_function",