jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-18 02:37:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add area support to utility meter service schemas (#25442)

Browse Source 
* Add area support to utility meter service schemas

* Reverted mistaken deletion
This commit is contained in:
Aaron Bach 2019-07-23 16:43:48 -06:00 committed by GitHub
parent a8ec826ef7
commit 2fb03106ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
homeassistant/components/utility_meter/__init__.py
View File

@ -4,19 +4,20 @@ from datetime import timedelta
import voluptuous as vol import voluptuous as vol
from homeassistant.const import (ATTR_ENTITY_ID, CONF_NAME) from homeassistant.const import CONF_NAME
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers import discovery from homeassistant.helpers import discovery
from homeassistant.helpers.config_validation import ENTITY_SERVICE_SCHEMA
from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.dispatcher import async_dispatcher_send
from homeassistant.helpers.entity_component import EntityComponent from homeassistant.helpers.entity_component import EntityComponent
from homeassistant.helpers.restore_state import RestoreEntity from homeassistant.helpers.restore_state import RestoreEntity
from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
from .const import ( from .const import (
DOMAIN, SIGNAL_RESET_METER, METER_TYPES, CONF_SOURCE_SENSOR, DOMAIN, SIGNAL_RESET_METER, METER_TYPES, CONF_METER_TYPE,
CONF_METER_TYPE, CONF_METER_OFFSET, CONF_METER_NET_CONSUMPTION, CONF_METER_OFFSET, CONF_METER_NET_CONSUMPTION, CONF_SOURCE_SENSOR,
CONF_TARIFF_ENTITY, CONF_TARIFF, CONF_TARIFFS, CONF_METER, DATA_UTILITY, CONF_TARIFF_ENTITY, CONF_TARIFF, CONF_TARIFFS, CONF_METER,
SERVICE_RESET, SERVICE_SELECT_TARIFF, SERVICE_SELECT_NEXT_TARIFF, DATA_UTILITY, SERVICE_RESET, SERVICE_SELECT_TARIFF,
ATTR_TARIFF) SERVICE_SELECT_NEXT_TARIFF, ATTR_TARIFF)
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -26,15 +27,11 @@ ATTR_TARIFFS = 'tariffs'
DEFAULT_OFFSET = timedelta(hours=0) DEFAULT_OFFSET = timedelta(hours=0)
SERVICE_METER_SCHEMA = vol.Schema({ SERVICE_SELECT_TARIFF_SCHEMA = ENTITY_SERVICE_SCHEMA.extend({
vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
})
SERVICE_SELECT_TARIFF_SCHEMA = SERVICE_METER_SCHEMA.extend({
vol.Required(ATTR_TARIFF): cv.string vol.Required(ATTR_TARIFF): cv.string
}) })
METER_CONFIG_SCHEMA = vol.Schema({ METER_CONFIG_SCHEMA = ENTITY_SERVICE_SCHEMA.extend({
vol.Required(CONF_SOURCE_SENSOR): cv.entity_id, vol.Required(CONF_SOURCE_SENSOR): cv.entity_id,
vol.Optional(CONF_NAME): cv.string, vol.Optional(CONF_NAME): cv.string,
vol.Optional(CONF_METER_TYPE): vol.In(METER_TYPES), vol.Optional(CONF_METER_TYPE): vol.In(METER_TYPES),
@ -90,7 +87,7 @@ async def async_setup(hass, config):
if register_services: if register_services:
component.async_register_entity_service( component.async_register_entity_service(
SERVICE_RESET, SERVICE_METER_SCHEMA, SERVICE_RESET, ENTITY_SERVICE_SCHEMA,
'async_reset_meters' 'async_reset_meters'
) )
@ -100,7 +97,7 @@ async def async_setup(hass, config):
) )
component.async_register_entity_service( component.async_register_entity_service(
SERVICE_SELECT_NEXT_TARIFF, SERVICE_METER_SCHEMA, SERVICE_SELECT_NEXT_TARIFF, ENTITY_SERVICE_SCHEMA,
'async_next_tariff' 'async_next_tariff'
) )