Cleanup MQTT schema from previous removed options (#94110)

* Cleanup removed validator schema option of #62680

* Cleanup removed climate options and abbreviations

* Removed white_value options for mqtt light

* Remove whaite value from mqtt json light

homeassistant/components/mqtt/abbreviations.py

@@ -12,9 +12,6 @@ ABBREVIATIONS = {
     "avty_mode": "availability_mode",
     "avty_t": "availability_topic",
     "avty_tpl": "availability_template",
-    "away_mode_cmd_t": "away_mode_command_topic",
-    "away_mode_stat_tpl": "away_mode_state_template",
-    "away_mode_stat_t": "away_mode_state_topic",
     "b_tpl": "blue_template",
     "bri_cmd_tpl": "brightness_command_template",
     "bri_cmd_t": "brightness_command_topic",
@@ -80,10 +77,6 @@ ABBREVIATIONS = {
     "fan_mode_stat_t": "fan_mode_state_topic",
     "frc_upd": "force_update",
     "g_tpl": "green_template",
-    "hold_cmd_tpl": "hold_command_template",
-    "hold_cmd_t": "hold_command_topic",
-    "hold_stat_tpl": "hold_state_template",
-    "hold_stat_t": "hold_state_topic",
     "hs_cmd_t": "hs_command_topic",
     "hs_cmd_tpl": "hs_command_template",
     "hs_stat_t": "hs_state_topic",
@@ -243,7 +236,6 @@ ABBREVIATIONS = {
     "tilt_clsd_val": "tilt_closed_value",
     "tilt_cmd_t": "tilt_command_topic",
     "tilt_cmd_tpl": "tilt_command_template",
-    "tilt_inv_stat": "tilt_invert_state",
     "tilt_max": "tilt_max",
     "tilt_min": "tilt_min",
     "tilt_opnd_val": "tilt_opened_value",
@@ -257,10 +249,6 @@ ABBREVIATIONS = {
     "val_tpl": "value_template",
     "whit_cmd_t": "white_command_topic",
     "whit_scl": "white_scale",
-    "whit_val_cmd_t": "white_value_command_topic",
-    "whit_val_scl": "white_value_scale",
-    "whit_val_stat_t": "white_value_state_topic",
-    "whit_val_tpl": "white_value_template",
     "xy_cmd_t": "xy_command_topic",
     "xy_cmd_tpl": "xy_command_template",
     "xy_stat_t": "xy_state_topic",

homeassistant/components/mqtt/climate.py

@@ -93,11 +93,6 @@ CONF_ACTION_TOPIC = "action_topic"
 CONF_AUX_COMMAND_TOPIC = "aux_command_topic"
 CONF_AUX_STATE_TEMPLATE = "aux_state_template"
 CONF_AUX_STATE_TOPIC = "aux_state_topic"
-# AWAY and HOLD mode topics and templates are no longer supported,
-# support was removed with release 2022.9
-CONF_AWAY_MODE_COMMAND_TOPIC = "away_mode_command_topic"
-CONF_AWAY_MODE_STATE_TEMPLATE = "away_mode_state_template"
-CONF_AWAY_MODE_STATE_TOPIC = "away_mode_state_topic"
 
 CONF_CURRENT_HUMIDITY_TEMPLATE = "current_humidity_template"
 CONF_CURRENT_HUMIDITY_TOPIC = "current_humidity_topic"
@@ -106,13 +101,6 @@ CONF_FAN_MODE_COMMAND_TOPIC = "fan_mode_command_topic"
 CONF_FAN_MODE_LIST = "fan_modes"
 CONF_FAN_MODE_STATE_TEMPLATE = "fan_mode_state_template"
 CONF_FAN_MODE_STATE_TOPIC = "fan_mode_state_topic"
-# AWAY and HOLD mode topics and templates are no longer supported,
-# support was removed with release 2022.9
-CONF_HOLD_COMMAND_TEMPLATE = "hold_command_template"
-CONF_HOLD_COMMAND_TOPIC = "hold_command_topic"
-CONF_HOLD_STATE_TEMPLATE = "hold_state_template"
-CONF_HOLD_STATE_TOPIC = "hold_state_topic"
-CONF_HOLD_LIST = "hold_modes"
 
 CONF_HUMIDITY_COMMAND_TEMPLATE = "target_humidity_command_template"
 CONF_HUMIDITY_COMMAND_TOPIC = "target_humidity_command_topic"
@@ -133,8 +121,6 @@ CONF_PRESET_MODE_COMMAND_TOPIC = "preset_mode_command_topic"
 CONF_PRESET_MODE_VALUE_TEMPLATE = "preset_mode_value_template"
 CONF_PRESET_MODE_COMMAND_TEMPLATE = "preset_mode_command_template"
 CONF_PRESET_MODES_LIST = "preset_modes"
-# Support CONF_SEND_IF_OFF is removed with release 2022.9
-CONF_SEND_IF_OFF = "send_if_off"
 CONF_SWING_MODE_COMMAND_TEMPLATE = "swing_mode_command_template"
 CONF_SWING_MODE_COMMAND_TOPIC = "swing_mode_command_topic"
 CONF_SWING_MODE_LIST = "swing_modes"
@@ -362,18 +348,6 @@ _PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
 PLATFORM_SCHEMA_MODERN = vol.All(
-    # 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
-    cv.removed(CONF_AWAY_MODE_COMMAND_TOPIC),
-    cv.removed(CONF_AWAY_MODE_STATE_TEMPLATE),
-    cv.removed(CONF_AWAY_MODE_STATE_TOPIC),
-    cv.removed(CONF_HOLD_COMMAND_TEMPLATE),
-    cv.removed(CONF_HOLD_COMMAND_TOPIC),
-    cv.removed(CONF_HOLD_STATE_TEMPLATE),
-    cv.removed(CONF_HOLD_STATE_TOPIC),
-    cv.removed(CONF_HOLD_LIST),
     # CONF_POWER_COMMAND_TOPIC, CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
     # are deprecated, support for CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
     # was already removed or never added support was deprecated with release 2023.2
@@ -391,18 +365,6 @@ _DISCOVERY_SCHEMA_BASE = _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA
 
 DISCOVERY_SCHEMA = vol.All(
     _DISCOVERY_SCHEMA_BASE,
-    # 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
-    cv.removed(CONF_AWAY_MODE_COMMAND_TOPIC),
-    cv.removed(CONF_AWAY_MODE_STATE_TEMPLATE),
-    cv.removed(CONF_AWAY_MODE_STATE_TOPIC),
-    cv.removed(CONF_HOLD_COMMAND_TEMPLATE),
-    cv.removed(CONF_HOLD_COMMAND_TOPIC),
-    cv.removed(CONF_HOLD_STATE_TEMPLATE),
-    cv.removed(CONF_HOLD_STATE_TOPIC),
-    cv.removed(CONF_HOLD_LIST),
     # CONF_POWER_COMMAND_TOPIC, CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE are deprecated,
     # support for CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE was already removed or never added
     # support was deprecated with release 2023.2 and will be removed with release 2023.8

homeassistant/components/mqtt/cover.py

@@ -200,13 +200,11 @@ _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,
 )
 
 DISCOVERY_SCHEMA = vol.All(
-    cv.removed("tilt_invert_state"),
     _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
     validate_options,
 )

homeassistant/components/mqtt/light/schema_basic.py

@@ -111,10 +111,6 @@ CONF_XY_STATE_TOPIC = "xy_state_topic"
 CONF_XY_VALUE_TEMPLATE = "xy_value_template"
 CONF_WHITE_COMMAND_TOPIC = "white_command_topic"
 CONF_WHITE_SCALE = "white_scale"
-CONF_WHITE_VALUE_COMMAND_TOPIC = "white_value_command_topic"
-CONF_WHITE_VALUE_SCALE = "white_value_scale"
-CONF_WHITE_VALUE_STATE_TOPIC = "white_value_state_topic"
-CONF_WHITE_VALUE_TEMPLATE = "white_value_template"
 CONF_ON_COMMAND_TYPE = "on_command_type"
 
 MQTT_LIGHT_ATTRIBUTES_BLOCKED = frozenset(
@@ -167,7 +163,7 @@ VALUE_TEMPLATE_KEYS = [
     CONF_XY_VALUE_TEMPLATE,
 ]
 
-_PLATFORM_SCHEMA_BASE = (
+PLATFORM_SCHEMA_MODERN_BASIC = (
     MQTT_RW_SCHEMA.extend(
         {
             vol.Optional(CONF_BRIGHTNESS_COMMAND_TEMPLATE): cv.template,
@@ -228,21 +224,7 @@ _PLATFORM_SCHEMA_BASE = (
 )
 
 DISCOVERY_SCHEMA_BASIC = vol.All(
-    # CONF_WHITE_VALUE_* is no longer supported, support was removed in 2022.9
+    PLATFORM_SCHEMA_MODERN_BASIC.extend({}, extra=vol.REMOVE_EXTRA),
-    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.extend({}, extra=vol.REMOVE_EXTRA),
-)
-
-PLATFORM_SCHEMA_MODERN_BASIC = vol.All(
-    # 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,
 )
 
 

homeassistant/components/mqtt/light/schema_json.py

@@ -101,8 +101,6 @@ CONF_FLASH_TIME_SHORT = "flash_time_short"
 CONF_MAX_MIREDS = "max_mireds"
 CONF_MIN_MIREDS = "min_mireds"
 
-CONF_WHITE_VALUE = "white_value"
-
 
 def valid_color_configuration(config: ConfigType) -> ConfigType:
     """Test color_mode is not combined with deprecated config."""
@@ -158,15 +156,11 @@ _PLATFORM_SCHEMA_BASE = (
 )
 
 DISCOVERY_SCHEMA_JSON = vol.All(
-    # CONF_WHITE_VALUE is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE),
     _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
     valid_color_configuration,
 )
 
 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,
 )

homeassistant/components/mqtt/light/schema_template.py

@@ -75,7 +75,6 @@ CONF_GREEN_TEMPLATE = "green_template"
 CONF_MAX_MIREDS = "max_mireds"
 CONF_MIN_MIREDS = "min_mireds"
 CONF_RED_TEMPLATE = "red_template"
-CONF_WHITE_VALUE_TEMPLATE = "white_value_template"
 
 COMMAND_TEMPLATES = (CONF_COMMAND_ON_TEMPLATE, CONF_COMMAND_OFF_TEMPLATE)
 VALUE_TEMPLATES = (
@@ -88,7 +87,7 @@ VALUE_TEMPLATES = (
     CONF_STATE_TEMPLATE,
 )
 
-_PLATFORM_SCHEMA_BASE = (
+PLATFORM_SCHEMA_MODERN_TEMPLATE = (
     MQTT_RW_SCHEMA.extend(
         {
             vol.Optional(CONF_BLUE_TEMPLATE): cv.template,
@@ -111,15 +110,7 @@ _PLATFORM_SCHEMA_BASE = (
 )
 
 DISCOVERY_SCHEMA_TEMPLATE = vol.All(
-    # CONF_WHITE_VALUE_TEMPLATE is no longer supported, support was removed in 2022.9
+    PLATFORM_SCHEMA_MODERN_TEMPLATE.extend({}, extra=vol.REMOVE_EXTRA),
-    cv.removed(CONF_WHITE_VALUE_TEMPLATE),
-    _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
-)
-
-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,
 )