Remove option to configure SimpliSafe scan interval (#30909)
* Enforce minimum scan interval for SimpliSafe * Remove scan interval all together * Fix tests
This commit is contained in:
parent
31996120dd
commit
847196dbe8
3 changed files with 6 additions and 36 deletions
|
@ -1,6 +1,5 @@
|
|||
"""Support for SimpliSafe alarm systems."""
|
||||
import asyncio
|
||||
from datetime import timedelta
|
||||
import logging
|
||||
|
||||
from simplipy import API
|
||||
|
@ -9,13 +8,7 @@ from simplipy.system.v3 import VOLUME_HIGH, VOLUME_LOW, VOLUME_MEDIUM, VOLUME_OF
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.config_entries import SOURCE_IMPORT
|
||||
from homeassistant.const import (
|
||||
CONF_CODE,
|
||||
CONF_PASSWORD,
|
||||
CONF_SCAN_INTERVAL,
|
||||
CONF_TOKEN,
|
||||
CONF_USERNAME,
|
||||
)
|
||||
from homeassistant.const import CONF_CODE, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
|
||||
from homeassistant.core import callback
|
||||
from homeassistant.exceptions import ConfigEntryNotReady
|
||||
from homeassistant.helpers import (
|
||||
|
@ -100,7 +93,6 @@ ACCOUNT_CONFIG_SCHEMA = vol.Schema(
|
|||
vol.Required(CONF_USERNAME): cv.string,
|
||||
vol.Required(CONF_PASSWORD): cv.string,
|
||||
vol.Optional(CONF_CODE): cv.string,
|
||||
vol.Optional(CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL): cv.time_period,
|
||||
}
|
||||
)
|
||||
|
||||
|
@ -160,7 +152,6 @@ async def async_setup(hass, config):
|
|||
CONF_USERNAME: account[CONF_USERNAME],
|
||||
CONF_PASSWORD: account[CONF_PASSWORD],
|
||||
CONF_CODE: account.get(CONF_CODE),
|
||||
CONF_SCAN_INTERVAL: account[CONF_SCAN_INTERVAL],
|
||||
},
|
||||
)
|
||||
)
|
||||
|
@ -202,7 +193,7 @@ async def async_setup_entry(hass, config_entry):
|
|||
async_dispatcher_send(hass, TOPIC_UPDATE)
|
||||
|
||||
hass.data[DOMAIN][DATA_LISTENER][config_entry.entry_id] = async_track_time_interval(
|
||||
hass, refresh, timedelta(seconds=config_entry.data[CONF_SCAN_INTERVAL])
|
||||
hass, refresh, DEFAULT_SCAN_INTERVAL
|
||||
)
|
||||
|
||||
# Register the base station for each system:
|
||||
|
|
|
@ -6,17 +6,11 @@ from simplipy.errors import SimplipyError
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant import config_entries
|
||||
from homeassistant.const import (
|
||||
CONF_CODE,
|
||||
CONF_PASSWORD,
|
||||
CONF_SCAN_INTERVAL,
|
||||
CONF_TOKEN,
|
||||
CONF_USERNAME,
|
||||
)
|
||||
from homeassistant.const import CONF_CODE, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
|
||||
from homeassistant.core import callback
|
||||
from homeassistant.helpers import aiohttp_client
|
||||
|
||||
from .const import DEFAULT_SCAN_INTERVAL, DOMAIN
|
||||
from .const import DOMAIN
|
||||
|
||||
|
||||
@callback
|
||||
|
@ -72,13 +66,7 @@ class SimpliSafeFlowHandler(config_entries.ConfigFlow):
|
|||
except SimplipyError:
|
||||
return await self._show_form({"base": "invalid_credentials"})
|
||||
|
||||
scan_interval = user_input.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
|
||||
|
||||
return self.async_create_entry(
|
||||
title=user_input[CONF_USERNAME],
|
||||
data={
|
||||
CONF_USERNAME: username,
|
||||
CONF_TOKEN: simplisafe.refresh_token,
|
||||
CONF_SCAN_INTERVAL: scan_interval.seconds,
|
||||
},
|
||||
data={CONF_USERNAME: username, CONF_TOKEN: simplisafe.refresh_token},
|
||||
)
|
||||
|
|
|
@ -1,16 +1,10 @@
|
|||
"""Define tests for the SimpliSafe config flow."""
|
||||
from datetime import timedelta
|
||||
import json
|
||||
from unittest.mock import MagicMock, PropertyMock, mock_open, patch
|
||||
|
||||
from homeassistant import data_entry_flow
|
||||
from homeassistant.components.simplisafe import DOMAIN, config_flow
|
||||
from homeassistant.const import (
|
||||
CONF_PASSWORD,
|
||||
CONF_SCAN_INTERVAL,
|
||||
CONF_TOKEN,
|
||||
CONF_USERNAME,
|
||||
)
|
||||
from homeassistant.const import CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
|
||||
|
||||
from tests.common import MockConfigEntry, mock_coro
|
||||
|
||||
|
@ -85,7 +79,6 @@ async def test_step_import(hass):
|
|||
assert result["data"] == {
|
||||
CONF_USERNAME: "user@email.com",
|
||||
CONF_TOKEN: "12345abc",
|
||||
CONF_SCAN_INTERVAL: 30,
|
||||
}
|
||||
|
||||
|
||||
|
@ -94,7 +87,6 @@ async def test_step_user(hass):
|
|||
conf = {
|
||||
CONF_USERNAME: "user@email.com",
|
||||
CONF_PASSWORD: "password",
|
||||
CONF_SCAN_INTERVAL: timedelta(seconds=90),
|
||||
}
|
||||
|
||||
flow = config_flow.SimpliSafeFlowHandler()
|
||||
|
@ -116,5 +108,4 @@ async def test_step_user(hass):
|
|||
assert result["data"] == {
|
||||
CONF_USERNAME: "user@email.com",
|
||||
CONF_TOKEN: "12345abc",
|
||||
CONF_SCAN_INTERVAL: 90,
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue