evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address late V2C review comments (#103808)

Browse source 
* address review

* missing fixture
This commit is contained in:
Diogo Gomes 2023-11-12 11:04:10 +00:00 • committed by GitHub
parent 6a7e87f1c3
commit b9bc6ca070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
homeassistant/components/v2c/coordinator.py
View file

@ -35,7 +35,7 @@ class V2CUpdateCoordinator(DataUpdateCoordinator[TrydanData]):
"""Fetch sensor data from api.""" """Fetch sensor data from api."""
try: try:
data: TrydanData = await self.evse.get_data() data: TrydanData = await self.evse.get_data()
_LOGGER.debug("Received data: %s", data)
return data
except TrydanError as err: except TrydanError as err:
raise UpdateFailed(f"Error communicating with API: {err}") from err raise UpdateFailed(f"Error communicating with API: {err}") from err
_LOGGER.debug("Received data: %s", data)
return data

2
homeassistant/components/v2c/entity.py
View file

@ -26,7 +26,7 @@ class V2CBaseEntity(CoordinatorEntity[V2CUpdateCoordinator]):
super().__init__(coordinator) super().__init__(coordinator)
self._attr_device_info = DeviceInfo( self._attr_device_info = DeviceInfo(
identifiers={(DOMAIN, coordinator.evse.host)}, identifiers={(DOMAIN, coordinator.config_entry.entry_id)},
manufacturer="V2C", manufacturer="V2C",
model="Trydan", model="Trydan",
name=coordinator.name, name=coordinator.name,

5
homeassistant/components/v2c/number.py
View file

@ -60,11 +60,10 @@ async def async_setup_entry(
"""Set up V2C Trydan number platform.""" """Set up V2C Trydan number platform."""
coordinator: V2CUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id] coordinator: V2CUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
entities: list[NumberEntity] = [ async_add_entities(
V2CSettingsNumberEntity(coordinator, description, config_entry.entry_id) V2CSettingsNumberEntity(coordinator, description, config_entry.entry_id)
for description in TRYDAN_NUMBER_SETTINGS for description in TRYDAN_NUMBER_SETTINGS
] )
async_add_entities(entities)
class V2CSettingsNumberEntity(V2CBaseEntity, NumberEntity): class V2CSettingsNumberEntity(V2CBaseEntity, NumberEntity):

6
homeassistant/components/v2c/sensor.py
View file

@ -16,7 +16,6 @@ from homeassistant.components.sensor import (
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import UnitOfEnergy, UnitOfPower, UnitOfTime from homeassistant.const import UnitOfEnergy, UnitOfPower, UnitOfTime
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity import Entity
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from .const import DOMAIN from .const import DOMAIN
@ -90,11 +89,10 @@ async def async_setup_entry(
"""Set up V2C sensor platform.""" """Set up V2C sensor platform."""
coordinator: V2CUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id] coordinator: V2CUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
entities: list[Entity] = [ async_add_entities(
V2CSensorBaseEntity(coordinator, description, config_entry.entry_id) V2CSensorBaseEntity(coordinator, description, config_entry.entry_id)
for description in TRYDAN_SENSORS for description in TRYDAN_SENSORS
] )
async_add_entities(entities)
class V2CSensorBaseEntity(V2CBaseEntity, SensorEntity): class V2CSensorBaseEntity(V2CBaseEntity, SensorEntity):

3
homeassistant/components/v2c/strings.json
View file

@ -10,9 +10,6 @@
"error": { "error": {
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]", "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
"unknown": "[%key:common::config_flow::error::unknown%]" "unknown": "[%key:common::config_flow::error::unknown%]"
},
"abort": {
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
} }
}, },
"entity": { "entity": {

5
homeassistant/components/v2c/switch.py
View file

@ -55,11 +55,10 @@ async def async_setup_entry(
"""Set up V2C switch platform.""" """Set up V2C switch platform."""
coordinator: V2CUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id] coordinator: V2CUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
entities: list[SwitchEntity] = [ async_add_entities(
V2CSwitchEntity(coordinator, description, config_entry.entry_id) V2CSwitchEntity(coordinator, description, config_entry.entry_id)
for description in TRYDAN_SWITCHES for description in TRYDAN_SWITCHES
] )
async_add_entities(entities)
class V2CSwitchEntity(V2CBaseEntity, SwitchEntity): class V2CSwitchEntity(V2CBaseEntity, SwitchEntity):

2
tests/components/v2c/test_config_flow.py
View file

@ -46,7 +46,7 @@ async def test_form(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> None:
], ],
) )
async def test_form_cannot_connect( async def test_form_cannot_connect(
hass: HomeAssistant, side_effect: Exception, error: str hass: HomeAssistant, mock_setup_entry: AsyncMock, side_effect: Exception, error: str
) -> None: ) -> None:
"""Test we handle cannot connect error.""" """Test we handle cannot connect error."""
result = await hass.config_entries.flow.async_init( result = await hass.config_entries.flow.async_init(