From 8f4ea3818d7f4ec843dcf7af9b97f30bd068171f Mon Sep 17 00:00:00 2001
From: Greg Dowling <pavoni@users.noreply.github.com>
Date: Mon, 8 Feb 2021 14:25:54 +0000
Subject: [PATCH] Add unavailable to Vera (#46064)
---
homeassistant/components/vera/__init__.py | 10 ++++++++++
homeassistant/components/vera/binary_sensor.py | 1 +
homeassistant/components/vera/light.py | 1 +
homeassistant/components/vera/manifest.json | 2 +-
homeassistant/components/vera/sensor.py | 2 +-
homeassistant/components/vera/switch.py | 1 +
requirements_all.txt | 2 +-
requirements_test_all.txt | 2 +-
tests/components/vera/test_binary_sensor.py | 1 +
tests/components/vera/test_climate.py | 2 ++
tests/components/vera/test_cover.py | 1 +
tests/components/vera/test_light.py | 1 +
tests/components/vera/test_lock.py | 1 +
tests/components/vera/test_sensor.py | 2 ++
tests/components/vera/test_switch.py | 1 +
15 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/homeassistant/components/vera/__init__.py b/homeassistant/components/vera/__init__.py
index 3fd1c189b63..4bfa72b5eb6 100644
--- a/homeassistant/components/vera/__init__.py
+++ b/homeassistant/components/vera/__init__.py
@@ -232,6 +232,11 @@ class VeraDevice(Generic[DeviceType], Entity):
"""Update the state."""
self.schedule_update_ha_state(True)
+ def update(self):
+ """Force a refresh from the device if the device is unavailable."""
+ if not self.available:
+ self.vera_device.refresh()
+
@property
def name(self) -> str:
"""Return the name of the device."""
@@ -276,6 +281,11 @@ class VeraDevice(Generic[DeviceType], Entity):
return attr
+ @property
+ def available(self):
+ """If device communications have failed return false."""
+ return not self.vera_device.comm_failure
+
@property
def unique_id(self) -> str:
"""Return a unique ID.
diff --git a/homeassistant/components/vera/binary_sensor.py b/homeassistant/components/vera/binary_sensor.py
index 7932fa14f4c..00d4fb3a758 100644
--- a/homeassistant/components/vera/binary_sensor.py
+++ b/homeassistant/components/vera/binary_sensor.py
@@ -50,4 +50,5 @@ class VeraBinarySensor(VeraDevice[veraApi.VeraBinarySensor], BinarySensorEntity)
def update(self) -> None:
"""Get the latest data and update the state."""
+ super().update()
self._state = self.vera_device.is_tripped
diff --git a/homeassistant/components/vera/light.py b/homeassistant/components/vera/light.py
index c52627d340f..30c4e93a2ba 100644
--- a/homeassistant/components/vera/light.py
+++ b/homeassistant/components/vera/light.py
@@ -93,6 +93,7 @@ class VeraLight(VeraDevice[veraApi.VeraDimmer], LightEntity):
def update(self) -> None:
"""Call to update state."""
+ super().update()
self._state = self.vera_device.is_switched_on()
if self.vera_device.is_dimmable:
# If it is dimmable, both functions exist. In case color
diff --git a/homeassistant/components/vera/manifest.json b/homeassistant/components/vera/manifest.json
index 264f44782f5..1f180b39750 100644
--- a/homeassistant/components/vera/manifest.json
+++ b/homeassistant/components/vera/manifest.json
@@ -3,6 +3,6 @@
"name": "Vera",
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/vera",
- "requirements": ["pyvera==0.3.11"],
+ "requirements": ["pyvera==0.3.13"],
"codeowners": ["@vangorra"]
}
diff --git a/homeassistant/components/vera/sensor.py b/homeassistant/components/vera/sensor.py
index ea7dbf0ae30..007290807e6 100644
--- a/homeassistant/components/vera/sensor.py
+++ b/homeassistant/components/vera/sensor.py
@@ -68,7 +68,7 @@ class VeraSensor(VeraDevice[veraApi.VeraSensor], Entity):
def update(self) -> None:
"""Update the state."""
-
+ super().update()
if self.vera_device.category == veraApi.CATEGORY_TEMPERATURE_SENSOR:
self.current_value = self.vera_device.temperature
diff --git a/homeassistant/components/vera/switch.py b/homeassistant/components/vera/switch.py
index 5dfeba6f5b2..f567893e5b0 100644
--- a/homeassistant/components/vera/switch.py
+++ b/homeassistant/components/vera/switch.py
@@ -70,4 +70,5 @@ class VeraSwitch(VeraDevice[veraApi.VeraSwitch], SwitchEntity):
def update(self) -> None:
"""Update device state."""
+ super().update()
self._state = self.vera_device.is_switched_on()
diff --git a/requirements_all.txt b/requirements_all.txt
index 04dbcdf9d1a..6a8b5f63fa2 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1880,7 +1880,7 @@ pyuptimerobot==0.0.5
# pyuserinput==0.1.11
# homeassistant.components.vera
-pyvera==0.3.11
+pyvera==0.3.13
# homeassistant.components.versasense
pyversasense==0.0.6
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 548d6ba1117..54f6651ad0c 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -953,7 +953,7 @@ pytraccar==0.9.0
pytradfri[async]==7.0.6
# homeassistant.components.vera
-pyvera==0.3.11
+pyvera==0.3.13
# homeassistant.components.vesync
pyvesync==1.2.0
diff --git a/tests/components/vera/test_binary_sensor.py b/tests/components/vera/test_binary_sensor.py
index 1bcb8d1a183..b3b8d2d6ae1 100644
--- a/tests/components/vera/test_binary_sensor.py
+++ b/tests/components/vera/test_binary_sensor.py
@@ -14,6 +14,7 @@ async def test_binary_sensor(
"""Test function."""
vera_device = MagicMock(spec=pv.VeraBinarySensor) # type: pv.VeraBinarySensor
vera_device.device_id = 1
+ vera_device.comm_failure = False
vera_device.vera_device_id = vera_device.device_id
vera_device.name = "dev1"
vera_device.is_tripped = False
diff --git a/tests/components/vera/test_climate.py b/tests/components/vera/test_climate.py
index 076b51997a0..5ec39f07953 100644
--- a/tests/components/vera/test_climate.py
+++ b/tests/components/vera/test_climate.py
@@ -23,6 +23,7 @@ async def test_climate(
vera_device = MagicMock(spec=pv.VeraThermostat) # type: pv.VeraThermostat
vera_device.device_id = 1
vera_device.vera_device_id = vera_device.device_id
+ vera_device.comm_failure = False
vera_device.name = "dev1"
vera_device.category = pv.CATEGORY_THERMOSTAT
vera_device.power = 10
@@ -133,6 +134,7 @@ async def test_climate_f(
vera_device = MagicMock(spec=pv.VeraThermostat) # type: pv.VeraThermostat
vera_device.device_id = 1
vera_device.vera_device_id = vera_device.device_id
+ vera_device.comm_failure = False
vera_device.name = "dev1"
vera_device.category = pv.CATEGORY_THERMOSTAT
vera_device.power = 10
diff --git a/tests/components/vera/test_cover.py b/tests/components/vera/test_cover.py
index 0c05d84e2db..cfc33fb2dcf 100644
--- a/tests/components/vera/test_cover.py
+++ b/tests/components/vera/test_cover.py
@@ -15,6 +15,7 @@ async def test_cover(
vera_device = MagicMock(spec=pv.VeraCurtain) # type: pv.VeraCurtain
vera_device.device_id = 1
vera_device.vera_device_id = vera_device.device_id
+ vera_device.comm_failure = False
vera_device.name = "dev1"
vera_device.category = pv.CATEGORY_CURTAIN
vera_device.is_closed = False
diff --git a/tests/components/vera/test_light.py b/tests/components/vera/test_light.py
index 3b14aba7429..ad5ad7e0259 100644
--- a/tests/components/vera/test_light.py
+++ b/tests/components/vera/test_light.py
@@ -16,6 +16,7 @@ async def test_light(
vera_device = MagicMock(spec=pv.VeraDimmer) # type: pv.VeraDimmer
vera_device.device_id = 1
vera_device.vera_device_id = vera_device.device_id
+ vera_device.comm_failure = False
vera_device.name = "dev1"
vera_device.category = pv.CATEGORY_DIMMER
vera_device.is_switched_on = MagicMock(return_value=False)
diff --git a/tests/components/vera/test_lock.py b/tests/components/vera/test_lock.py
index c288ac8709e..171f799f87b 100644
--- a/tests/components/vera/test_lock.py
+++ b/tests/components/vera/test_lock.py
@@ -16,6 +16,7 @@ async def test_lock(
vera_device = MagicMock(spec=pv.VeraLock) # type: pv.VeraLock
vera_device.device_id = 1
vera_device.vera_device_id = vera_device.device_id
+ vera_device.comm_failure = False
vera_device.name = "dev1"
vera_device.category = pv.CATEGORY_LOCK
vera_device.is_locked = MagicMock(return_value=False)
diff --git a/tests/components/vera/test_sensor.py b/tests/components/vera/test_sensor.py
index 43777642816..62639df3a35 100644
--- a/tests/components/vera/test_sensor.py
+++ b/tests/components/vera/test_sensor.py
@@ -23,6 +23,7 @@ async def run_sensor_test(
vera_device = MagicMock(spec=pv.VeraSensor) # type: pv.VeraSensor
vera_device.device_id = 1
vera_device.vera_device_id = vera_device.device_id
+ vera_device.comm_failure = False
vera_device.name = "dev1"
vera_device.category = category
setattr(vera_device, class_property, "33")
@@ -178,6 +179,7 @@ async def test_scene_controller_sensor(
vera_device = MagicMock(spec=pv.VeraSensor) # type: pv.VeraSensor
vera_device.device_id = 1
vera_device.vera_device_id = vera_device.device_id
+ vera_device.comm_failure = False
vera_device.name = "dev1"
vera_device.category = pv.CATEGORY_SCENE_CONTROLLER
vera_device.get_last_scene_id = MagicMock(return_value="id0")
diff --git a/tests/components/vera/test_switch.py b/tests/components/vera/test_switch.py
index b61564c56bc..ac90edc9ded 100644
--- a/tests/components/vera/test_switch.py
+++ b/tests/components/vera/test_switch.py
@@ -15,6 +15,7 @@ async def test_switch(
vera_device = MagicMock(spec=pv.VeraSwitch) # type: pv.VeraSwitch
vera_device.device_id = 1
vera_device.vera_device_id = vera_device.device_id
+ vera_device.comm_failure = False
vera_device.name = "dev1"
vera_device.category = pv.CATEGORY_SWITCH
vera_device.is_switched_on = MagicMock(return_value=False)
--
GitLab