diff --git a/.coveragerc b/.coveragerc index 20be7adbd9455..0cc2193820d31 100644 --- a/.coveragerc +++ b/.coveragerc @@ -475,6 +475,7 @@ omit = homeassistant/components/onewire/sensor.py homeassistant/components/onkyo/media_player.py homeassistant/components/onvif/camera.py + homeassistant/components/onvif/const.py homeassistant/components/opencv/* homeassistant/components/openevse/sensor.py homeassistant/components/openexchangerates/sensor.py diff --git a/homeassistant/components/camera/services.yaml b/homeassistant/components/camera/services.yaml index 4c2d89db86d2d..d876a75b0a884 100644 --- a/homeassistant/components/camera/services.yaml +++ b/homeassistant/components/camera/services.yaml @@ -77,19 +77,3 @@ local_file_update_file_path: file_path: description: Path to the new image file. example: '/images/newimage.jpg' - -onvif_ptz: - description: Pan/Tilt/Zoom service for ONVIF camera. - fields: - entity_id: - description: Name(s) of entities to pan, tilt or zoom. - example: 'camera.living_room_camera' - pan: - description: "Direction of pan. Allowed values: LEFT, RIGHT." - example: 'LEFT' - tilt: - description: "Direction of tilt. Allowed values: DOWN, UP." - example: 'DOWN' - zoom: - description: "Zoom. Allowed values: ZOOM_IN, ZOOM_OUT" - example: "ZOOM_IN" diff --git a/homeassistant/components/onvif/camera.py b/homeassistant/components/onvif/camera.py index 3f244530dca67..29d4652a4ade4 100644 --- a/homeassistant/components/onvif/camera.py +++ b/homeassistant/components/onvif/camera.py @@ -18,7 +18,6 @@ from zeep.exceptions import Fault from homeassistant.components.camera import PLATFORM_SCHEMA, SUPPORT_STREAM, Camera -from homeassistant.components.camera.const import DOMAIN from homeassistant.components.ffmpeg import CONF_EXTRA_ARGUMENTS, DATA_FFMPEG from homeassistant.const import ( ATTR_ENTITY_ID, @@ -33,35 +32,32 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.service import async_extract_entity_ids import homeassistant.util.dt as dt_util +from .const import ( + ATTR_PAN, + ATTR_TILT, + ATTR_ZOOM, + CONF_PROFILE, + DEFAULT_ARGUMENTS, + DEFAULT_NAME, + DEFAULT_PASSWORD, + DEFAULT_PORT, + DEFAULT_PROFILE, + DEFAULT_USERNAME, + DIR_DOWN, + DIR_LEFT, + DIR_RIGHT, + DIR_UP, + DOMAIN, + ENTITIES, + ONVIF_DATA, + PTZ_NONE, + SERVICE_PTZ, + ZOOM_IN, + ZOOM_OUT, +) _LOGGER = logging.getLogger(__name__) -DEFAULT_NAME = "ONVIF Camera" -DEFAULT_PORT = 5000 -DEFAULT_USERNAME = "admin" -DEFAULT_PASSWORD = "888888" -DEFAULT_ARGUMENTS = "-pred 1" -DEFAULT_PROFILE = 0 - -CONF_PROFILE = "profile" - -ATTR_PAN = "pan" -ATTR_TILT = "tilt" -ATTR_ZOOM = "zoom" - -DIR_UP = "UP" -DIR_DOWN = "DOWN" -DIR_LEFT = "LEFT" -DIR_RIGHT = "RIGHT" -ZOOM_OUT = "ZOOM_OUT" -ZOOM_IN = "ZOOM_IN" -PTZ_NONE = "NONE" - -SERVICE_PTZ = "onvif_ptz" - -ONVIF_DATA = "onvif" -ENTITIES = "entities" - PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( { vol.Required(CONF_HOST): cv.string, diff --git a/homeassistant/components/onvif/const.py b/homeassistant/components/onvif/const.py new file mode 100644 index 0000000000000..23133c9423801 --- /dev/null +++ b/homeassistant/components/onvif/const.py @@ -0,0 +1,28 @@ +"""Constants for the ONVIF Camera component.""" +DOMAIN = "onvif" + +DEFAULT_NAME = "ONVIF Camera" +DEFAULT_PORT = 5000 +DEFAULT_USERNAME = "admin" +DEFAULT_PASSWORD = "888888" +DEFAULT_ARGUMENTS = "-pred 1" +DEFAULT_PROFILE = 0 + +CONF_PROFILE = "profile" + +ATTR_PAN = "pan" +ATTR_TILT = "tilt" +ATTR_ZOOM = "zoom" + +DIR_UP = "UP" +DIR_DOWN = "DOWN" +DIR_LEFT = "LEFT" +DIR_RIGHT = "RIGHT" +ZOOM_OUT = "ZOOM_OUT" +ZOOM_IN = "ZOOM_IN" +PTZ_NONE = "NONE" + +SERVICE_PTZ = "ptz" + +ONVIF_DATA = "onvif" +ENTITIES = "entities" diff --git a/homeassistant/components/onvif/services.yaml b/homeassistant/components/onvif/services.yaml index 667538f056a7f..d85ed0a6999db 100644 --- a/homeassistant/components/onvif/services.yaml +++ b/homeassistant/components/onvif/services.yaml @@ -1,4 +1,4 @@ -onvif_ptz: +ptz: description: If your ONVIF camera supports PTZ, you will be able to pan, tilt or zoom your camera. fields: entity_id: