jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-08-03 10:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

UniFi - Add support for 2.4/5 GHz separated SSIDs (#35062)

Browse Source
This commit is contained in:
Robert Svensson 2020-05-02 23:16:18 +02:00 committed by Paulus Schoutsen
parent f445a81a4d
commit 2f374abc58
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/unifi/config_flow.py
View File

@ -199,7 +199,12 @@ class UnifiOptionsFlowHandler(config_entries.OptionsFlow):
self.options.update(user_input) self.options.update(user_input)
return await self.async_step_client_control() return await self.async_step_client_control()
ssid_filter = {wlan: wlan for wlan in self.controller.api.wlans} ssids = list(self.controller.api.wlans) + [
f"{wlan.name}{wlan.name_combine_suffix}"
for wlan in self.controller.api.wlans.values()
if not wlan.name_combine_enabled
]
ssid_filter = {ssid: ssid for ssid in sorted(ssids)}
return self.async_show_form( return self.async_show_form(
step_id="device_tracker", step_id="device_tracker",

2
homeassistant/components/unifi/controller.py
View File

@ -188,7 +188,7 @@ class UniFiController:
elif signal == SIGNAL_DATA and data: elif signal == SIGNAL_DATA and data:
if DATA_EVENT in data: if DATA_EVENT in data:
if data[DATA_EVENT].event in ( if next(iter(data[DATA_EVENT])).event in (
WIRELESS_CLIENT_CONNECTED, WIRELESS_CLIENT_CONNECTED,
WIRELESS_GUEST_CONNECTED, WIRELESS_GUEST_CONNECTED,
): ):

2
homeassistant/components/unifi/manifest.json
View File

@ -3,7 +3,7 @@
"name": "Ubiquiti UniFi", "name": "Ubiquiti UniFi",
"config_flow": true, "config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/unifi", "documentation": "https://www.home-assistant.io/integrations/unifi",
"requirements": ["aiounifi==18"], "requirements": ["aiounifi==20"],
"codeowners": ["@kane610"], "codeowners": ["@kane610"],
"quality_scale": "platinum" "quality_scale": "platinum"
} }

2
requirements_all.txt
View File

@ -212,7 +212,7 @@ aiopylgtv==0.3.3
aioswitcher==1.1.0 aioswitcher==1.1.0
# homeassistant.components.unifi # homeassistant.components.unifi
aiounifi==18 aiounifi==20
# homeassistant.components.wwlln # homeassistant.components.wwlln
aiowwlln==2.0.2 aiowwlln==2.0.2

2
requirements_test_all.txt
View File

@ -95,7 +95,7 @@ aiopylgtv==0.3.3
aioswitcher==1.1.0 aioswitcher==1.1.0
# homeassistant.components.unifi # homeassistant.components.unifi
aiounifi==18 aiounifi==20
# homeassistant.components.wwlln # homeassistant.components.wwlln
aiowwlln==2.0.2 aiowwlln==2.0.2

9
tests/components/unifi/test_config_flow.py
View File

@ -32,7 +32,10 @@ from tests.common import MockConfigEntry
CLIENTS = [{"mac": "00:00:00:00:00:01"}] CLIENTS = [{"mac": "00:00:00:00:00:01"}]
WLANS = [{"name": "SSID 1"}, {"name": "SSID 2"}] WLANS = [
{"name": "SSID 1"},
{"name": "SSID 2", "name_combine_enabled": False, "name_combine_suffix": "_IOT"},
]
async def test_flow_works(hass, aioclient_mock, mock_discovery): async def test_flow_works(hass, aioclient_mock, mock_discovery):
@ -331,7 +334,7 @@ async def test_option_flow(hass):
CONF_TRACK_CLIENTS: False, CONF_TRACK_CLIENTS: False,
CONF_TRACK_WIRED_CLIENTS: False, CONF_TRACK_WIRED_CLIENTS: False,
CONF_TRACK_DEVICES: False, CONF_TRACK_DEVICES: False,
CONF_SSID_FILTER: ["SSID 1"], CONF_SSID_FILTER: ["SSID 1", "SSID 2_IOT"],
CONF_DETECTION_TIME: 100, CONF_DETECTION_TIME: 100,
}, },
) )
@ -356,7 +359,7 @@ async def test_option_flow(hass):
CONF_TRACK_CLIENTS: False, CONF_TRACK_CLIENTS: False,
CONF_TRACK_WIRED_CLIENTS: False, CONF_TRACK_WIRED_CLIENTS: False,
CONF_TRACK_DEVICES: False, CONF_TRACK_DEVICES: False,
CONF_SSID_FILTER: ["SSID 1"], CONF_SSID_FILTER: ["SSID 1", "SSID 2_IOT"],
CONF_DETECTION_TIME: 100, CONF_DETECTION_TIME: 100,
CONF_IGNORE_WIRED_BUG: False, CONF_IGNORE_WIRED_BUG: False,
CONF_POE_CLIENTS: False, CONF_POE_CLIENTS: False,