mirror of
https://github.com/home-assistant/core.git
synced 2025-07-23 21:27:38 +00:00
Bump librouteros to 3.0.0 (#30800)
This commit is contained in:
parent
1e2c3cacf9
commit
3899c6ae27
@ -2,8 +2,9 @@
|
|||||||
import logging
|
import logging
|
||||||
import ssl
|
import ssl
|
||||||
|
|
||||||
import librouteros
|
from librouteros import connect
|
||||||
from librouteros.login import login_plain, login_token
|
from librouteros.exceptions import LibRouterosError
|
||||||
|
from librouteros.login import plain as login_plain, token as login_token
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER
|
from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER
|
||||||
@ -82,11 +83,9 @@ def setup(hass, config):
|
|||||||
port = MTK_DEFAULT_API_PORT
|
port = MTK_DEFAULT_API_PORT
|
||||||
|
|
||||||
if login == MTK_LOGIN_PLAIN:
|
if login == MTK_LOGIN_PLAIN:
|
||||||
login_method = (login_plain,)
|
login_method = login_plain
|
||||||
elif login == MTK_LOGIN_TOKEN:
|
|
||||||
login_method = (login_token,)
|
|
||||||
else:
|
else:
|
||||||
login_method = (login_plain, login_token)
|
login_method = login_token
|
||||||
|
|
||||||
try:
|
try:
|
||||||
api = MikrotikClient(
|
api = MikrotikClient(
|
||||||
@ -94,11 +93,7 @@ def setup(hass, config):
|
|||||||
)
|
)
|
||||||
api.connect_to_device()
|
api.connect_to_device()
|
||||||
hass.data[DOMAIN][HOSTS][host] = {"config": device, "api": api}
|
hass.data[DOMAIN][HOSTS][host] = {"config": device, "api": api}
|
||||||
except (
|
except LibRouterosError as api_error:
|
||||||
librouteros.exceptions.TrapError,
|
|
||||||
librouteros.exceptions.MultiTrapError,
|
|
||||||
librouteros.exceptions.ConnectionError,
|
|
||||||
) as api_error:
|
|
||||||
_LOGGER.error("Mikrotik %s error %s", host, api_error)
|
_LOGGER.error("Mikrotik %s error %s", host, api_error)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
@ -148,15 +143,9 @@ class MikrotikClient:
|
|||||||
kwargs["ssl_wrapper"] = self._ssl_wrapper
|
kwargs["ssl_wrapper"] = self._ssl_wrapper
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self._client = librouteros.connect(
|
self._client = connect(self._host, self._user, self._password, **kwargs)
|
||||||
self._host, self._user, self._password, **kwargs
|
|
||||||
)
|
|
||||||
self._connected = True
|
self._connected = True
|
||||||
except (
|
except LibRouterosError as api_error:
|
||||||
librouteros.exceptions.TrapError,
|
|
||||||
librouteros.exceptions.MultiTrapError,
|
|
||||||
librouteros.exceptions.ConnectionError,
|
|
||||||
) as api_error:
|
|
||||||
_LOGGER.error("Mikrotik %s: %s", self._host, api_error)
|
_LOGGER.error("Mikrotik %s: %s", self._host, api_error)
|
||||||
self._client = None
|
self._client = None
|
||||||
return False
|
return False
|
||||||
@ -184,14 +173,7 @@ class MikrotikClient:
|
|||||||
response = self._client(cmd=cmd, **params)
|
response = self._client(cmd=cmd, **params)
|
||||||
else:
|
else:
|
||||||
response = self._client(cmd=cmd)
|
response = self._client(cmd=cmd)
|
||||||
except (librouteros.exceptions.ConnectionError,) as api_error:
|
except LibRouterosError as api_error:
|
||||||
_LOGGER.error("Mikrotik %s connection error %s", self._host, api_error)
|
|
||||||
self.connect_to_device()
|
|
||||||
return None
|
|
||||||
except (
|
|
||||||
librouteros.exceptions.TrapError,
|
|
||||||
librouteros.exceptions.MultiTrapError,
|
|
||||||
) as api_error:
|
|
||||||
_LOGGER.error(
|
_LOGGER.error(
|
||||||
"Mikrotik %s failed to retrieve data. cmd=[%s] Error: %s",
|
"Mikrotik %s failed to retrieve data. cmd=[%s] Error: %s",
|
||||||
self._host,
|
self._host,
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"domain": "mikrotik",
|
"domain": "mikrotik",
|
||||||
"name": "MikroTik",
|
"name": "MikroTik",
|
||||||
"documentation": "https://www.home-assistant.io/integrations/mikrotik",
|
"documentation": "https://www.home-assistant.io/integrations/mikrotik",
|
||||||
"requirements": ["librouteros==2.3.0"],
|
"requirements": ["librouteros==3.0.0"],
|
||||||
"dependencies": [],
|
"dependencies": [],
|
||||||
"codeowners": []
|
"codeowners": []
|
||||||
}
|
}
|
||||||
|
@ -775,7 +775,7 @@ libpyfoscam==1.0
|
|||||||
libpyvivotek==0.4.0
|
libpyvivotek==0.4.0
|
||||||
|
|
||||||
# homeassistant.components.mikrotik
|
# homeassistant.components.mikrotik
|
||||||
librouteros==2.3.0
|
librouteros==3.0.0
|
||||||
|
|
||||||
# homeassistant.components.soundtouch
|
# homeassistant.components.soundtouch
|
||||||
libsoundtouch==0.7.2
|
libsoundtouch==0.7.2
|
||||||
|
Loading…
x
Reference in New Issue
Block a user