diff --git a/homeassistant/components/tado/__init__.py b/homeassistant/components/tado/__init__.py index 5e929548817..c7b765b32c2 100644 --- a/homeassistant/components/tado/__init__.py +++ b/homeassistant/components/tado/__init__.py @@ -6,10 +6,9 @@ import logging from PyTado.interface import Tado from requests import RequestException import requests.exceptions -import voluptuous as vol from homeassistant.components.climate.const import PRESET_AWAY, PRESET_HOME -from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry +from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import ConfigEntryNotReady @@ -35,21 +34,7 @@ TADO_COMPONENTS = ["binary_sensor", "sensor", "climate", "water_heater"] MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=10) SCAN_INTERVAL = timedelta(seconds=15) -CONFIG_SCHEMA = vol.Schema( - { - DOMAIN: vol.All( - cv.ensure_list, - [ - { - vol.Required(CONF_USERNAME): cv.string, - vol.Required(CONF_PASSWORD): cv.string, - vol.Optional(CONF_FALLBACK, default=True): cv.boolean, - } - ], - ) - }, - extra=vol.ALLOW_EXTRA, -) +CONFIG_SCHEMA = cv.deprecated(DOMAIN) async def async_setup(hass: HomeAssistant, config: dict): @@ -57,18 +42,6 @@ async def async_setup(hass: HomeAssistant, config: dict): hass.data.setdefault(DOMAIN, {}) - if DOMAIN not in config: - return True - - for conf in config[DOMAIN]: - hass.async_create_task( - hass.config_entries.flow.async_init( - DOMAIN, - context={"source": SOURCE_IMPORT}, - data=conf, - ) - ) - return True diff --git a/homeassistant/components/tado/config_flow.py b/homeassistant/components/tado/config_flow.py index 0c45cc809af..6c1f06b2626 100644 --- a/homeassistant/components/tado/config_flow.py +++ b/homeassistant/components/tado/config_flow.py @@ -98,12 +98,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): await self.async_set_unique_id(properties["id"]) return await self.async_step_user() - async def async_step_import(self, user_input): - """Handle import.""" - if self._username_already_configured(user_input): - return self.async_abort(reason="already_configured") - return await self.async_step_user(user_input) - def _username_already_configured(self, user_input): """See if we already have a username matching user input configured.""" existing_username = { diff --git a/tests/components/tado/test_config_flow.py b/tests/components/tado/test_config_flow.py index 1b0fcc268d6..c3e2bac68ca 100644 --- a/tests/components/tado/test_config_flow.py +++ b/tests/components/tado/test_config_flow.py @@ -55,38 +55,6 @@ async def test_form(hass): assert len(mock_setup_entry.mock_calls) == 1 -async def test_import(hass): - """Test we can import.""" - await setup.async_setup_component(hass, "persistent_notification", {}) - - mock_tado_api = _get_mock_tado_api(getMe={"homes": [{"id": 1, "name": "myhome"}]}) - - with patch( - "homeassistant.components.tado.config_flow.Tado", - return_value=mock_tado_api, - ), patch( - "homeassistant.components.tado.async_setup", return_value=True - ) as mock_setup, patch( - "homeassistant.components.tado.async_setup_entry", - return_value=True, - ) as mock_setup_entry: - result = await hass.config_entries.flow.async_init( - DOMAIN, - context={"source": config_entries.SOURCE_IMPORT}, - data={"username": "test-username", "password": "test-password"}, - ) - await hass.async_block_till_done() - - assert result["type"] == "create_entry" - assert result["title"] == "myhome" - assert result["data"] == { - "username": "test-username", - "password": "test-password", - } - assert len(mock_setup.mock_calls) == 1 - assert len(mock_setup_entry.mock_calls) == 1 - - async def test_form_invalid_auth(hass): """Test we handle invalid auth.""" result = await hass.config_entries.flow.async_init(