jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename domain import in modbus (#33906)

Browse Source
This commit is contained in:
jan iversen 2020-04-09 22:15:20 +02:00 committed by GitHub
parent 4c38e6cfa5
commit 9535dd87b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/components/modbus/__init__.py
View File

@ -35,7 +35,7 @@ from .const import (
CONF_PARITY, CONF_PARITY,
CONF_STOPBITS, CONF_STOPBITS,
DEFAULT_HUB, DEFAULT_HUB,
MODBUS_DOMAIN, MODBUS_DOMAIN as DOMAIN,
SERVICE_WRITE_COIL, SERVICE_WRITE_COIL,
SERVICE_WRITE_REGISTER, SERVICE_WRITE_REGISTER,
) )
@ -68,7 +68,7 @@ ETHERNET_SCHEMA = BASE_SCHEMA.extend(
) )
CONFIG_SCHEMA = vol.Schema( CONFIG_SCHEMA = vol.Schema(
{MODBUS_DOMAIN: vol.All(cv.ensure_list, [vol.Any(SERIAL_SCHEMA, ETHERNET_SCHEMA)])}, {DOMAIN: vol.All(cv.ensure_list, [vol.Any(SERIAL_SCHEMA, ETHERNET_SCHEMA)])},
extra=vol.ALLOW_EXTRA, extra=vol.ALLOW_EXTRA,
) )
@ -95,9 +95,9 @@ SERVICE_WRITE_COIL_SCHEMA = vol.Schema(
async def async_setup(hass, config): async def async_setup(hass, config):
"""Set up Modbus component.""" """Set up Modbus component."""
hass.data[MODBUS_DOMAIN] = hub_collect = {} hass.data[DOMAIN] = hub_collect = {}
for client_config in config[MODBUS_DOMAIN]: for client_config in config[DOMAIN]:
hub_collect[client_config[CONF_NAME]] = ModbusHub(client_config, hass.loop) hub_collect[client_config[CONF_NAME]] = ModbusHub(client_config, hass.loop)
def stop_modbus(event): def stop_modbus(event):
@ -140,13 +140,13 @@ async def async_setup(hass, config):
# Register services for modbus # Register services for modbus
hass.services.async_register( hass.services.async_register(
MODBUS_DOMAIN, DOMAIN,
SERVICE_WRITE_REGISTER, SERVICE_WRITE_REGISTER,
write_register, write_register,
schema=SERVICE_WRITE_REGISTER_SCHEMA, schema=SERVICE_WRITE_REGISTER_SCHEMA,
) )
hass.services.async_register( hass.services.async_register(
MODBUS_DOMAIN, SERVICE_WRITE_COIL, write_coil, schema=SERVICE_WRITE_COIL_SCHEMA, DOMAIN, SERVICE_WRITE_COIL, write_coil, schema=SERVICE_WRITE_COIL_SCHEMA,
) )
return True return True
@ -204,7 +204,6 @@ class ModbusHub:
stopbits=self._config_stopbits, stopbits=self._config_stopbits,
bytesize=self._config_bytesize, bytesize=self._config_bytesize,
parity=self._config_parity, parity=self._config_parity,
timeout=self._config_timeout,
loop=self._loop, loop=self._loop,
) )
elif self._config_type == "rtuovertcp": elif self._config_type == "rtuovertcp":

6
tests/components/modbus/conftest.py
View File

@ -11,7 +11,7 @@ from homeassistant.components.modbus.const import (
CONF_REGISTER_TYPE, CONF_REGISTER_TYPE,
CONF_REGISTERS, CONF_REGISTERS,
DEFAULT_HUB, DEFAULT_HUB,
MODBUS_DOMAIN, MODBUS_DOMAIN as DOMAIN,
) )
from homeassistant.const import CONF_NAME, CONF_PLATFORM, CONF_SCAN_INTERVAL from homeassistant.const import CONF_NAME, CONF_PLATFORM, CONF_SCAN_INTERVAL
from homeassistant.setup import async_setup_component from homeassistant.setup import async_setup_component
@ -25,10 +25,10 @@ _LOGGER = logging.getLogger(__name__)
@pytest.fixture() @pytest.fixture()
def mock_hub(hass): def mock_hub(hass):
"""Mock hub.""" """Mock hub."""
mock_integration(hass, MockModule(MODBUS_DOMAIN)) mock_integration(hass, MockModule(DOMAIN))
hub = mock.MagicMock() hub = mock.MagicMock()
hub.name = "hub" hub.name = "hub"
hass.data[MODBUS_DOMAIN] = {DEFAULT_HUB: hub} hass.data[DOMAIN] = {DEFAULT_HUB: hub}
return hub return hub