github/ha-core
1
Fork 0
mirror of https://github.com/home-assistant/core synced 2024-08-02 23:40:32 +02:00
Code Releases Activity

Add cv.deprecated to MQTT modern schema's too (#76884)

Browse Source 
Add cv.deprcated to modern schema too
This commit is contained in:
Jan Bouwhuis 2022-08-19 11:12:47 +02:00 committed by GitHub
parent a5e151691c
commit 90aba6c523
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/mqtt/climate.py
View File

@ -286,13 +286,6 @@ _PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
PLATFORM_SCHEMA_MODERN = vol.All(
_PLATFORM_SCHEMA_BASE,
valid_preset_mode_configuration,
)
# Configuring MQTT Climate under the climate platform key is deprecated in HA Core 2022.6
PLATFORM_SCHEMA = vol.All(
cv.PLATFORM_SCHEMA.extend(_PLATFORM_SCHEMA_BASE.schema),
# Support CONF_SEND_IF_OFF is removed with release 2022.9
cv.removed(CONF_SEND_IF_OFF),
# AWAY and HOLD mode topics and templates are no longer supported, support was removed with release 2022.9
@ -304,6 +297,13 @@ PLATFORM_SCHEMA = vol.All(
cv.removed(CONF_HOLD_STATE_TEMPLATE),
cv.removed(CONF_HOLD_STATE_TOPIC),
cv.removed(CONF_HOLD_LIST),
_PLATFORM_SCHEMA_BASE,
valid_preset_mode_configuration,
)
# Configuring MQTT Climate under the climate platform key is deprecated in HA Core 2022.6
PLATFORM_SCHEMA = vol.All(
cv.PLATFORM_SCHEMA.extend(_PLATFORM_SCHEMA_BASE.schema),
valid_preset_mode_configuration,
warn_for_legacy_schema(climate.DOMAIN),
)

1
homeassistant/components/mqtt/cover.py
View File

@ -200,6 +200,7 @@ _PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
PLATFORM_SCHEMA_MODERN = vol.All(
cv.removed("tilt_invert_state"),
_PLATFORM_SCHEMA_BASE,
validate_options,
)

10
homeassistant/components/mqtt/fan.py
View File

@ -186,6 +186,16 @@ PLATFORM_SCHEMA = vol.All(
)
PLATFORM_SCHEMA_MODERN = vol.All(
# CONF_SPEED_COMMAND_TOPIC, CONF_SPEED_LIST, CONF_SPEED_STATE_TOPIC, CONF_SPEED_VALUE_TEMPLATE and
# Speeds SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH SPEED_OFF,
# are no longer supported, support was removed in release 2021.12
cv.removed(CONF_PAYLOAD_HIGH_SPEED),
cv.removed(CONF_PAYLOAD_LOW_SPEED),
cv.removed(CONF_PAYLOAD_MEDIUM_SPEED),
cv.removed(CONF_SPEED_COMMAND_TOPIC),
cv.removed(CONF_SPEED_LIST),
cv.removed(CONF_SPEED_STATE_TOPIC),
cv.removed(CONF_SPEED_VALUE_TEMPLATE),
_PLATFORM_SCHEMA_BASE,
valid_speed_range_configuration,
valid_preset_mode_configuration,

11
homeassistant/components/mqtt/light/schema_basic.py
View File

@ -224,7 +224,16 @@ DISCOVERY_SCHEMA_BASIC = vol.All(
_PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
)
PLATFORM_SCHEMA_MODERN_BASIC = _PLATFORM_SCHEMA_BASE
PLATFORM_SCHEMA_MODERN_BASIC = vol.All(
# CONF_VALUE_TEMPLATE is no longer supported, support was removed in 2022.2
cv.removed(CONF_VALUE_TEMPLATE),
# CONF_WHITE_VALUE_* is no longer supported, support was removed in 2022.9
cv.removed(CONF_WHITE_VALUE_COMMAND_TOPIC),
cv.removed(CONF_WHITE_VALUE_SCALE),
cv.removed(CONF_WHITE_VALUE_STATE_TOPIC),
cv.removed(CONF_WHITE_VALUE_TEMPLATE),
_PLATFORM_SCHEMA_BASE,
)
async def async_setup_entity_basic(

2
homeassistant/components/mqtt/light/schema_json.py
View File

@ -167,6 +167,8 @@ DISCOVERY_SCHEMA_JSON = vol.All(
)
PLATFORM_SCHEMA_MODERN_JSON = vol.All(
# CONF_WHITE_VALUE is no longer supported, support was removed in 2022.9
cv.removed(CONF_WHITE_VALUE),
_PLATFORM_SCHEMA_BASE,
valid_color_configuration,
)

6
homeassistant/components/mqtt/light/schema_template.py
View File

@ -99,7 +99,11 @@ DISCOVERY_SCHEMA_TEMPLATE = vol.All(
_PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
)
PLATFORM_SCHEMA_MODERN_TEMPLATE = _PLATFORM_SCHEMA_BASE
PLATFORM_SCHEMA_MODERN_TEMPLATE = vol.All(
# CONF_WHITE_VALUE_TEMPLATE is no longer supported, support was removed in 2022.9
cv.removed(CONF_WHITE_VALUE_TEMPLATE),
_PLATFORM_SCHEMA_BASE,
)
async def async_setup_entity_template(