Add UniFi Uptime sensor (#40058)
* Added UniFi Uptime sensor Added the UniFi uptime data as a sensor. Untested. * Update sensor.py Updated code as a result of the tests. * Changed timestamp format and device class Converted state to iso timestamp and changed device class to DEVICE_CLASS_TIMESTAMP. * Updated unit of measurement to None * Added import * Update homeassistant/components/unifi/sensor.py Co-authored-by: Martin Hjelmare <marhje52@gmail.com> * Removed whitespace * Added the uptime sensors option to the config flow * All the unit tests should be there now * Whoops * Fixed translation * Properly formatted the code * Flake8 really has angel eyes * Black should also be satisfied now * Should have satisfied all static code analysis tools * Fixed add uptime sensor function * Fixed overintendation * Fixed unit tests * Made a spelling mistake during editing of unit tests * Test verifies if utc time is correct * Converted to iso format * Converted unit test to iso format * Unit test sensor json had the wrong uptime name * Added options_updated handler * Fixed remove sensors unit test * Update homeassistant/components/unifi/sensor.py Co-authored-by: Robert Svensson <Kane610@users.noreply.github.com> * Update homeassistant/components/unifi/sensor.py Co-authored-by: Robert Svensson <Kane610@users.noreply.github.com> * Update test_device_tracker.py Removed uptime from the devices * Fixed black formatting issue * I think the code coverage should be good now * Trying to add the sensors again * Using signals to hopefully trigger the controller to add them again * Forgot import * Sorted components * fixed isort comments * Removed CLASS and DEVICE_CLASS * Added TYPE again * Removed double underscores Co-authored-by: Martin Hjelmare <marhje52@gmail.com> Co-authored-by: Robert Svensson <Kane610@users.noreply.github.com>
This commit is contained in:
9 files changed
+163
-15
No files matched your search
@@ -8,10 +8,12 @@ from homeassistant.components.device_tracker import DOMAIN as TRACKER_DOMAIN
|
||||
from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
|
||||
from homeassistant.components.unifi.const import (
|
||||
CONF_ALLOW_BANDWIDTH_SENSORS,
|
||||
CONF_ALLOW_UPTIME_SENSORS,
|
||||
CONF_TRACK_CLIENTS,
|
||||
CONF_TRACK_DEVICES,
|
||||
DOMAIN as UNIFI_DOMAIN,
|
||||
)
|
||||
from homeassistant.helpers.dispatcher import async_dispatcher_send
|
||||
from homeassistant.setup import async_setup_component
|
||||
|
||||
from .test_controller import setup_unifi_integration
|
||||
@@ -29,6 +31,7 @@ CLIENTS = [
|
||||
"sw_port": 1,
|
||||
"wired-rx_bytes": 1234000000,
|
||||
"wired-tx_bytes": 5678000000,
|
||||
"uptime": 1600094505,
|
||||
},
|
||||
{
|
||||
"hostname": "Wireless client hostname",
|
||||
@@ -42,6 +45,7 @@ CLIENTS = [
|
||||
"sw_port": 2,
|
||||
"rx_bytes": 1234000000,
|
||||
"tx_bytes": 5678000000,
|
||||
"uptime": 1600094505,
|
||||
},
|
||||
]
|
||||
|
||||
@@ -61,7 +65,10 @@ async def test_no_clients(hass):
|
||||
"""Test the update_clients function when no clients are found."""
|
||||
controller = await setup_unifi_integration(
|
||||
hass,
|
||||
options={CONF_ALLOW_BANDWIDTH_SENSORS: True},
|
||||
options={
|
||||
CONF_ALLOW_BANDWIDTH_SENSORS: True,
|
||||
CONF_ALLOW_UPTIME_SENSORS: True,
|
||||
},
|
||||
)
|
||||
|
||||
assert len(controller.mock_requests) == 4
|
||||
@@ -74,6 +81,7 @@ async def test_sensors(hass):
|
||||
hass,
|
||||
options={
|
||||
CONF_ALLOW_BANDWIDTH_SENSORS: True,
|
||||
CONF_ALLOW_UPTIME_SENSORS: True,
|
||||
CONF_TRACK_CLIENTS: False,
|
||||
CONF_TRACK_DEVICES: False,
|
||||
},
|
||||
@@ -81,7 +89,7 @@ async def test_sensors(hass):
|
||||
)
|
||||
|
||||
assert len(controller.mock_requests) == 4
|
||||
assert len(hass.states.async_entity_ids(SENSOR_DOMAIN)) == 4
|
||||
assert len(hass.states.async_entity_ids(SENSOR_DOMAIN)) == 6
|
||||
|
||||
wired_client_rx = hass.states.get("sensor.wired_client_name_rx")
|
||||
assert wired_client_rx.state == "1234.0"
|
||||
@@ -89,16 +97,23 @@ async def test_sensors(hass):
|
||||
wired_client_tx = hass.states.get("sensor.wired_client_name_tx")
|
||||
assert wired_client_tx.state == "5678.0"
|
||||
|
||||
wired_client_uptime = hass.states.get("sensor.wired_client_name_uptime")
|
||||
assert wired_client_uptime.state == "2020-09-14T14:41:45+00:00"
|
||||
|
||||
wireless_client_rx = hass.states.get("sensor.wireless_client_name_rx")
|
||||
assert wireless_client_rx.state == "1234.0"
|
||||
|
||||
wireless_client_tx = hass.states.get("sensor.wireless_client_name_tx")
|
||||
assert wireless_client_tx.state == "5678.0"
|
||||
|
||||
wireless_client_uptime = hass.states.get("sensor.wireless_client_name_uptime")
|
||||
assert wireless_client_uptime.state == "2020-09-14T14:41:45+00:00"
|
||||
|
||||
clients = deepcopy(CLIENTS)
|
||||
clients[0]["is_wired"] = False
|
||||
clients[1]["rx_bytes"] = 2345000000
|
||||
clients[1]["tx_bytes"] = 6789000000
|
||||
clients[1]["uptime"] = 1600180860
|
||||
|
||||
event = {"meta": {"message": MESSAGE_CLIENT}, "data": clients}
|
||||
controller.api.message_handler(event)
|
||||
@@ -110,9 +125,15 @@ async def test_sensors(hass):
|
||||
wireless_client_tx = hass.states.get("sensor.wireless_client_name_tx")
|
||||
assert wireless_client_tx.state == "6789.0"
|
||||
|
||||
wireless_client_uptime = hass.states.get("sensor.wireless_client_name_uptime")
|
||||
assert wireless_client_uptime.state == "2020-09-15T14:41:00+00:00"
|
||||
|
||||
hass.config_entries.async_update_entry(
|
||||
controller.config_entry,
|
||||
options={CONF_ALLOW_BANDWIDTH_SENSORS: False},
|
||||
options={
|
||||
CONF_ALLOW_BANDWIDTH_SENSORS: False,
|
||||
CONF_ALLOW_UPTIME_SENSORS: False,
|
||||
},
|
||||
)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
@@ -122,9 +143,18 @@ async def test_sensors(hass):
|
||||
wireless_client_tx = hass.states.get("sensor.wireless_client_name_tx")
|
||||
assert wireless_client_tx is None
|
||||
|
||||
wired_client_uptime = hass.states.get("sensor.wired_client_name_uptime")
|
||||
assert wired_client_uptime is None
|
||||
|
||||
wireless_client_uptime = hass.states.get("sensor.wireless_client_name_uptime")
|
||||
assert wireless_client_uptime is None
|
||||
|
||||
hass.config_entries.async_update_entry(
|
||||
controller.config_entry,
|
||||
options={CONF_ALLOW_BANDWIDTH_SENSORS: True},
|
||||
options={
|
||||
CONF_ALLOW_BANDWIDTH_SENSORS: True,
|
||||
CONF_ALLOW_UPTIME_SENSORS: True,
|
||||
},
|
||||
)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
@@ -134,15 +164,42 @@ async def test_sensors(hass):
|
||||
wireless_client_tx = hass.states.get("sensor.wireless_client_name_tx")
|
||||
assert wireless_client_tx.state == "6789.0"
|
||||
|
||||
wireless_client_uptime = hass.states.get("sensor.wireless_client_name_uptime")
|
||||
assert wireless_client_uptime.state == "2020-09-15T14:41:00+00:00"
|
||||
|
||||
wired_client_uptime = hass.states.get("sensor.wired_client_name_uptime")
|
||||
assert wired_client_uptime.state == "2020-09-14T14:41:45+00:00"
|
||||
|
||||
# Try to add the sensors again, using a signal
|
||||
clients_connected = set()
|
||||
devices_connected = set()
|
||||
|
||||
clients_connected.add(clients[0]["mac"])
|
||||
clients_connected.add(clients[1]["mac"])
|
||||
|
||||
async_dispatcher_send(
|
||||
hass,
|
||||
controller.signal_update,
|
||||
clients_connected,
|
||||
devices_connected,
|
||||
)
|
||||
|
||||
await hass.async_block_till_done()
|
||||
|
||||
assert len(hass.states.async_entity_ids(SENSOR_DOMAIN)) == 6
|
||||
|
||||
|
||||
async def test_remove_sensors(hass):
|
||||
"""Test the remove_items function with some clients."""
|
||||
controller = await setup_unifi_integration(
|
||||
hass,
|
||||
options={CONF_ALLOW_BANDWIDTH_SENSORS: True},
|
||||
options={
|
||||
CONF_ALLOW_BANDWIDTH_SENSORS: True,
|
||||
CONF_ALLOW_UPTIME_SENSORS: True,
|
||||
},
|
||||
clients_response=CLIENTS,
|
||||
)
|
||||
assert len(hass.states.async_entity_ids(SENSOR_DOMAIN)) == 4
|
||||
assert len(hass.states.async_entity_ids(SENSOR_DOMAIN)) == 6
|
||||
assert len(hass.states.async_entity_ids(TRACKER_DOMAIN)) == 2
|
||||
|
||||
wired_client_rx = hass.states.get("sensor.wired_client_name_rx")
|
||||
@@ -150,11 +207,17 @@ async def test_remove_sensors(hass):
|
||||
wired_client_tx = hass.states.get("sensor.wired_client_name_tx")
|
||||
assert wired_client_tx is not None
|
||||
|
||||
wired_client_uptime = hass.states.get("sensor.wired_client_name_uptime")
|
||||
assert wired_client_uptime is not None
|
||||
|
||||
wireless_client_rx = hass.states.get("sensor.wireless_client_name_rx")
|
||||
assert wireless_client_rx is not None
|
||||
wireless_client_tx = hass.states.get("sensor.wireless_client_name_tx")
|
||||
assert wireless_client_tx is not None
|
||||
|
||||
wireless_client_uptime = hass.states.get("sensor.wireless_client_name_uptime")
|
||||
assert wireless_client_uptime is not None
|
||||
|
||||
controller.api.websocket._data = {
|
||||
"meta": {"message": MESSAGE_CLIENT_REMOVED},
|
||||
"data": [CLIENTS[0]],
|
||||
@@ -162,7 +225,7 @@ async def test_remove_sensors(hass):
|
||||
controller.api.session_handler(SIGNAL_DATA)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
assert len(hass.states.async_entity_ids(SENSOR_DOMAIN)) == 2
|
||||
assert len(hass.states.async_entity_ids(SENSOR_DOMAIN)) == 3
|
||||
assert len(hass.states.async_entity_ids(TRACKER_DOMAIN)) == 1
|
||||
|
||||
wired_client_rx = hass.states.get("sensor.wired_client_name_rx")
|
||||
@@ -170,7 +233,13 @@ async def test_remove_sensors(hass):
|
||||
wired_client_tx = hass.states.get("sensor.wired_client_name_tx")
|
||||
assert wired_client_tx is None
|
||||
|
||||
wired_client_uptime = hass.states.get("sensor.wired_client_name_uptime")
|
||||
assert wired_client_uptime is None
|
||||
|
||||
wireless_client_rx = hass.states.get("sensor.wireless_client_name_rx")
|
||||
assert wireless_client_rx is not None
|
||||
wireless_client_tx = hass.states.get("sensor.wireless_client_name_tx")
|
||||
assert wireless_client_tx is not None
|
||||
|
||||
wireless_client_uptime = hass.states.get("sensor.wireless_client_name_uptime")
|
||||
assert wireless_client_uptime is not None
|
||||
Reference in new issue
Block a user