From 2bb42f48aa1dd6768357b39e1262c39115f95534 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Tue, 29 Mar 2022 10:01:10 +0200 Subject: [PATCH] Add CONF_MODEL to core constants (#68806) * Add CONF_MODEL to core constants * Use CONF_MODEL in SamsungTV Co-authored-by: epenet --- homeassistant/components/samsungtv/__init__.py | 2 +- homeassistant/components/samsungtv/bridge.py | 2 +- homeassistant/components/samsungtv/config_flow.py | 2 +- homeassistant/components/samsungtv/const.py | 1 - homeassistant/components/samsungtv/media_player.py | 10 ++++++++-- homeassistant/const.py | 1 + tests/components/samsungtv/const.py | 7 ++----- tests/components/samsungtv/test_config_flow.py | 2 +- tests/components/samsungtv/test_media_player.py | 2 +- 9 files changed, 16 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/samsungtv/__init__.py b/homeassistant/components/samsungtv/__init__.py index b141d78fb9a..dae4033ad4c 100644 --- a/homeassistant/components/samsungtv/__init__.py +++ b/homeassistant/components/samsungtv/__init__.py @@ -17,6 +17,7 @@ from homeassistant.const import ( CONF_HOST, CONF_MAC, CONF_METHOD, + CONF_MODEL, CONF_NAME, CONF_PORT, CONF_TOKEN, @@ -31,7 +32,6 @@ from homeassistant.helpers.typing import ConfigType from .bridge import SamsungTVBridge, async_get_device_info, mac_from_device_info from .const import ( - CONF_MODEL, CONF_ON_ACTION, CONF_SESSION_ID, CONF_SSDP_MAIN_TV_AGENT_LOCATION, diff --git a/homeassistant/components/samsungtv/bridge.py b/homeassistant/components/samsungtv/bridge.py index 9fb9fc0fe9b..ab88824b77b 100644 --- a/homeassistant/components/samsungtv/bridge.py +++ b/homeassistant/components/samsungtv/bridge.py @@ -36,6 +36,7 @@ from homeassistant.const import ( CONF_HOST, CONF_ID, CONF_METHOD, + CONF_MODEL, CONF_NAME, CONF_PORT, CONF_TIMEOUT, @@ -47,7 +48,6 @@ from homeassistant.helpers.device_registry import format_mac from .const import ( CONF_DESCRIPTION, - CONF_MODEL, CONF_SESSION_ID, ENCRYPTED_WEBSOCKET_PORT, LEGACY_PORT, diff --git a/homeassistant/components/samsungtv/config_flow.py b/homeassistant/components/samsungtv/config_flow.py index 2acc0d1c7d5..be71519b0c2 100644 --- a/homeassistant/components/samsungtv/config_flow.py +++ b/homeassistant/components/samsungtv/config_flow.py @@ -17,6 +17,7 @@ from homeassistant.const import ( CONF_HOST, CONF_MAC, CONF_METHOD, + CONF_MODEL, CONF_NAME, CONF_PORT, CONF_TOKEN, @@ -28,7 +29,6 @@ from homeassistant.helpers.device_registry import format_mac from .bridge import SamsungTVBridge, async_get_device_info, mac_from_device_info from .const import ( CONF_MANUFACTURER, - CONF_MODEL, CONF_SESSION_ID, CONF_SSDP_MAIN_TV_AGENT_LOCATION, CONF_SSDP_RENDERING_CONTROL_LOCATION, diff --git a/homeassistant/components/samsungtv/const.py b/homeassistant/components/samsungtv/const.py index cabd85901f6..2585d742be0 100644 --- a/homeassistant/components/samsungtv/const.py +++ b/homeassistant/components/samsungtv/const.py @@ -14,7 +14,6 @@ VALUE_CONF_ID = "ha.component.samsung" CONF_DESCRIPTION = "description" CONF_MANUFACTURER = "manufacturer" -CONF_MODEL = "model" CONF_SSDP_RENDERING_CONTROL_LOCATION = "ssdp_rendering_control_location" CONF_SSDP_MAIN_TV_AGENT_LOCATION = "ssdp_main_tv_agent_location" CONF_ON_ACTION = "turn_on_action" diff --git a/homeassistant/components/samsungtv/media_player.py b/homeassistant/components/samsungtv/media_player.py index 33a7c44d45d..225d99c0cc7 100644 --- a/homeassistant/components/samsungtv/media_player.py +++ b/homeassistant/components/samsungtv/media_player.py @@ -41,7 +41,14 @@ from homeassistant.components.media_player.const import ( SUPPORT_VOLUME_STEP, ) from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry -from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, STATE_OFF, STATE_ON +from homeassistant.const import ( + CONF_HOST, + CONF_MAC, + CONF_MODEL, + CONF_NAME, + STATE_OFF, + STATE_ON, +) from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import entity_component from homeassistant.helpers.aiohttp_client import async_get_clientsession @@ -55,7 +62,6 @@ from homeassistant.util import dt as dt_util from .bridge import SamsungTVBridge, SamsungTVWSBridge from .const import ( CONF_MANUFACTURER, - CONF_MODEL, CONF_ON_ACTION, CONF_SSDP_RENDERING_CONTROL_LOCATION, DEFAULT_NAME, diff --git a/homeassistant/const.py b/homeassistant/const.py index cf8f04ed4d9..fabdac85736 100644 --- a/homeassistant/const.py +++ b/homeassistant/const.py @@ -177,6 +177,7 @@ CONF_MEDIA_DIRS: Final = "media_dirs" CONF_METHOD: Final = "method" CONF_MINIMUM: Final = "minimum" CONF_MODE: Final = "mode" +CONF_MODEL: Final = "model" CONF_MONITORED_CONDITIONS: Final = "monitored_conditions" CONF_MONITORED_VARIABLES: Final = "monitored_variables" CONF_NAME: Final = "name" diff --git a/tests/components/samsungtv/const.py b/tests/components/samsungtv/const.py index 28e6e6a7120..a560a7dd92d 100644 --- a/tests/components/samsungtv/const.py +++ b/tests/components/samsungtv/const.py @@ -2,11 +2,7 @@ from samsungtvws.event import ED_INSTALLED_APP_EVENT from homeassistant.components import ssdp -from homeassistant.components.samsungtv.const import ( - CONF_MODEL, - CONF_SESSION_ID, - METHOD_WEBSOCKET, -) +from homeassistant.components.samsungtv.const import CONF_SESSION_ID, METHOD_WEBSOCKET from homeassistant.components.ssdp import ( ATTR_UPNP_FRIENDLY_NAME, ATTR_UPNP_MANUFACTURER, @@ -18,6 +14,7 @@ from homeassistant.const import ( CONF_IP_ADDRESS, CONF_MAC, CONF_METHOD, + CONF_MODEL, CONF_NAME, CONF_PORT, CONF_TOKEN, diff --git a/tests/components/samsungtv/test_config_flow.py b/tests/components/samsungtv/test_config_flow.py index 2d3be2e2bc1..ec4aa58d39d 100644 --- a/tests/components/samsungtv/test_config_flow.py +++ b/tests/components/samsungtv/test_config_flow.py @@ -22,7 +22,6 @@ from homeassistant import config_entries from homeassistant.components import dhcp, ssdp, zeroconf from homeassistant.components.samsungtv.const import ( CONF_MANUFACTURER, - CONF_MODEL, CONF_SESSION_ID, CONF_SSDP_MAIN_TV_AGENT_LOCATION, CONF_SSDP_RENDERING_CONTROL_LOCATION, @@ -51,6 +50,7 @@ from homeassistant.const import ( CONF_IP_ADDRESS, CONF_MAC, CONF_METHOD, + CONF_MODEL, CONF_NAME, CONF_PORT, CONF_TOKEN, diff --git a/tests/components/samsungtv/test_media_player.py b/tests/components/samsungtv/test_media_player.py index 7f9f5936f11..5d0ea5e6be0 100644 --- a/tests/components/samsungtv/test_media_player.py +++ b/tests/components/samsungtv/test_media_player.py @@ -37,7 +37,6 @@ from homeassistant.components.media_player.const import ( SUPPORT_TURN_ON, ) from homeassistant.components.samsungtv.const import ( - CONF_MODEL, CONF_ON_ACTION, CONF_SSDP_RENDERING_CONTROL_LOCATION, DOMAIN as SAMSUNGTV_DOMAIN, @@ -56,6 +55,7 @@ from homeassistant.const import ( CONF_IP_ADDRESS, CONF_MAC, CONF_METHOD, + CONF_MODEL, CONF_NAME, CONF_PORT, CONF_TIMEOUT,