diff --git a/homeassistant/components/rainforest_eagle/sensor.py b/homeassistant/components/rainforest_eagle/sensor.py index 4b24a3abdaa..6f6b496cfca 100644 --- a/homeassistant/components/rainforest_eagle/sensor.py +++ b/homeassistant/components/rainforest_eagle/sensor.py @@ -38,21 +38,22 @@ _LOGGER = logging.getLogger(__name__) SENSORS = ( SensorEntityDescription( key="zigbee:InstantaneousDemand", - name="Meter Power Demand", + # We can drop the "Eagle-200" part of the name in HA 2021.12 + name="Eagle-200 Meter Power Demand", native_unit_of_measurement=POWER_KILO_WATT, device_class=DEVICE_CLASS_POWER, state_class=STATE_CLASS_MEASUREMENT, ), SensorEntityDescription( key="zigbee:CurrentSummationDelivered", - name="Total Meter Energy Delivered", + name="Eagle-200 Total Meter Energy Delivered", native_unit_of_measurement=ENERGY_KILO_WATT_HOUR, device_class=DEVICE_CLASS_ENERGY, state_class=STATE_CLASS_TOTAL_INCREASING, ), SensorEntityDescription( key="zigbee:CurrentSummationReceived", - name="Total Meter Energy Received", + name="Eagle-200 Total Meter Energy Received", native_unit_of_measurement=ENERGY_KILO_WATT_HOUR, device_class=DEVICE_CLASS_ENERGY, state_class=STATE_CLASS_TOTAL_INCREASING, diff --git a/tests/components/rainforest_eagle/test_sensor.py b/tests/components/rainforest_eagle/test_sensor.py index a090c6dc318..e895f2ac4fc 100644 --- a/tests/components/rainforest_eagle/test_sensor.py +++ b/tests/components/rainforest_eagle/test_sensor.py @@ -114,17 +114,17 @@ async def test_sensors_200(hass, setup_rainforest_200): """Test the sensors.""" assert len(hass.states.async_all()) == 3 - demand = hass.states.get("sensor.meter_power_demand") + demand = hass.states.get("sensor.eagle_200_meter_power_demand") assert demand is not None assert demand.state == "1.152000" assert demand.attributes["unit_of_measurement"] == "kW" - delivered = hass.states.get("sensor.total_meter_energy_delivered") + delivered = hass.states.get("sensor.eagle_200_total_meter_energy_delivered") assert delivered is not None assert delivered.state == "45251.285000" assert delivered.attributes["unit_of_measurement"] == "kWh" - received = hass.states.get("sensor.total_meter_energy_received") + received = hass.states.get("sensor.eagle_200_total_meter_energy_received") assert received is not None assert received.state == "232.232000" assert received.attributes["unit_of_measurement"] == "kWh" @@ -147,17 +147,17 @@ async def test_sensors_100(hass, setup_rainforest_100): """Test the sensors.""" assert len(hass.states.async_all()) == 3 - demand = hass.states.get("sensor.meter_power_demand") + demand = hass.states.get("sensor.eagle_200_meter_power_demand") assert demand is not None assert demand.state == "1.152000" assert demand.attributes["unit_of_measurement"] == "kW" - delivered = hass.states.get("sensor.total_meter_energy_delivered") + delivered = hass.states.get("sensor.eagle_200_total_meter_energy_delivered") assert delivered is not None assert delivered.state == "45251.285000" assert delivered.attributes["unit_of_measurement"] == "kWh" - received = hass.states.get("sensor.total_meter_energy_received") + received = hass.states.get("sensor.eagle_200_total_meter_energy_received") assert received is not None assert received.state == "232.232000" assert received.attributes["unit_of_measurement"] == "kWh"