jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 21:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Align attribute naming between light and switch for HomematicIP Cloud (#28271)

Browse Source
This commit is contained in:
SukramJ 2019-11-04 12:05:39 +01:00 committed by Martin Hjelmare
parent 552fbda58b
commit b7296c61bc
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
homeassistant/components/homematicip_cloud/light.py
View File

@ -28,8 +28,8 @@ from .hap import HomematicipHAP
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
ATTR_ENERGY_COUNTER = "energy_counter_kwh" ATTR_TODAY_ENERGY_KWH = "today_energy_kwh"
ATTR_POWER_CONSUMPTION = "power_consumption" ATTR_CURRENT_POWER_W = "current_power_w"
async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
@ -95,11 +95,11 @@ class HomematicipLightMeasuring(HomematicipLight):
"""Return the state attributes of the generic device.""" """Return the state attributes of the generic device."""
state_attr = super().device_state_attributes state_attr = super().device_state_attributes
current_power_consumption = self._device.currentPowerConsumption current_power_w = self._device.currentPowerConsumption
if current_power_consumption > 0.05: if current_power_w > 0.05:
state_attr[ATTR_POWER_CONSUMPTION] = round(current_power_consumption, 2) state_attr[ATTR_CURRENT_POWER_W] = round(current_power_w, 2)
state_attr[ATTR_ENERGY_COUNTER] = round(self._device.energyCounter, 2) state_attr[ATTR_TODAY_ENERGY_KWH] = round(self._device.energyCounter, 2)
return state_attr return state_attr

8
tests/components/homematicip_cloud/test_light.py
View File

@ -3,8 +3,8 @@ from homematicip.base.enums import RGBColorState
from homeassistant.components.homematicip_cloud import DOMAIN as HMIPC_DOMAIN from homeassistant.components.homematicip_cloud import DOMAIN as HMIPC_DOMAIN
from homeassistant.components.homematicip_cloud.light import ( from homeassistant.components.homematicip_cloud.light import (
ATTR_ENERGY_COUNTER, ATTR_CURRENT_POWER_W,
ATTR_POWER_CONSUMPTION, ATTR_TODAY_ENERGY_KWH,
) )
from homeassistant.components.light import ( from homeassistant.components.light import (
ATTR_BRIGHTNESS, ATTR_BRIGHTNESS,
@ -209,8 +209,8 @@ async def test_hmip_light_measuring(hass, default_mock_hap):
await async_manipulate_test_data(hass, hmip_device, "currentPowerConsumption", 50) await async_manipulate_test_data(hass, hmip_device, "currentPowerConsumption", 50)
ha_state = hass.states.get(entity_id) ha_state = hass.states.get(entity_id)
assert ha_state.state == STATE_ON assert ha_state.state == STATE_ON
assert ha_state.attributes[ATTR_POWER_CONSUMPTION] == 50 assert ha_state.attributes[ATTR_CURRENT_POWER_W] == 50
assert ha_state.attributes[ATTR_ENERGY_COUNTER] == 6.33 assert ha_state.attributes[ATTR_TODAY_ENERGY_KWH] == 6.33
await hass.services.async_call( await hass.services.async_call(
"light", "turn_off", {"entity_id": entity_id}, blocking=True "light", "turn_off", {"entity_id": entity_id}, blocking=True