From 014aadb299b9c00c6428b6f0d7e9fb7213d34541 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Tue, 29 Mar 2022 11:12:43 +0200 Subject: [PATCH] Use new CONF_MODEL core constant (2/3) (#68831) * Use CONF_MODEL in xiaomi_miio * Use CONF_MODEL in xiaomi Co-authored-by: epenet --- homeassistant/components/xiaomi/camera.py | 2 +- .../components/xiaomi_miio/__init__.py | 3 +- .../components/xiaomi_miio/air_quality.py | 3 +- .../components/xiaomi_miio/binary_sensor.py | 2 +- .../components/xiaomi_miio/button.py | 2 +- .../components/xiaomi_miio/config_flow.py | 3 +- homeassistant/components/xiaomi_miio/const.py | 1 - .../components/xiaomi_miio/device.py | 4 +-- homeassistant/components/xiaomi_miio/fan.py | 4 +-- .../components/xiaomi_miio/humidifier.py | 3 +- homeassistant/components/xiaomi_miio/light.py | 3 +- .../components/xiaomi_miio/number.py | 3 +- .../components/xiaomi_miio/select.py | 2 +- .../components/xiaomi_miio/sensor.py | 2 +- .../components/xiaomi_miio/switch.py | 2 +- .../xiaomi_miio/test_config_flow.py | 30 +++++++++---------- tests/components/xiaomi_miio/test_vacuum.py | 2 +- 17 files changed, 31 insertions(+), 40 deletions(-) diff --git a/homeassistant/components/xiaomi/camera.py b/homeassistant/components/xiaomi/camera.py index 15d92fb714d..8b7abcd2fe6 100644 --- a/homeassistant/components/xiaomi/camera.py +++ b/homeassistant/components/xiaomi/camera.py @@ -12,6 +12,7 @@ from homeassistant.components.camera import PLATFORM_SCHEMA, Camera from homeassistant.components.ffmpeg import get_ffmpeg_manager from homeassistant.const import ( CONF_HOST, + CONF_MODEL, CONF_NAME, CONF_PASSWORD, CONF_PATH, @@ -34,7 +35,6 @@ DEFAULT_USERNAME = "root" DEFAULT_ARGUMENTS = "-pred 1" CONF_FFMPEG_ARGUMENTS = "ffmpeg_arguments" -CONF_MODEL = "model" MODEL_YI = "yi" MODEL_XIAOFANG = "xiaofang" diff --git a/homeassistant/components/xiaomi_miio/__init__.py b/homeassistant/components/xiaomi_miio/__init__.py index 1bfc9410d4d..68d3fe04653 100644 --- a/homeassistant/components/xiaomi_miio/__init__.py +++ b/homeassistant/components/xiaomi_miio/__init__.py @@ -32,7 +32,7 @@ from miio import ( from miio.gateway.gateway import GatewayException from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_HOST, CONF_TOKEN, Platform +from homeassistant.const import CONF_HOST, CONF_MODEL, CONF_TOKEN, Platform from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady from homeassistant.helpers import device_registry as dr, entity_registry as er @@ -43,7 +43,6 @@ from .const import ( CONF_DEVICE, CONF_FLOW_TYPE, CONF_GATEWAY, - CONF_MODEL, DOMAIN, KEY_COORDINATOR, KEY_DEVICE, diff --git a/homeassistant/components/xiaomi_miio/air_quality.py b/homeassistant/components/xiaomi_miio/air_quality.py index fdc62076c25..10d6c6129d3 100644 --- a/homeassistant/components/xiaomi_miio/air_quality.py +++ b/homeassistant/components/xiaomi_miio/air_quality.py @@ -5,14 +5,13 @@ from miio import AirQualityMonitor, AirQualityMonitorCGDN1, DeviceException from homeassistant.components.air_quality import AirQualityEntity from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_HOST, CONF_TOKEN +from homeassistant.const import CONF_HOST, CONF_MODEL, CONF_TOKEN from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import ( CONF_DEVICE, CONF_FLOW_TYPE, - CONF_MODEL, MODEL_AIRQUALITYMONITOR_B1, MODEL_AIRQUALITYMONITOR_CGDN1, MODEL_AIRQUALITYMONITOR_S1, diff --git a/homeassistant/components/xiaomi_miio/binary_sensor.py b/homeassistant/components/xiaomi_miio/binary_sensor.py index ca421486a35..d2f00e9805c 100644 --- a/homeassistant/components/xiaomi_miio/binary_sensor.py +++ b/homeassistant/components/xiaomi_miio/binary_sensor.py @@ -11,6 +11,7 @@ from homeassistant.components.binary_sensor import ( BinarySensorEntityDescription, ) from homeassistant.config_entries import ConfigEntry +from homeassistant.const import CONF_MODEL from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity import EntityCategory from homeassistant.helpers.entity_platform import AddEntitiesCallback @@ -19,7 +20,6 @@ from . import VacuumCoordinatorDataAttributes from .const import ( CONF_DEVICE, CONF_FLOW_TYPE, - CONF_MODEL, DOMAIN, KEY_COORDINATOR, KEY_DEVICE, diff --git a/homeassistant/components/xiaomi_miio/button.py b/homeassistant/components/xiaomi_miio/button.py index 279c72ca8af..6a69289f7ef 100644 --- a/homeassistant/components/xiaomi_miio/button.py +++ b/homeassistant/components/xiaomi_miio/button.py @@ -10,12 +10,12 @@ from homeassistant.components.button import ( ButtonEntityDescription, ) from homeassistant.config_entries import ConfigEntry +from homeassistant.const import CONF_MODEL from homeassistant.core import HomeAssistant from homeassistant.helpers.entity import EntityCategory from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import ( - CONF_MODEL, DOMAIN, KEY_COORDINATOR, KEY_DEVICE, diff --git a/homeassistant/components/xiaomi_miio/config_flow.py b/homeassistant/components/xiaomi_miio/config_flow.py index 9796cd22746..a78e01c7fae 100644 --- a/homeassistant/components/xiaomi_miio/config_flow.py +++ b/homeassistant/components/xiaomi_miio/config_flow.py @@ -9,7 +9,7 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.components import zeroconf from homeassistant.config_entries import SOURCE_REAUTH -from homeassistant.const import CONF_HOST, CONF_NAME, CONF_TOKEN +from homeassistant.const import CONF_HOST, CONF_MODEL, CONF_NAME, CONF_TOKEN from homeassistant.core import callback from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers.device_registry import format_mac @@ -24,7 +24,6 @@ from .const import ( CONF_GATEWAY, CONF_MAC, CONF_MANUAL, - CONF_MODEL, DEFAULT_CLOUD_COUNTRY, DOMAIN, MODELS_ALL, diff --git a/homeassistant/components/xiaomi_miio/const.py b/homeassistant/components/xiaomi_miio/const.py index 04a3772b29e..3577e7b9907 100644 --- a/homeassistant/components/xiaomi_miio/const.py +++ b/homeassistant/components/xiaomi_miio/const.py @@ -13,7 +13,6 @@ DOMAIN = "xiaomi_miio" CONF_FLOW_TYPE = "config_flow_device" CONF_GATEWAY = "gateway" CONF_DEVICE = "device" -CONF_MODEL = "model" CONF_MAC = "mac" CONF_CLOUD_USERNAME = "cloud_username" CONF_CLOUD_PASSWORD = "cloud_password" diff --git a/homeassistant/components/xiaomi_miio/device.py b/homeassistant/components/xiaomi_miio/device.py index 88f90ada919..dc1cf86f7df 100644 --- a/homeassistant/components/xiaomi_miio/device.py +++ b/homeassistant/components/xiaomi_miio/device.py @@ -8,7 +8,7 @@ from typing import Any, TypeVar from construct.core import ChecksumError from miio import Device, DeviceException -from homeassistant.const import ATTR_CONNECTIONS +from homeassistant.const import ATTR_CONNECTIONS, CONF_MODEL from homeassistant.helpers import device_registry as dr from homeassistant.helpers.entity import DeviceInfo, Entity from homeassistant.helpers.update_coordinator import ( @@ -16,7 +16,7 @@ from homeassistant.helpers.update_coordinator import ( DataUpdateCoordinator, ) -from .const import CONF_MAC, CONF_MODEL, DOMAIN, AuthException, SetupException +from .const import CONF_MAC, DOMAIN, AuthException, SetupException _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/xiaomi_miio/fan.py b/homeassistant/components/xiaomi_miio/fan.py index 3ad9ebb2f7d..503556171f1 100644 --- a/homeassistant/components/xiaomi_miio/fan.py +++ b/homeassistant/components/xiaomi_miio/fan.py @@ -25,7 +25,7 @@ from homeassistant.components.fan import ( FanEntity, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_ENTITY_ID +from homeassistant.const import ATTR_ENTITY_ID, CONF_MODEL from homeassistant.core import HomeAssistant, ServiceCall, callback import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity_platform import AddEntitiesCallback @@ -84,8 +84,6 @@ _LOGGER = logging.getLogger(__name__) DATA_KEY = "fan.xiaomi_miio" -CONF_MODEL = "model" - ATTR_MODE_NATURE = "Nature" ATTR_MODE_NORMAL = "Normal" diff --git a/homeassistant/components/xiaomi_miio/humidifier.py b/homeassistant/components/xiaomi_miio/humidifier.py index 7c3110e190a..9a9fe43b739 100644 --- a/homeassistant/components/xiaomi_miio/humidifier.py +++ b/homeassistant/components/xiaomi_miio/humidifier.py @@ -9,7 +9,7 @@ from miio.airhumidifier_mjjsq import OperationMode as AirhumidifierMjjsqOperatio from homeassistant.components.humidifier import HumidifierDeviceClass, HumidifierEntity from homeassistant.components.humidifier.const import SUPPORT_MODES from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_MODE +from homeassistant.const import ATTR_MODE, CONF_MODEL from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.util.percentage import percentage_to_ranged_value @@ -17,7 +17,6 @@ from homeassistant.util.percentage import percentage_to_ranged_value from .const import ( CONF_DEVICE, CONF_FLOW_TYPE, - CONF_MODEL, DOMAIN, KEY_COORDINATOR, KEY_DEVICE, diff --git a/homeassistant/components/xiaomi_miio/light.py b/homeassistant/components/xiaomi_miio/light.py index cae7bacaba4..acb726e7c05 100644 --- a/homeassistant/components/xiaomi_miio/light.py +++ b/homeassistant/components/xiaomi_miio/light.py @@ -25,7 +25,7 @@ from homeassistant.components.light import ( LightEntity, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_ENTITY_ID, CONF_HOST, CONF_TOKEN +from homeassistant.const import ATTR_ENTITY_ID, CONF_HOST, CONF_MODEL, CONF_TOKEN from homeassistant.core import HomeAssistant, ServiceCall import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import DeviceInfo @@ -36,7 +36,6 @@ from .const import ( CONF_DEVICE, CONF_FLOW_TYPE, CONF_GATEWAY, - CONF_MODEL, DOMAIN, KEY_COORDINATOR, MODELS_LIGHT_BULB, diff --git a/homeassistant/components/xiaomi_miio/number.py b/homeassistant/components/xiaomi_miio/number.py index 4ffc773d1c1..f47d80ead17 100644 --- a/homeassistant/components/xiaomi_miio/number.py +++ b/homeassistant/components/xiaomi_miio/number.py @@ -6,7 +6,7 @@ from dataclasses import dataclass from homeassistant.components.number import NumberEntity, NumberEntityDescription from homeassistant.components.number.const import DOMAIN as PLATFORM_DOMAIN from homeassistant.config_entries import ConfigEntry -from homeassistant.const import DEGREE, TIME_MINUTES +from homeassistant.const import CONF_MODEL, DEGREE, TIME_MINUTES from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import entity_registry as er from homeassistant.helpers.entity import EntityCategory @@ -15,7 +15,6 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import ( CONF_DEVICE, CONF_FLOW_TYPE, - CONF_MODEL, DOMAIN, FEATURE_FLAGS_AIRFRESH, FEATURE_FLAGS_AIRFRESH_A1, diff --git a/homeassistant/components/xiaomi_miio/select.py b/homeassistant/components/xiaomi_miio/select.py index 2b5f6f3d5fd..f2fc736ed82 100644 --- a/homeassistant/components/xiaomi_miio/select.py +++ b/homeassistant/components/xiaomi_miio/select.py @@ -12,6 +12,7 @@ from miio.fan_common import LedBrightness as FanLedBrightness from homeassistant.components.select import SelectEntity, SelectEntityDescription from homeassistant.config_entries import ConfigEntry +from homeassistant.const import CONF_MODEL from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity import EntityCategory from homeassistant.helpers.entity_platform import AddEntitiesCallback @@ -19,7 +20,6 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import ( CONF_DEVICE, CONF_FLOW_TYPE, - CONF_MODEL, DOMAIN, FEATURE_SET_LED_BRIGHTNESS, KEY_COORDINATOR, diff --git a/homeassistant/components/xiaomi_miio/sensor.py b/homeassistant/components/xiaomi_miio/sensor.py index cbab107994b..0beac2c0041 100644 --- a/homeassistant/components/xiaomi_miio/sensor.py +++ b/homeassistant/components/xiaomi_miio/sensor.py @@ -28,6 +28,7 @@ from homeassistant.const import ( CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, CONCENTRATION_PARTS_PER_MILLION, CONF_HOST, + CONF_MODEL, CONF_TOKEN, LIGHT_LUX, PERCENTAGE, @@ -49,7 +50,6 @@ from .const import ( CONF_DEVICE, CONF_FLOW_TYPE, CONF_GATEWAY, - CONF_MODEL, DOMAIN, KEY_COORDINATOR, KEY_DEVICE, diff --git a/homeassistant/components/xiaomi_miio/switch.py b/homeassistant/components/xiaomi_miio/switch.py index 1fbb1222578..968abceb57c 100644 --- a/homeassistant/components/xiaomi_miio/switch.py +++ b/homeassistant/components/xiaomi_miio/switch.py @@ -21,6 +21,7 @@ from homeassistant.const import ( ATTR_MODE, ATTR_TEMPERATURE, CONF_HOST, + CONF_MODEL, CONF_TOKEN, ) from homeassistant.core import HomeAssistant, ServiceCall, callback @@ -32,7 +33,6 @@ from .const import ( CONF_DEVICE, CONF_FLOW_TYPE, CONF_GATEWAY, - CONF_MODEL, DOMAIN, FEATURE_FLAGS_AIRFRESH, FEATURE_FLAGS_AIRFRESH_A1, diff --git a/tests/components/xiaomi_miio/test_config_flow.py b/tests/components/xiaomi_miio/test_config_flow.py index 09f0b4c0fb6..2aa27d703a1 100644 --- a/tests/components/xiaomi_miio/test_config_flow.py +++ b/tests/components/xiaomi_miio/test_config_flow.py @@ -9,7 +9,7 @@ import pytest from homeassistant import config_entries, data_entry_flow from homeassistant.components import zeroconf from homeassistant.components.xiaomi_miio import const -from homeassistant.const import CONF_HOST, CONF_NAME, CONF_TOKEN +from homeassistant.const import CONF_HOST, CONF_MODEL, CONF_NAME, CONF_TOKEN from . import TEST_MAC @@ -169,7 +169,7 @@ async def test_config_flow_gateway_success(hass): const.CONF_CLOUD_COUNTRY: None, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: TEST_MODEL, + CONF_MODEL: TEST_MODEL, const.CONF_MAC: TEST_MAC, } @@ -202,7 +202,7 @@ async def test_config_flow_gateway_cloud_success(hass): const.CONF_CLOUD_COUNTRY: TEST_CLOUD_COUNTRY, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: TEST_MODEL, + CONF_MODEL: TEST_MODEL, const.CONF_MAC: TEST_MAC, } @@ -248,7 +248,7 @@ async def test_config_flow_gateway_cloud_multiple_success(hass): const.CONF_CLOUD_COUNTRY: TEST_CLOUD_COUNTRY, CONF_HOST: TEST_HOST2, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: TEST_MODEL, + CONF_MODEL: TEST_MODEL, const.CONF_MAC: TEST_MAC2, } @@ -425,7 +425,7 @@ async def test_zeroconf_gateway_success(hass): const.CONF_CLOUD_COUNTRY: TEST_CLOUD_COUNTRY, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: TEST_MODEL, + CONF_MODEL: TEST_MODEL, const.CONF_MAC: TEST_MAC, } @@ -581,7 +581,7 @@ async def test_import_flow_success(hass): const.CONF_CLOUD_COUNTRY: None, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: const.MODELS_SWITCH[0], + CONF_MODEL: const.MODELS_SWITCH[0], const.CONF_MAC: TEST_MAC, } @@ -661,7 +661,7 @@ async def test_config_flow_step_device_manual_model_succes(hass): ): result = await hass.config_entries.flow.async_configure( result["flow_id"], - {const.CONF_MODEL: overwrite_model}, + {CONF_MODEL: overwrite_model}, ) assert result["type"] == "create_entry" @@ -673,7 +673,7 @@ async def test_config_flow_step_device_manual_model_succes(hass): const.CONF_CLOUD_COUNTRY: None, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: overwrite_model, + CONF_MODEL: overwrite_model, const.CONF_MAC: None, } @@ -717,7 +717,7 @@ async def config_flow_device_success(hass, model_to_test): const.CONF_CLOUD_COUNTRY: None, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: model_to_test, + CONF_MODEL: model_to_test, const.CONF_MAC: TEST_MAC, } @@ -763,7 +763,7 @@ async def config_flow_generic_roborock(hass): const.CONF_CLOUD_COUNTRY: None, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: DUMMY_MODEL, + CONF_MODEL: DUMMY_MODEL, const.CONF_MAC: TEST_MAC, } @@ -817,7 +817,7 @@ async def zeroconf_device_success(hass, zeroconf_name_to_test, model_to_test): const.CONF_CLOUD_COUNTRY: None, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: model_to_test, + CONF_MODEL: model_to_test, const.CONF_MAC: TEST_MAC, } @@ -860,7 +860,7 @@ async def test_options_flow(hass): const.CONF_FLOW_TYPE: const.CONF_GATEWAY, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: TEST_MODEL, + CONF_MODEL: TEST_MODEL, const.CONF_MAC: TEST_MAC, }, title=TEST_NAME, @@ -900,7 +900,7 @@ async def test_options_flow_incomplete(hass): const.CONF_FLOW_TYPE: const.CONF_GATEWAY, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: TEST_MODEL, + CONF_MODEL: TEST_MODEL, const.CONF_MAC: TEST_MAC, }, title=TEST_NAME, @@ -938,7 +938,7 @@ async def test_reauth(hass): const.CONF_FLOW_TYPE: const.CONF_GATEWAY, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: TEST_MODEL, + CONF_MODEL: TEST_MODEL, const.CONF_MAC: TEST_MAC, }, title=TEST_NAME, @@ -986,6 +986,6 @@ async def test_reauth(hass): const.CONF_CLOUD_COUNTRY: TEST_CLOUD_COUNTRY, CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, - const.CONF_MODEL: TEST_MODEL, + CONF_MODEL: TEST_MODEL, const.CONF_MAC: TEST_MAC, } diff --git a/tests/components/xiaomi_miio/test_vacuum.py b/tests/components/xiaomi_miio/test_vacuum.py index 6c8b808eb94..a2180cb8008 100644 --- a/tests/components/xiaomi_miio/test_vacuum.py +++ b/tests/components/xiaomi_miio/test_vacuum.py @@ -26,7 +26,6 @@ from homeassistant.components.xiaomi_miio.const import ( CONF_DEVICE, CONF_FLOW_TYPE, CONF_MAC, - CONF_MODEL, DOMAIN as XIAOMI_DOMAIN, MODELS_VACUUM, ) @@ -45,6 +44,7 @@ from homeassistant.const import ( ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES, CONF_HOST, + CONF_MODEL, CONF_TOKEN, STATE_UNAVAILABLE, )