evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add unique ID to ONVIF camera entities (#32093)

Browse source
This commit is contained in:
Franck Nijhof 2020-02-22 22:29:49 +01:00 • committed by GitHub
parent ced870c588
commit edfb967b10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
homeassistant/components/onvif/camera.py
View file

@ -3,6 +3,7 @@ import asyncio
import datetime as dt import datetime as dt
import logging import logging
import os import os
from typing import Optional
from aiohttp.client_exceptions import ClientConnectionError, ServerDisconnectedError from aiohttp.client_exceptions import ClientConnectionError, ServerDisconnectedError
from haffmpeg.camera import CameraMjpeg from haffmpeg.camera import CameraMjpeg
@ -136,6 +137,7 @@ class ONVIFHassCamera(Camera):
self._profile_index = config.get(CONF_PROFILE) self._profile_index = config.get(CONF_PROFILE)
self._ptz_service = None self._ptz_service = None
self._input = None self._input = None
self._mac = None
_LOGGER.debug( _LOGGER.debug(
"Setting up the ONVIF camera device @ '%s:%s'", self._host, self._port "Setting up the ONVIF camera device @ '%s:%s'", self._host, self._port
@ -160,6 +162,7 @@ class ONVIFHassCamera(Camera):
_LOGGER.debug("Updating service addresses") _LOGGER.debug("Updating service addresses")
await self._camera.update_xaddrs() await self._camera.update_xaddrs()
await self.async_obtain_mac_address()
await self.async_check_date_and_time() await self.async_check_date_and_time()
await self.async_obtain_input_uri() await self.async_obtain_input_uri()
self.setup_ptz() self.setup_ptz()
@ -178,6 +181,14 @@ class ONVIFHassCamera(Camera):
err, err,
) )
async def async_obtain_mac_address(self):
"""Obtain the MAC address of the camera to use as the unique ID."""
devicemgmt = self._camera.create_devicemgmt_service()
network_interfaces = await devicemgmt.GetNetworkInterfaces()
for interface in network_interfaces:
if interface.Enabled:
self._mac = interface.Info.HwAddress
async def async_check_date_and_time(self): async def async_check_date_and_time(self):
"""Warns if camera and system date not synced.""" """Warns if camera and system date not synced."""
_LOGGER.debug("Setting up the ONVIF device management service") _LOGGER.debug("Setting up the ONVIF device management service")
@ -398,3 +409,8 @@ class ONVIFHassCamera(Camera):
def name(self): def name(self):
"""Return the name of this camera.""" """Return the name of this camera."""
return self._name return self._name
@property
def unique_id(self) -> Optional[str]:
"""Return a unique ID."""
return self._mac