Skip to content

Commit

Permalink
Fix model in vicare device_info (home-assistant#74135)
Browse files Browse the repository at this point in the history
  • Loading branch information
@epenet
epenet authored Jun 28, 2022
1 parent b51ad16 commit b9c1358
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 46 deletions.
19 changes: 10 additions & 9 deletions homeassistant/components/vicare/binary_sensor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity import DeviceInfo
from homeassistant.helpers.entity_platform import AddEntitiesCallback

from . import ViCareRequiredKeysMixin
Expand Down Expand Up @@ -198,23 +199,23 @@ def __init__(
self._state = None

@property
def device_info(self):
def device_info(self) -> DeviceInfo:
"""Return device info for this device."""
return {
"identifiers": {(DOMAIN, self._device_config.getConfig().serial)},
"name": self._device_config.getModel(),
"manufacturer": "Viessmann",
"model": (DOMAIN, self._device_config.getModel()),
"configuration_url": "https://developer.viessmann.com/",
}
return DeviceInfo(
identifiers={(DOMAIN, self._device_config.getConfig().serial)},
name=self._device_config.getModel(),
manufacturer="Viessmann",
model=self._device_config.getModel(),
configuration_url="https://developer.viessmann.com/",
)

@property
def available(self):
"""Return True if entity is available."""
return self._state is not None

@property
def unique_id(self):
def unique_id(self) -> str:
"""Return unique ID for this device."""
tmp_id = (
f"{self._device_config.getConfig().serial}-{self.entity_description.key}"
Expand Down
20 changes: 10 additions & 10 deletions homeassistant/components/vicare/button.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity import EntityCategory
from homeassistant.helpers.entity import DeviceInfo, EntityCategory
from homeassistant.helpers.entity_platform import AddEntitiesCallback

from . import ViCareRequiredKeysMixin
Expand Down Expand Up @@ -94,18 +94,18 @@ def press(self) -> None:
_LOGGER.error("Invalid data from Vicare server: %s", invalid_data_exception)

@property
def device_info(self):
def device_info(self) -> DeviceInfo:
"""Return device info for this device."""
return {
"identifiers": {(DOMAIN, self._device_config.getConfig().serial)},
"name": self._device_config.getModel(),
"manufacturer": "Viessmann",
"model": (DOMAIN, self._device_config.getModel()),
"configuration_url": "https://developer.viessmann.com/",
}
return DeviceInfo(
identifiers={(DOMAIN, self._device_config.getConfig().serial)},
name=self._device_config.getModel(),
manufacturer="Viessmann",
model=self._device_config.getModel(),
configuration_url="https://developer.viessmann.com/",
)

@property
def unique_id(self):
def unique_id(self) -> str:
"""Return unique ID for this device."""
tmp_id = (
f"{self._device_config.getConfig().serial}-{self.entity_description.key}"
Expand Down
19 changes: 10 additions & 9 deletions homeassistant/components/vicare/climate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_platform
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import DeviceInfo
from homeassistant.helpers.entity_platform import AddEntitiesCallback

from .const import (
Expand Down Expand Up @@ -161,20 +162,20 @@ def __init__(self, name, api, circuit, device_config, heating_type):
self._current_action = None

@property
def unique_id(self):
def unique_id(self) -> str:
"""Return unique ID for this device."""
return f"{self._device_config.getConfig().serial}-{self._circuit.id}"

@property
def device_info(self):
def device_info(self) -> DeviceInfo:
"""Return device info for this device."""
return {
"identifiers": {(DOMAIN, self._device_config.getConfig().serial)},
"name": self._device_config.getModel(),
"manufacturer": "Viessmann",
"model": (DOMAIN, self._device_config.getModel()),
"configuration_url": "https://developer.viessmann.com/",
}
return DeviceInfo(
identifiers={(DOMAIN, self._device_config.getConfig().serial)},
name=self._device_config.getModel(),
manufacturer="Viessmann",
model=self._device_config.getModel(),
configuration_url="https://developer.viessmann.com/",
)

def update(self):
"""Let HA know there has been an update from the ViCare API."""
Expand Down
19 changes: 10 additions & 9 deletions homeassistant/components/vicare/sensor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
VOLUME_CUBIC_METERS,
)
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity import DeviceInfo
from homeassistant.helpers.entity_platform import AddEntitiesCallback

from . import ViCareRequiredKeysMixin
Expand Down Expand Up @@ -597,23 +598,23 @@ def __init__(
self._state = None

@property
def device_info(self):
def device_info(self) -> DeviceInfo:
"""Return device info for this device."""
return {
"identifiers": {(DOMAIN, self._device_config.getConfig().serial)},
"name": self._device_config.getModel(),
"manufacturer": "Viessmann",
"model": (DOMAIN, self._device_config.getModel()),
"configuration_url": "https://developer.viessmann.com/",
}
return DeviceInfo(
identifiers={(DOMAIN, self._device_config.getConfig().serial)},
name=self._device_config.getModel(),
manufacturer="Viessmann",
model=self._device_config.getModel(),
configuration_url="https://developer.viessmann.com/",
)

@property
def available(self):
"""Return True if entity is available."""
return self._state is not None

@property
def unique_id(self):
def unique_id(self) -> str:
"""Return unique ID for this device."""
tmp_id = (
f"{self._device_config.getConfig().serial}-{self.entity_description.key}"
Expand Down
19 changes: 10 additions & 9 deletions homeassistant/components/vicare/water_heater.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
TEMP_CELSIUS,
)
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity import DeviceInfo
from homeassistant.helpers.entity_platform import AddEntitiesCallback

from .const import (
Expand Down Expand Up @@ -140,20 +141,20 @@ def update(self):
_LOGGER.error("Invalid data from Vicare server: %s", invalid_data_exception)

@property
def unique_id(self):
def unique_id(self) -> str:
"""Return unique ID for this device."""
return f"{self._device_config.getConfig().serial}-{self._circuit.id}"

@property
def device_info(self):
def device_info(self) -> DeviceInfo:
"""Return device info for this device."""
return {
"identifiers": {(DOMAIN, self._device_config.getConfig().serial)},
"name": self._device_config.getModel(),
"manufacturer": "Viessmann",
"model": (DOMAIN, self._device_config.getModel()),
"configuration_url": "https://developer.viessmann.com/",
}
return DeviceInfo(
identifiers={(DOMAIN, self._device_config.getConfig().serial)},
name=self._device_config.getModel(),
manufacturer="Viessmann",
model=self._device_config.getModel(),
configuration_url="https://developer.viessmann.com/",
)

@property
def name(self):
Expand Down

0 comments on commit b9c1358

Please sign in to comment.