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

Adds support for routers implementing IGDv2 (#16108)

Browse Source 
* Adds support for IGDv2

* bump pyupnp_async

* bump pyupnp_async

* better debug

* fix test
This commit is contained in:
Diogo Gomes 2018-08-23 09:54:02 +01:00 committed by Paulus Schoutsen
parent 4155e8a31f
commit ced5eeacc2
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/upnp.py
View File

@ -15,7 +15,7 @@ from homeassistant.helpers import config_validation as cv
from homeassistant.helpers import discovery from homeassistant.helpers import discovery
from homeassistant.util import get_local_ip from homeassistant.util import get_local_ip
REQUIREMENTS = ['pyupnp-async==0.1.0.2'] REQUIREMENTS = ['pyupnp-async==0.1.1.0']
DEPENDENCIES = ['http'] DEPENDENCIES = ['http']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -37,6 +37,7 @@ NOTIFICATION_TITLE = 'UPnP Setup'
IGD_DEVICE = 'urn:schemas-upnp-org:device:InternetGatewayDevice:1' IGD_DEVICE = 'urn:schemas-upnp-org:device:InternetGatewayDevice:1'
PPP_SERVICE = 'urn:schemas-upnp-org:service:WANPPPConnection:1' PPP_SERVICE = 'urn:schemas-upnp-org:service:WANPPPConnection:1'
IP_SERVICE = 'urn:schemas-upnp-org:service:WANIPConnection:1' IP_SERVICE = 'urn:schemas-upnp-org:service:WANIPConnection:1'
IP_SERVICE2 = 'urn:schemas-upnp-org:service:WANIPConnection:2'
CIC_SERVICE = 'urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1' CIC_SERVICE = 'urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1'
UNITS = { UNITS = {
@ -48,7 +49,7 @@ UNITS = {
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.Schema({ DOMAIN: vol.Schema({
vol.Optional(CONF_ENABLE_PORT_MAPPING, default=True): cv.boolean, vol.Optional(CONF_ENABLE_PORT_MAPPING, default=False): cv.boolean,
vol.Optional(CONF_UNITS, default="MBytes"): vol.In(UNITS), vol.Optional(CONF_UNITS, default="MBytes"): vol.In(UNITS),
vol.Optional(CONF_LOCAL_IP): vol.All(ip_address, cv.string), vol.Optional(CONF_LOCAL_IP): vol.All(ip_address, cv.string),
vol.Optional(CONF_PORTS): vol.Optional(CONF_PORTS):
@ -86,8 +87,10 @@ async def async_setup(hass, config):
service = device.find_first_service(PPP_SERVICE) service = device.find_first_service(PPP_SERVICE)
if _service['serviceType'] == IP_SERVICE: if _service['serviceType'] == IP_SERVICE:
service = device.find_first_service(IP_SERVICE) service = device.find_first_service(IP_SERVICE)
if _service['serviceType'] == IP_SERVICE2:
service = device.find_first_service(IP_SERVICE2)
if _service['serviceType'] == CIC_SERVICE: if _service['serviceType'] == CIC_SERVICE:
unit = config.get(CONF_UNITS) unit = config[CONF_UNITS]
hass.async_create_task(discovery.async_load_platform( hass.async_create_task(discovery.async_load_platform(
hass, 'sensor', DOMAIN, {'unit': unit}, config)) hass, 'sensor', DOMAIN, {'unit': unit}, config))
except UpnpSoapError as error: except UpnpSoapError as error:
@ -98,7 +101,7 @@ async def async_setup(hass, config):
_LOGGER.warning("Could not find any UPnP IGD") _LOGGER.warning("Could not find any UPnP IGD")
return False return False
port_mapping = config.get(CONF_ENABLE_PORT_MAPPING) port_mapping = config[CONF_ENABLE_PORT_MAPPING]
if not port_mapping: if not port_mapping:
return True return True
@ -116,7 +119,8 @@ async def async_setup(hass, config):
await service.add_port_mapping(internal, external, host, 'TCP', await service.add_port_mapping(internal, external, host, 'TCP',
desc='Home Assistant') desc='Home Assistant')
registered.append(external) registered.append(external)
_LOGGER.debug("external %s -> %s @ %s", external, internal, host) _LOGGER.debug("Mapping external TCP port %s -> %s @ %s",
external, internal, host)
except UpnpSoapError as error: except UpnpSoapError as error:
_LOGGER.error(error) _LOGGER.error(error)
hass.components.persistent_notification.create( hass.components.persistent_notification.create(

2
requirements_all.txt
View File

@ -1167,7 +1167,7 @@ pytradfri[async]==5.5.1
pyunifi==2.13 pyunifi==2.13
# homeassistant.components.upnp # homeassistant.components.upnp
pyupnp-async==0.1.0.2 pyupnp-async==0.1.1.0
# homeassistant.components.binary_sensor.uptimerobot # homeassistant.components.binary_sensor.uptimerobot
pyuptimerobot==0.0.5 pyuptimerobot==0.0.5

2
requirements_test_all.txt
View File

@ -171,7 +171,7 @@ pytradfri[async]==5.5.1
pyunifi==2.13 pyunifi==2.13
# homeassistant.components.upnp # homeassistant.components.upnp
pyupnp-async==0.1.0.2 pyupnp-async==0.1.1.0
# homeassistant.components.notify.html5 # homeassistant.components.notify.html5
pywebpush==1.6.0 pywebpush==1.6.0

9
tests/components/test_upnp.py
View File

@ -102,7 +102,8 @@ async def test_setup_succeeds_if_specify_ip(hass, mock_msearch_first):
return_value='127.0.0.1'): return_value='127.0.0.1'):
result = await async_setup_component(hass, 'upnp', { result = await async_setup_component(hass, 'upnp', {
'upnp': { 'upnp': {
'local_ip': '192.168.0.10' 'local_ip': '192.168.0.10',
'port_mapping': 'True'
} }
}) })
@ -118,7 +119,9 @@ async def test_no_config_maps_hass_local_to_remote_port(hass,
mock_msearch_first): mock_msearch_first):
"""Test by default we map local to remote port.""" """Test by default we map local to remote port."""
result = await async_setup_component(hass, 'upnp', { result = await async_setup_component(hass, 'upnp', {
'upnp': {} 'upnp': {
'port_mapping': 'True'
}
}) })
assert result assert result
@ -134,6 +137,7 @@ async def test_map_hass_to_remote_port(hass,
"""Test mapping hass to remote port.""" """Test mapping hass to remote port."""
result = await async_setup_component(hass, 'upnp', { result = await async_setup_component(hass, 'upnp', {
'upnp': { 'upnp': {
'port_mapping': 'True',
'ports': { 'ports': {
'hass': 1000 'hass': 1000
} }
@ -157,6 +161,7 @@ async def test_map_internal_to_remote_ports(hass,
result = await async_setup_component(hass, 'upnp', { result = await async_setup_component(hass, 'upnp', {
'upnp': { 'upnp': {
'port_mapping': 'True',
'ports': ports 'ports': ports
} }
}) })