Add the ability to reload command_line platforms from yaml (#39262)
This commit is contained in:
parent
5018e53b33
commit
215e3f2dab
8 changed files with 70 additions and 4 deletions
|
@ -18,8 +18,9 @@ from homeassistant.const import (
|
||||||
CONF_VALUE_TEMPLATE,
|
CONF_VALUE_TEMPLATE,
|
||||||
)
|
)
|
||||||
import homeassistant.helpers.config_validation as cv
|
import homeassistant.helpers.config_validation as cv
|
||||||
|
from homeassistant.helpers.reload import setup_reload_service
|
||||||
|
|
||||||
from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT
|
from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, PLATFORMS
|
||||||
from .sensor import CommandSensorData
|
from .sensor import CommandSensorData
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
@ -46,6 +47,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
||||||
|
|
||||||
def setup_platform(hass, config, add_entities, discovery_info=None):
|
def setup_platform(hass, config, add_entities, discovery_info=None):
|
||||||
"""Set up the Command line Binary Sensor."""
|
"""Set up the Command line Binary Sensor."""
|
||||||
|
|
||||||
|
setup_reload_service(hass, DOMAIN, PLATFORMS)
|
||||||
|
|
||||||
name = config.get(CONF_NAME)
|
name = config.get(CONF_NAME)
|
||||||
command = config.get(CONF_COMMAND)
|
command = config.get(CONF_COMMAND)
|
||||||
payload_off = config.get(CONF_PAYLOAD_OFF)
|
payload_off = config.get(CONF_PAYLOAD_OFF)
|
||||||
|
|
|
@ -2,3 +2,5 @@
|
||||||
|
|
||||||
CONF_COMMAND_TIMEOUT = "command_timeout"
|
CONF_COMMAND_TIMEOUT = "command_timeout"
|
||||||
DEFAULT_TIMEOUT = 15
|
DEFAULT_TIMEOUT = 15
|
||||||
|
DOMAIN = "command_line"
|
||||||
|
PLATFORMS = ["binary_sensor", "cover", "sensor", "switch"]
|
||||||
|
|
|
@ -14,9 +14,10 @@ from homeassistant.const import (
|
||||||
CONF_VALUE_TEMPLATE,
|
CONF_VALUE_TEMPLATE,
|
||||||
)
|
)
|
||||||
import homeassistant.helpers.config_validation as cv
|
import homeassistant.helpers.config_validation as cv
|
||||||
|
from homeassistant.helpers.reload import setup_reload_service
|
||||||
|
|
||||||
from . import call_shell_with_timeout, check_output_or_log
|
from . import call_shell_with_timeout, check_output_or_log
|
||||||
from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT
|
from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, PLATFORMS
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -39,6 +40,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
||||||
|
|
||||||
def setup_platform(hass, config, add_entities, discovery_info=None):
|
def setup_platform(hass, config, add_entities, discovery_info=None):
|
||||||
"""Set up cover controlled by shell commands."""
|
"""Set up cover controlled by shell commands."""
|
||||||
|
|
||||||
|
setup_reload_service(hass, DOMAIN, PLATFORMS)
|
||||||
|
|
||||||
devices = config.get(CONF_COVERS, {})
|
devices = config.get(CONF_COVERS, {})
|
||||||
covers = []
|
covers = []
|
||||||
|
|
||||||
|
|
|
@ -18,9 +18,10 @@ from homeassistant.exceptions import TemplateError
|
||||||
from homeassistant.helpers import template
|
from homeassistant.helpers import template
|
||||||
import homeassistant.helpers.config_validation as cv
|
import homeassistant.helpers.config_validation as cv
|
||||||
from homeassistant.helpers.entity import Entity
|
from homeassistant.helpers.entity import Entity
|
||||||
|
from homeassistant.helpers.reload import setup_reload_service
|
||||||
|
|
||||||
from . import check_output_or_log
|
from . import check_output_or_log
|
||||||
from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT
|
from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, PLATFORMS
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -44,6 +45,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
||||||
|
|
||||||
def setup_platform(hass, config, add_entities, discovery_info=None):
|
def setup_platform(hass, config, add_entities, discovery_info=None):
|
||||||
"""Set up the Command Sensor."""
|
"""Set up the Command Sensor."""
|
||||||
|
|
||||||
|
setup_reload_service(hass, DOMAIN, PLATFORMS)
|
||||||
|
|
||||||
name = config.get(CONF_NAME)
|
name = config.get(CONF_NAME)
|
||||||
command = config.get(CONF_COMMAND)
|
command = config.get(CONF_COMMAND)
|
||||||
unit = config.get(CONF_UNIT_OF_MEASUREMENT)
|
unit = config.get(CONF_UNIT_OF_MEASUREMENT)
|
||||||
|
|
2
homeassistant/components/command_line/services.yaml
Normal file
2
homeassistant/components/command_line/services.yaml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
reload:
|
||||||
|
description: Reload all command_line entities.
|
|
@ -17,9 +17,10 @@ from homeassistant.const import (
|
||||||
CONF_VALUE_TEMPLATE,
|
CONF_VALUE_TEMPLATE,
|
||||||
)
|
)
|
||||||
import homeassistant.helpers.config_validation as cv
|
import homeassistant.helpers.config_validation as cv
|
||||||
|
from homeassistant.helpers.reload import setup_reload_service
|
||||||
|
|
||||||
from . import call_shell_with_timeout, check_output_or_log
|
from . import call_shell_with_timeout, check_output_or_log
|
||||||
from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT
|
from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, PLATFORMS
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -41,6 +42,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
||||||
|
|
||||||
def setup_platform(hass, config, add_entities, discovery_info=None):
|
def setup_platform(hass, config, add_entities, discovery_info=None):
|
||||||
"""Find and return switches controlled by shell commands."""
|
"""Find and return switches controlled by shell commands."""
|
||||||
|
|
||||||
|
setup_reload_service(hass, DOMAIN, PLATFORMS)
|
||||||
|
|
||||||
devices = config.get(CONF_SWITCHES, {})
|
devices = config.get(CONF_SWITCHES, {})
|
||||||
switches = []
|
switches = []
|
||||||
|
|
||||||
|
|
|
@ -1,16 +1,20 @@
|
||||||
"""The tests the cover command line platform."""
|
"""The tests the cover command line platform."""
|
||||||
import os
|
import os
|
||||||
|
from os import path
|
||||||
import tempfile
|
import tempfile
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
|
from asynctest.mock import patch
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from homeassistant import config as hass_config
|
||||||
import homeassistant.components.command_line.cover as cmd_rs
|
import homeassistant.components.command_line.cover as cmd_rs
|
||||||
from homeassistant.components.cover import DOMAIN
|
from homeassistant.components.cover import DOMAIN
|
||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
ATTR_ENTITY_ID,
|
ATTR_ENTITY_ID,
|
||||||
SERVICE_CLOSE_COVER,
|
SERVICE_CLOSE_COVER,
|
||||||
SERVICE_OPEN_COVER,
|
SERVICE_OPEN_COVER,
|
||||||
|
SERVICE_RELOAD,
|
||||||
SERVICE_STOP_COVER,
|
SERVICE_STOP_COVER,
|
||||||
)
|
)
|
||||||
from homeassistant.setup import async_setup_component
|
from homeassistant.setup import async_setup_component
|
||||||
|
@ -87,3 +91,39 @@ async def test_state_value(hass):
|
||||||
DOMAIN, SERVICE_STOP_COVER, {ATTR_ENTITY_ID: "cover.test"}, blocking=True
|
DOMAIN, SERVICE_STOP_COVER, {ATTR_ENTITY_ID: "cover.test"}, blocking=True
|
||||||
)
|
)
|
||||||
assert "closed" == hass.states.get("cover.test").state
|
assert "closed" == hass.states.get("cover.test").state
|
||||||
|
|
||||||
|
|
||||||
|
async def test_reload(hass):
|
||||||
|
"""Verify we can reload command_line covers."""
|
||||||
|
|
||||||
|
test_cover = {
|
||||||
|
"command_state": "echo open",
|
||||||
|
"value_template": "{{ value }}",
|
||||||
|
}
|
||||||
|
await async_setup_component(
|
||||||
|
hass,
|
||||||
|
DOMAIN,
|
||||||
|
{"cover": {"platform": "command_line", "covers": {"test": test_cover}}},
|
||||||
|
)
|
||||||
|
await hass.async_block_till_done()
|
||||||
|
|
||||||
|
assert len(hass.states.async_all()) == 1
|
||||||
|
assert hass.states.get("cover.test").state
|
||||||
|
|
||||||
|
yaml_path = path.join(
|
||||||
|
_get_fixtures_base_path(), "fixtures", "command_line/configuration.yaml",
|
||||||
|
)
|
||||||
|
with patch.object(hass_config, "YAML_CONFIG_FILE", yaml_path):
|
||||||
|
await hass.services.async_call(
|
||||||
|
"command_line", SERVICE_RELOAD, {}, blocking=True,
|
||||||
|
)
|
||||||
|
await hass.async_block_till_done()
|
||||||
|
|
||||||
|
assert len(hass.states.async_all()) == 1
|
||||||
|
|
||||||
|
assert hass.states.get("cover.test") is None
|
||||||
|
assert hass.states.get("cover.from_yaml")
|
||||||
|
|
||||||
|
|
||||||
|
def _get_fixtures_base_path():
|
||||||
|
return path.dirname(path.dirname(path.dirname(__file__)))
|
||||||
|
|
6
tests/fixtures/command_line/configuration.yaml
vendored
Normal file
6
tests/fixtures/command_line/configuration.yaml
vendored
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
cover:
|
||||||
|
- platform: command_line
|
||||||
|
covers:
|
||||||
|
from_yaml:
|
||||||
|
command_state: "echo closed"
|
||||||
|
value_template: "{{ value }}"
|
Loading…
Add table
Add a link
Reference in a new issue