diff --git a/homeassistant/components/mqtt/light/schema_basic.py b/homeassistant/components/mqtt/light/schema_basic.py index b56c06a43e0..8ad553ddd74 100644 --- a/homeassistant/components/mqtt/light/schema_basic.py +++ b/homeassistant/components/mqtt/light/schema_basic.py @@ -221,12 +221,22 @@ _PLATFORM_SCHEMA_BASE = ( ) PLATFORM_SCHEMA_BASIC = vol.All( + # CONF_WHITE_VALUE_* is deprecated, support will be removed in release 2022.9 + cv.deprecated(CONF_WHITE_VALUE_COMMAND_TOPIC), + cv.deprecated(CONF_WHITE_VALUE_SCALE), + cv.deprecated(CONF_WHITE_VALUE_STATE_TOPIC), + cv.deprecated(CONF_WHITE_VALUE_TEMPLATE), _PLATFORM_SCHEMA_BASE, ) DISCOVERY_SCHEMA_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 deprecated, support will be removed in release 2022.9 + cv.deprecated(CONF_WHITE_VALUE_COMMAND_TOPIC), + cv.deprecated(CONF_WHITE_VALUE_SCALE), + cv.deprecated(CONF_WHITE_VALUE_STATE_TOPIC), + cv.deprecated(CONF_WHITE_VALUE_TEMPLATE), _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA), ) diff --git a/homeassistant/components/mqtt/light/schema_json.py b/homeassistant/components/mqtt/light/schema_json.py index 68cc7e8b36c..2433bdf1679 100644 --- a/homeassistant/components/mqtt/light/schema_json.py +++ b/homeassistant/components/mqtt/light/schema_json.py @@ -149,11 +149,15 @@ _PLATFORM_SCHEMA_BASE = ( ) PLATFORM_SCHEMA_JSON = vol.All( + # CONF_WHITE_VALUE is deprecated, support will be removed in release 2022.9 + cv.deprecated(CONF_WHITE_VALUE), _PLATFORM_SCHEMA_BASE, valid_color_configuration, ) DISCOVERY_SCHEMA_JSON = vol.All( + # CONF_WHITE_VALUE is deprecated, support will be removed in release 2022.9 + cv.deprecated(CONF_WHITE_VALUE), _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA), valid_color_configuration, ) diff --git a/homeassistant/components/mqtt/light/schema_template.py b/homeassistant/components/mqtt/light/schema_template.py index 4f25bde928d..b82474db2a3 100644 --- a/homeassistant/components/mqtt/light/schema_template.py +++ b/homeassistant/components/mqtt/light/schema_template.py @@ -68,7 +68,7 @@ CONF_MIN_MIREDS = "min_mireds" CONF_RED_TEMPLATE = "red_template" CONF_WHITE_VALUE_TEMPLATE = "white_value_template" -PLATFORM_SCHEMA_TEMPLATE = ( +_PLATFORM_SCHEMA_BASE = ( mqtt.MQTT_RW_PLATFORM_SCHEMA.extend( { vol.Optional(CONF_BLUE_TEMPLATE): cv.template, @@ -92,7 +92,17 @@ PLATFORM_SCHEMA_TEMPLATE = ( .extend(MQTT_LIGHT_SCHEMA_SCHEMA.schema) ) -DISCOVERY_SCHEMA_TEMPLATE = PLATFORM_SCHEMA_TEMPLATE.extend({}, extra=vol.REMOVE_EXTRA) +PLATFORM_SCHEMA_TEMPLATE = vol.All( + # CONF_WHITE_VALUE_TEMPLATE is deprecated, support will be removed in release 2022.9 + cv.deprecated(CONF_WHITE_VALUE_TEMPLATE), + _PLATFORM_SCHEMA_BASE, +) + +DISCOVERY_SCHEMA_TEMPLATE = vol.All( + # CONF_WHITE_VALUE_TEMPLATE is deprecated, support will be removed in release 2022.9 + cv.deprecated(CONF_WHITE_VALUE_TEMPLATE), + _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA), +) async def async_setup_entity_template(