UniFi config entry options (#26113)

Introduce config entry options for Unifi integration
Allow configuration.yaml options to be imported to new options
This commit is contained in:
Robert Svensson authored and GitHub committed 2019-08-21 22:22:42 +02:00
1 parent 7ab36e0381
commit 588eac82c7
12 files changed
+250 -75

No files matched your search

+18 -1
View File
@@ -37,9 +37,23 @@ ENTRY_CONFIG = {CONF_CONTROLLER: CONTROLLER_DATA}
async def test_controller_setup():
"""Successful setup."""
hass = Mock()
hass.data = {UNIFI_CONFIG: {}}
hass.data = {
UNIFI_CONFIG: [
{
CONF_HOST: CONTROLLER_DATA[CONF_HOST],
CONF_SITE_ID: "nice name",
controller.CONF_BLOCK_CLIENT: [],
controller.CONF_TRACK_CLIENTS: True,
controller.CONF_TRACK_DEVICES: True,
controller.CONF_TRACK_WIRED_CLIENTS: True,
controller.CONF_DETECTION_TIME: 300,
controller.CONF_SSID_FILTER: [],
}
]
}
entry = Mock()
entry.data = ENTRY_CONFIG
entry.options = {}
api = Mock()
api.initialize.return_value = mock_coro(True)
api.sites.return_value = mock_coro(CONTROLLER_SITES)
@@ -89,6 +103,7 @@ async def test_controller_mac():
hass.data = {UNIFI_CONFIG: {}}
entry = Mock()
entry.data = ENTRY_CONFIG
entry.options = {}
client = Mock()
client.ip = "1.2.3.4"
client.mac = "00:11:22:33:44:55"
@@ -111,6 +126,7 @@ async def test_controller_no_mac():
hass.data = {UNIFI_CONFIG: {}}
entry = Mock()
entry.data = ENTRY_CONFIG
entry.options = {}
client = Mock()
client.ip = "5.6.7.8"
api = Mock()
@@ -182,6 +198,7 @@ async def test_reset_unloads_entry_if_setup():
hass.data = {UNIFI_CONFIG: {}}
entry = Mock()
entry.data = ENTRY_CONFIG
entry.options = {}
api = Mock()
api.initialize.return_value = mock_coro(True)
api.sites.return_value = mock_coro(CONTROLLER_SITES)
+13 -11
View File
@@ -14,6 +14,7 @@ from homeassistant.components import unifi
from homeassistant.components.unifi.const import (
CONF_CONTROLLER,
CONF_SITE_ID,
CONF_SSID_FILTER,
UNIFI_CONFIG,
)
from homeassistant.const import (
@@ -133,7 +134,7 @@ def mock_controller(hass):
return controller
async def setup_controller(hass, mock_controller):
async def setup_controller(hass, mock_controller, options={}):
"""Load the UniFi switch platform with the provided controller."""
hass.config.components.add(unifi.DOMAIN)
hass.data[unifi.DOMAIN] = {CONTROLLER_ID: mock_controller}
@@ -146,6 +147,7 @@ async def setup_controller(hass, mock_controller):
config_entries.CONN_CLASS_LOCAL_POLL,
entry_id=1,
system_options={},
options=options,
)
mock_controller.config_entry = config_entry
@@ -182,9 +184,9 @@ async def test_tracked_devices(hass, mock_controller):
"""Test the update_items function with some clients."""
mock_controller.mock_client_responses.append([CLIENT_1, CLIENT_2, CLIENT_3])
mock_controller.mock_device_responses.append([DEVICE_1, DEVICE_2])
mock_controller.unifi_config = {unifi_dt.CONF_SSID_FILTER: ["ssid"]}
options = {CONF_SSID_FILTER: ["ssid"]}
await setup_controller(hass, mock_controller)
await setup_controller(hass, mock_controller, options)
assert len(mock_controller.mock_requests) == 2
assert len(hass.states.async_all()) == 5
@@ -234,7 +236,7 @@ async def test_restoring_client(hass, mock_controller):
mock_controller.mock_client_responses.append([CLIENT_2])
mock_controller.mock_device_responses.append({})
mock_controller.mock_client_all_responses.append([CLIENT_1])
mock_controller.unifi_config = {unifi.CONF_BLOCK_CLIENT: True}
options = {unifi.CONF_BLOCK_CLIENT: True}
config_entry = config_entries.ConfigEntry(
1,
@@ -263,7 +265,7 @@ async def test_restoring_client(hass, mock_controller):
config_entry=config_entry,
)
await setup_controller(hass, mock_controller)
await setup_controller(hass, mock_controller, options)
assert len(mock_controller.mock_requests) == 3
assert len(hass.states.async_all()) == 4
@@ -275,9 +277,9 @@ async def test_dont_track_clients(hass, mock_controller):
"""Test dont track clients config works."""
mock_controller.mock_client_responses.append([CLIENT_1])
mock_controller.mock_device_responses.append([DEVICE_1])
mock_controller.unifi_config = {unifi.CONF_DONT_TRACK_CLIENTS: True}
options = {unifi.controller.CONF_TRACK_CLIENTS: False}
await setup_controller(hass, mock_controller)
await setup_controller(hass, mock_controller, options)
assert len(mock_controller.mock_requests) == 2
assert len(hass.states.async_all()) == 3
@@ -293,9 +295,9 @@ async def test_dont_track_devices(hass, mock_controller):
"""Test dont track devices config works."""
mock_controller.mock_client_responses.append([CLIENT_1])
mock_controller.mock_device_responses.append([DEVICE_1])
mock_controller.unifi_config = {unifi.CONF_DONT_TRACK_DEVICES: True}
options = {unifi.controller.CONF_TRACK_DEVICES: False}
await setup_controller(hass, mock_controller)
await setup_controller(hass, mock_controller, options)
assert len(mock_controller.mock_requests) == 2
assert len(hass.states.async_all()) == 3
@@ -311,9 +313,9 @@ async def test_dont_track_wired_clients(hass, mock_controller):
"""Test dont track wired clients config works."""
mock_controller.mock_client_responses.append([CLIENT_1, CLIENT_2])
mock_controller.mock_device_responses.append({})
mock_controller.unifi_config = {unifi.CONF_DONT_TRACK_WIRED_CLIENTS: True}
options = {unifi.controller.CONF_TRACK_WIRED_CLIENTS: False}
await setup_controller(hass, mock_controller)
await setup_controller(hass, mock_controller, options)
assert len(mock_controller.mock_requests) == 2
assert len(hass.states.async_all()) == 3
+1 -2
View File
@@ -1,5 +1,4 @@
"""Test UniFi setup process."""
from datetime import timedelta
from unittest.mock import Mock, patch
from homeassistant.components import unifi
@@ -44,7 +43,7 @@ async def test_setup_with_config(hass):
unifi.CONF_HOST: "1.2.3.4",
unifi.CONF_SITE_ID: "My site",
unifi.CONF_BLOCK_CLIENT: ["12:34:56:78:90:AB"],
unifi.CONF_DETECTION_TIME: timedelta(seconds=3),
unifi.CONF_DETECTION_TIME: 3,
unifi.CONF_SSID_FILTER: ["ssid"],
}
]
+6 -7
View File
@@ -250,7 +250,7 @@ def mock_controller(hass):
return controller
async def setup_controller(hass, mock_controller):
async def setup_controller(hass, mock_controller, options={}):
"""Load the UniFi switch platform with the provided controller."""
hass.config.components.add(unifi.DOMAIN)
hass.data[unifi.DOMAIN] = {CONTROLLER_ID: mock_controller}
@@ -263,6 +263,7 @@ async def setup_controller(hass, mock_controller):
config_entries.CONN_CLASS_LOCAL_POLL,
entry_id=1,
system_options={},
options=options,
)
mock_controller.config_entry = config_entry
@@ -320,11 +321,9 @@ async def test_switches(hass, mock_controller):
mock_controller.mock_client_responses.append([CLIENT_1, CLIENT_4])
mock_controller.mock_device_responses.append([DEVICE_1])
mock_controller.mock_client_all_responses.append([BLOCKED, UNBLOCKED, CLIENT_1])
mock_controller.unifi_config = {
unifi.CONF_BLOCK_CLIENT: [BLOCKED["mac"], UNBLOCKED["mac"]]
}
options = {unifi.CONF_BLOCK_CLIENT: [BLOCKED["mac"], UNBLOCKED["mac"]]}
await setup_controller(hass, mock_controller)
await setup_controller(hass, mock_controller, options)
assert len(mock_controller.mock_requests) == 3
assert len(hass.states.async_all()) == 5
@@ -467,7 +466,7 @@ async def test_restoring_client(hass, mock_controller):
mock_controller.mock_client_responses.append([CLIENT_2])
mock_controller.mock_device_responses.append([DEVICE_1])
mock_controller.mock_client_all_responses.append([CLIENT_1])
mock_controller.unifi_config = {unifi.CONF_BLOCK_CLIENT: ["random mac"]}
options = {unifi.CONF_BLOCK_CLIENT: ["random mac"]}
config_entry = config_entries.ConfigEntry(
1,
@@ -496,7 +495,7 @@ async def test_restoring_client(hass, mock_controller):
config_entry=config_entry,
)
await setup_controller(hass, mock_controller)
await setup_controller(hass, mock_controller, options)
assert len(mock_controller.mock_requests) == 3
assert len(hass.states.async_all()) == 3