diff --git a/homeassistant/components/glances/__init__.py b/homeassistant/components/glances/__init__.py index 6272015e73c..571214deb20 100644 --- a/homeassistant/components/glances/__init__.py +++ b/homeassistant/components/glances/__init__.py @@ -3,17 +3,12 @@ from datetime import timedelta import logging from glances_api import Glances, exceptions -import voluptuous as vol -from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry +from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( CONF_HOST, CONF_NAME, - CONF_PASSWORD, - CONF_PORT, CONF_SCAN_INTERVAL, - CONF_SSL, - CONF_USERNAME, CONF_VERIFY_SSL, Platform, ) @@ -23,55 +18,14 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.httpx_client import get_async_client -from homeassistant.helpers.typing import ConfigType -from .const import ( - CONF_VERSION, - DATA_UPDATED, - DEFAULT_HOST, - DEFAULT_NAME, - DEFAULT_PORT, - DEFAULT_SCAN_INTERVAL, - DEFAULT_VERSION, - DOMAIN, -) +from .const import DATA_UPDATED, DEFAULT_SCAN_INTERVAL, DOMAIN _LOGGER = logging.getLogger(__name__) PLATFORMS = [Platform.SENSOR] -GLANCES_SCHEMA = vol.All( - vol.Schema( - { - vol.Required(CONF_HOST, default=DEFAULT_HOST): cv.string, - vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, - vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, - vol.Optional(CONF_USERNAME): cv.string, - vol.Optional(CONF_PASSWORD): cv.string, - vol.Optional(CONF_SSL, default=False): cv.boolean, - vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean, - vol.Optional(CONF_VERSION, default=DEFAULT_VERSION): vol.In([2, 3]), - } - ) -) - -CONFIG_SCHEMA = vol.Schema( - vol.All(cv.deprecated(DOMAIN), {DOMAIN: vol.All(cv.ensure_list, [GLANCES_SCHEMA])}), - extra=vol.ALLOW_EXTRA, -) - - -async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: - """Configure Glances using config flow only.""" - if DOMAIN in config: - for entry in config[DOMAIN]: - hass.async_create_task( - hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_IMPORT}, data=entry - ) - ) - - return True +CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False) async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool: diff --git a/homeassistant/components/glances/config_flow.py b/homeassistant/components/glances/config_flow.py index 1ee7c2fa476..72bfa6dd917 100644 --- a/homeassistant/components/glances/config_flow.py +++ b/homeassistant/components/glances/config_flow.py @@ -82,11 +82,6 @@ class GlancesFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): step_id="user", data_schema=DATA_SCHEMA, errors=errors ) - async def async_step_import(self, import_config): - """Import from Glances sensor config.""" - - return await self.async_step_user(user_input=import_config) - class GlancesOptionsFlowHandler(config_entries.OptionsFlow): """Handle Glances client options."""