mirror of
https://github.com/home-assistant/core.git
synced 2025-12-25 05:26:47 +00:00
Dedup and clarify imported konnected config flows (#32138)
* dedup config flows * use default (imported) options until user goes thru options flow * address pr feedback * correct key used to distinguish pro model
This commit is contained in:
Kit Klein
GitHub
@@ -3,6 +3,7 @@ from asynctest import patch
|
||||
import pytest
|
||||
|
||||
from homeassistant.components.konnected import config_flow, panel
|
||||
from homeassistant.setup import async_setup_component
|
||||
|
||||
from tests.common import MockConfigEntry
|
||||
|
||||
@@ -92,9 +93,6 @@ async def test_create_and_setup(hass, mock_panel):
|
||||
options=device_options,
|
||||
)
|
||||
entry.add_to_hass(hass)
|
||||
hass.data[panel.DOMAIN] = {
|
||||
panel.CONF_API_HOST: "192.168.1.1",
|
||||
}
|
||||
|
||||
# override get_status to reflect non-pro board
|
||||
mock_panel.get_status.return_value = {
|
||||
@@ -111,19 +109,35 @@ async def test_create_and_setup(hass, mock_panel):
|
||||
"mac": "11:22:33:44:55:66",
|
||||
"settings": {},
|
||||
}
|
||||
device = panel.AlarmPanel(hass, entry)
|
||||
await device.async_save_data()
|
||||
await device.async_connect()
|
||||
|
||||
# setup the integration and inspect panel behavior
|
||||
assert (
|
||||
await async_setup_component(
|
||||
hass,
|
||||
panel.DOMAIN,
|
||||
{
|
||||
panel.DOMAIN: {
|
||||
panel.CONF_ACCESS_TOKEN: "arandomstringvalue",
|
||||
panel.CONF_API_HOST: "http://192.168.1.1:8123",
|
||||
}
|
||||
},
|
||||
)
|
||||
is True
|
||||
)
|
||||
|
||||
# confirm panel instance was created and configured
|
||||
# hass.data is the only mechanism to get a reference to the created panel instance
|
||||
device = hass.data[panel.DOMAIN][panel.CONF_DEVICES]["112233445566"]["panel"]
|
||||
await device.update_switch("1", 0)
|
||||
|
||||
# confirm the correct api is used
|
||||
# pylint: disable=no-member
|
||||
assert device.client.put_device.call_count == 1
|
||||
assert device.client.put_zone.call_count == 0
|
||||
assert mock_panel.put_device.call_count == 1
|
||||
assert mock_panel.put_zone.call_count == 0
|
||||
|
||||
# confirm the settings are sent to the panel
|
||||
# pylint: disable=no-member
|
||||
assert device.client.put_settings.call_args_list[0][1] == {
|
||||
assert mock_panel.put_settings.call_args_list[0][1] == {
|
||||
"sensors": [{"pin": "1"}, {"pin": "2"}, {"pin": "5"}],
|
||||
"actuators": [{"trigger": 0, "pin": "8"}, {"trigger": 1, "pin": "9"}],
|
||||
"dht_sensors": [{"poll_interval": 3, "pin": "6"}],
|
||||
@@ -131,67 +145,60 @@ async def test_create_and_setup(hass, mock_panel):
|
||||
"auth_token": "11223344556677889900",
|
||||
"blink": True,
|
||||
"discovery": True,
|
||||
"endpoint": "192.168.1.1/api/konnected",
|
||||
"endpoint": "http://192.168.1.1:8123/api/konnected",
|
||||
}
|
||||
|
||||
# confirm the device settings are saved in hass.data
|
||||
assert hass.data[panel.DOMAIN][panel.CONF_DEVICES] == {
|
||||
"112233445566": {
|
||||
"binary_sensors": {
|
||||
"1": {
|
||||
"inverse": False,
|
||||
"name": "Konnected 445566 Zone 1",
|
||||
"state": None,
|
||||
"type": "door",
|
||||
},
|
||||
"2": {
|
||||
"inverse": True,
|
||||
"name": "winder",
|
||||
"state": None,
|
||||
"type": "window",
|
||||
},
|
||||
"3": {
|
||||
"inverse": False,
|
||||
"name": "Konnected 445566 Zone 3",
|
||||
"state": None,
|
||||
"type": "door",
|
||||
},
|
||||
assert device.stored_configuration == {
|
||||
"binary_sensors": {
|
||||
"1": {
|
||||
"inverse": False,
|
||||
"name": "Konnected 445566 Zone 1",
|
||||
"state": None,
|
||||
"type": "door",
|
||||
},
|
||||
"blink": True,
|
||||
"panel": device,
|
||||
"discovery": True,
|
||||
"host": "1.2.3.4",
|
||||
"port": 1234,
|
||||
"sensors": [
|
||||
{
|
||||
"name": "Konnected 445566 Sensor 4",
|
||||
"poll_interval": 3,
|
||||
"type": "dht",
|
||||
"zone": "4",
|
||||
},
|
||||
{"name": "temper", "poll_interval": 3, "type": "ds18b20", "zone": "5"},
|
||||
],
|
||||
"switches": [
|
||||
{
|
||||
"activation": "low",
|
||||
"momentary": 50,
|
||||
"name": "switcher",
|
||||
"pause": 100,
|
||||
"repeat": 4,
|
||||
"state": None,
|
||||
"zone": "out",
|
||||
},
|
||||
{
|
||||
"activation": "high",
|
||||
"momentary": None,
|
||||
"name": "Konnected 445566 Actuator 6",
|
||||
"pause": None,
|
||||
"repeat": None,
|
||||
"state": None,
|
||||
"zone": "6",
|
||||
},
|
||||
],
|
||||
}
|
||||
"2": {"inverse": True, "name": "winder", "state": None, "type": "window"},
|
||||
"3": {
|
||||
"inverse": False,
|
||||
"name": "Konnected 445566 Zone 3",
|
||||
"state": None,
|
||||
"type": "door",
|
||||
},
|
||||
},
|
||||
"blink": True,
|
||||
"panel": device,
|
||||
"discovery": True,
|
||||
"host": "1.2.3.4",
|
||||
"port": 1234,
|
||||
"sensors": [
|
||||
{
|
||||
"name": "Konnected 445566 Sensor 4",
|
||||
"poll_interval": 3,
|
||||
"type": "dht",
|
||||
"zone": "4",
|
||||
},
|
||||
{"name": "temper", "poll_interval": 3, "type": "ds18b20", "zone": "5"},
|
||||
],
|
||||
"switches": [
|
||||
{
|
||||
"activation": "low",
|
||||
"momentary": 50,
|
||||
"name": "switcher",
|
||||
"pause": 100,
|
||||
"repeat": 4,
|
||||
"state": None,
|
||||
"zone": "out",
|
||||
},
|
||||
{
|
||||
"activation": "high",
|
||||
"momentary": None,
|
||||
"name": "Konnected 445566 Actuator 6",
|
||||
"pause": None,
|
||||
"repeat": None,
|
||||
"state": None,
|
||||
"zone": "6",
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
@@ -255,23 +262,35 @@ async def test_create_and_setup_pro(hass, mock_panel):
|
||||
options=device_options,
|
||||
)
|
||||
entry.add_to_hass(hass)
|
||||
hass.data[panel.DOMAIN] = {
|
||||
panel.CONF_API_HOST: "192.168.1.1",
|
||||
}
|
||||
|
||||
device = panel.AlarmPanel(hass, entry)
|
||||
await device.async_save_data()
|
||||
await device.async_connect()
|
||||
# setup the integration and inspect panel behavior
|
||||
assert (
|
||||
await async_setup_component(
|
||||
hass,
|
||||
panel.DOMAIN,
|
||||
{
|
||||
panel.DOMAIN: {
|
||||
panel.CONF_ACCESS_TOKEN: "arandomstringvalue",
|
||||
panel.CONF_API_HOST: "http://192.168.1.1:8123",
|
||||
}
|
||||
},
|
||||
)
|
||||
is True
|
||||
)
|
||||
|
||||
# confirm panel instance was created and configured
|
||||
# hass.data is the only mechanism to get a reference to the created panel instance
|
||||
device = hass.data[panel.DOMAIN][panel.CONF_DEVICES]["112233445566"]["panel"]
|
||||
await device.update_switch("2", 1)
|
||||
|
||||
# confirm the correct api is used
|
||||
# pylint: disable=no-member
|
||||
assert device.client.put_device.call_count == 0
|
||||
assert device.client.put_zone.call_count == 1
|
||||
assert mock_panel.put_device.call_count == 0
|
||||
assert mock_panel.put_zone.call_count == 1
|
||||
|
||||
# confirm the settings are sent to the panel
|
||||
# pylint: disable=no-member
|
||||
assert device.client.put_settings.call_args_list[0][1] == {
|
||||
assert mock_panel.put_settings.call_args_list[0][1] == {
|
||||
"sensors": [{"zone": "2"}, {"zone": "6"}, {"zone": "10"}],
|
||||
"actuators": [
|
||||
{"trigger": 1, "zone": "4"},
|
||||
@@ -287,89 +306,248 @@ async def test_create_and_setup_pro(hass, mock_panel):
|
||||
"auth_token": "11223344556677889900",
|
||||
"blink": True,
|
||||
"discovery": True,
|
||||
"endpoint": "192.168.1.1/api/konnected",
|
||||
"endpoint": "http://192.168.1.1:8123/api/konnected",
|
||||
}
|
||||
|
||||
# confirm the device settings are saved in hass.data
|
||||
assert hass.data[panel.DOMAIN][panel.CONF_DEVICES] == {
|
||||
"112233445566": {
|
||||
"binary_sensors": {
|
||||
"10": {
|
||||
"inverse": False,
|
||||
"name": "Konnected 445566 Zone 10",
|
||||
"state": None,
|
||||
"type": "door",
|
||||
},
|
||||
"2": {
|
||||
"inverse": False,
|
||||
"name": "Konnected 445566 Zone 2",
|
||||
"state": None,
|
||||
"type": "door",
|
||||
},
|
||||
"6": {
|
||||
"inverse": True,
|
||||
"name": "winder",
|
||||
"state": None,
|
||||
"type": "window",
|
||||
},
|
||||
assert device.stored_configuration == {
|
||||
"binary_sensors": {
|
||||
"10": {
|
||||
"inverse": False,
|
||||
"name": "Konnected 445566 Zone 10",
|
||||
"state": None,
|
||||
"type": "door",
|
||||
},
|
||||
"blink": True,
|
||||
"panel": device,
|
||||
"discovery": True,
|
||||
"2": {
|
||||
"inverse": False,
|
||||
"name": "Konnected 445566 Zone 2",
|
||||
"state": None,
|
||||
"type": "door",
|
||||
},
|
||||
"6": {"inverse": True, "name": "winder", "state": None, "type": "window"},
|
||||
},
|
||||
"blink": True,
|
||||
"panel": device,
|
||||
"discovery": True,
|
||||
"host": "1.2.3.4",
|
||||
"port": 1234,
|
||||
"sensors": [
|
||||
{
|
||||
"name": "Konnected 445566 Sensor 3",
|
||||
"poll_interval": 3,
|
||||
"type": "dht",
|
||||
"zone": "3",
|
||||
},
|
||||
{"name": "temper", "poll_interval": 3, "type": "ds18b20", "zone": "7"},
|
||||
{
|
||||
"name": "Konnected 445566 Sensor 11",
|
||||
"poll_interval": 5,
|
||||
"type": "dht",
|
||||
"zone": "11",
|
||||
},
|
||||
],
|
||||
"switches": [
|
||||
{
|
||||
"activation": "high",
|
||||
"momentary": None,
|
||||
"name": "Konnected 445566 Actuator 4",
|
||||
"pause": None,
|
||||
"repeat": None,
|
||||
"state": None,
|
||||
"zone": "4",
|
||||
},
|
||||
{
|
||||
"activation": "low",
|
||||
"momentary": 50,
|
||||
"name": "switcher",
|
||||
"pause": 100,
|
||||
"repeat": 4,
|
||||
"state": None,
|
||||
"zone": "8",
|
||||
},
|
||||
{
|
||||
"activation": "high",
|
||||
"momentary": None,
|
||||
"name": "Konnected 445566 Actuator out1",
|
||||
"pause": None,
|
||||
"repeat": None,
|
||||
"state": None,
|
||||
"zone": "out1",
|
||||
},
|
||||
{
|
||||
"activation": "high",
|
||||
"momentary": None,
|
||||
"name": "Konnected 445566 Actuator alarm1",
|
||||
"pause": None,
|
||||
"repeat": None,
|
||||
"state": None,
|
||||
"zone": "alarm1",
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
async def test_default_options(hass, mock_panel):
|
||||
"""Test that we create a Konnected Panel and save the data."""
|
||||
device_config = config_flow.CONFIG_ENTRY_SCHEMA(
|
||||
{
|
||||
"host": "1.2.3.4",
|
||||
"port": 1234,
|
||||
"sensors": [
|
||||
"id": "112233445566",
|
||||
"model": "Konnected Pro",
|
||||
"access_token": "11223344556677889900",
|
||||
"default_options": config_flow.OPTIONS_SCHEMA(
|
||||
{
|
||||
"name": "Konnected 445566 Sensor 3",
|
||||
"poll_interval": 3,
|
||||
"type": "dht",
|
||||
"zone": "3",
|
||||
},
|
||||
{"name": "temper", "poll_interval": 3, "type": "ds18b20", "zone": "7"},
|
||||
{
|
||||
"name": "Konnected 445566 Sensor 11",
|
||||
"poll_interval": 5,
|
||||
"type": "dht",
|
||||
"zone": "11",
|
||||
},
|
||||
],
|
||||
"switches": [
|
||||
{
|
||||
"activation": "high",
|
||||
"momentary": None,
|
||||
"name": "Konnected 445566 Actuator 4",
|
||||
"pause": None,
|
||||
"repeat": None,
|
||||
"state": None,
|
||||
"zone": "4",
|
||||
},
|
||||
{
|
||||
"activation": "low",
|
||||
"momentary": 50,
|
||||
"name": "switcher",
|
||||
"pause": 100,
|
||||
"repeat": 4,
|
||||
"state": None,
|
||||
"zone": "8",
|
||||
},
|
||||
{
|
||||
"activation": "high",
|
||||
"momentary": None,
|
||||
"name": "Konnected 445566 Actuator out1",
|
||||
"pause": None,
|
||||
"repeat": None,
|
||||
"state": None,
|
||||
"zone": "out1",
|
||||
},
|
||||
{
|
||||
"activation": "high",
|
||||
"momentary": None,
|
||||
"name": "Konnected 445566 Actuator alarm1",
|
||||
"pause": None,
|
||||
"repeat": None,
|
||||
"state": None,
|
||||
"zone": "alarm1",
|
||||
},
|
||||
],
|
||||
"io": {
|
||||
"1": "Binary Sensor",
|
||||
"2": "Binary Sensor",
|
||||
"3": "Binary Sensor",
|
||||
"4": "Digital Sensor",
|
||||
"5": "Digital Sensor",
|
||||
"6": "Switchable Output",
|
||||
"out": "Switchable Output",
|
||||
},
|
||||
"binary_sensors": [
|
||||
{"zone": "1", "type": "door"},
|
||||
{
|
||||
"zone": "2",
|
||||
"type": "window",
|
||||
"name": "winder",
|
||||
"inverse": True,
|
||||
},
|
||||
{"zone": "3", "type": "door"},
|
||||
],
|
||||
"sensors": [
|
||||
{"zone": "4", "type": "dht"},
|
||||
{"zone": "5", "type": "ds18b20", "name": "temper"},
|
||||
],
|
||||
"switches": [
|
||||
{
|
||||
"zone": "out",
|
||||
"name": "switcher",
|
||||
"activation": "low",
|
||||
"momentary": 50,
|
||||
"pause": 100,
|
||||
"repeat": 4,
|
||||
},
|
||||
{"zone": "6"},
|
||||
],
|
||||
}
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
entry = MockConfigEntry(
|
||||
domain="konnected",
|
||||
title="Konnected Alarm Panel",
|
||||
data=device_config,
|
||||
options={},
|
||||
)
|
||||
entry.add_to_hass(hass)
|
||||
|
||||
# override get_status to reflect non-pro board
|
||||
mock_panel.get_status.return_value = {
|
||||
"hwVersion": "2.3.0",
|
||||
"swVersion": "2.3.1",
|
||||
"heap": 10000,
|
||||
"uptime": 12222,
|
||||
"ip": "192.168.1.90",
|
||||
"port": 9123,
|
||||
"sensors": [],
|
||||
"actuators": [],
|
||||
"dht_sensors": [],
|
||||
"ds18b20_sensors": [],
|
||||
"mac": "11:22:33:44:55:66",
|
||||
"settings": {},
|
||||
}
|
||||
|
||||
# setup the integration and inspect panel behavior
|
||||
assert (
|
||||
await async_setup_component(
|
||||
hass,
|
||||
panel.DOMAIN,
|
||||
{
|
||||
panel.DOMAIN: {
|
||||
panel.CONF_ACCESS_TOKEN: "arandomstringvalue",
|
||||
panel.CONF_API_HOST: "http://192.168.1.1:8123",
|
||||
}
|
||||
},
|
||||
)
|
||||
is True
|
||||
)
|
||||
|
||||
# confirm panel instance was created and configured.
|
||||
# hass.data is the only mechanism to get a reference to the created panel instance
|
||||
device = hass.data[panel.DOMAIN][panel.CONF_DEVICES]["112233445566"]["panel"]
|
||||
await device.update_switch("1", 0)
|
||||
|
||||
# confirm the correct api is used
|
||||
# pylint: disable=no-member
|
||||
assert mock_panel.put_device.call_count == 1
|
||||
assert mock_panel.put_zone.call_count == 0
|
||||
|
||||
# confirm the settings are sent to the panel
|
||||
# pylint: disable=no-member
|
||||
assert mock_panel.put_settings.call_args_list[0][1] == {
|
||||
"sensors": [{"pin": "1"}, {"pin": "2"}, {"pin": "5"}],
|
||||
"actuators": [{"trigger": 0, "pin": "8"}, {"trigger": 1, "pin": "9"}],
|
||||
"dht_sensors": [{"poll_interval": 3, "pin": "6"}],
|
||||
"ds18b20_sensors": [{"pin": "7"}],
|
||||
"auth_token": "11223344556677889900",
|
||||
"blink": True,
|
||||
"discovery": True,
|
||||
"endpoint": "http://192.168.1.1:8123/api/konnected",
|
||||
}
|
||||
|
||||
# confirm the device settings are saved in hass.data
|
||||
assert device.stored_configuration == {
|
||||
"binary_sensors": {
|
||||
"1": {
|
||||
"inverse": False,
|
||||
"name": "Konnected 445566 Zone 1",
|
||||
"state": None,
|
||||
"type": "door",
|
||||
},
|
||||
"2": {"inverse": True, "name": "winder", "state": None, "type": "window"},
|
||||
"3": {
|
||||
"inverse": False,
|
||||
"name": "Konnected 445566 Zone 3",
|
||||
"state": None,
|
||||
"type": "door",
|
||||
},
|
||||
},
|
||||
"blink": True,
|
||||
"panel": device,
|
||||
"discovery": True,
|
||||
"host": "1.2.3.4",
|
||||
"port": 1234,
|
||||
"sensors": [
|
||||
{
|
||||
"name": "Konnected 445566 Sensor 4",
|
||||
"poll_interval": 3,
|
||||
"type": "dht",
|
||||
"zone": "4",
|
||||
},
|
||||
{"name": "temper", "poll_interval": 3, "type": "ds18b20", "zone": "5"},
|
||||
],
|
||||
"switches": [
|
||||
{
|
||||
"activation": "low",
|
||||
"momentary": 50,
|
||||
"name": "switcher",
|
||||
"pause": 100,
|
||||
"repeat": 4,
|
||||
"state": None,
|
||||
"zone": "out",
|
||||
},
|
||||
{
|
||||
"activation": "high",
|
||||
"momentary": None,
|
||||
"name": "Konnected 445566 Actuator 6",
|
||||
"pause": None,
|
||||
"repeat": None,
|
||||
"state": None,
|
||||
"zone": "6",
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user