diff --git a/custom_components/mikrotik_router/config_flow.py b/custom_components/mikrotik_router/config_flow.py index 2b8eea8..cb01bd4 100644 --- a/custom_components/mikrotik_router/config_flow.py +++ b/custom_components/mikrotik_router/config_flow.py @@ -63,7 +63,12 @@ class MikrotikControllerConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): errors["base"] = "name_exists" # Test connection - api = MikrotikAPI(host=user_input["host"], username=user_input["username"], password=user_input["password"], port=user_input["port"], use_ssl=user_input["ssl"]) + api = MikrotikAPI(host=user_input["host"], + username=user_input["username"], + password=user_input["password"], + port=user_input["port"], + use_ssl=user_input["ssl"] + ) if not api.connect(): errors[CONF_HOST] = api.error @@ -74,7 +79,14 @@ class MikrotikControllerConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): data=user_input ) - return self._show_config_form(host=user_input["host"], username=user_input["username"], password=user_input["password"], port=user_input["port"], name=user_input["name"], use_ssl=user_input["ssl"], errors=errors) + return self._show_config_form(host=user_input["host"], + username=user_input["username"], + password=user_input["password"], + port=user_input["port"], + name=user_input["name"], + use_ssl=user_input["ssl"], + errors=errors + ) return self._show_config_form(errors=errors) diff --git a/custom_components/mikrotik_router/device_tracker.py b/custom_components/mikrotik_router/device_tracker.py index 6ff2215..22806ad 100644 --- a/custom_components/mikrotik_router/device_tracker.py +++ b/custom_components/mikrotik_router/device_tracker.py @@ -141,13 +141,13 @@ class MikrotikControllerPortDeviceTracker(ScannerEntity): @property def icon(self): """Return the icon.""" - if not self.mikrotik_controller.data['interface'][self._uid]['enabled']: - return 'mdi:lan-disconnect' - + icon = 'mdi:lan-disconnect' if self.mikrotik_controller.data['interface'][self._uid]['running']: - return 'mdi:lan-connect' + icon = 'mdi:lan-connect' else: - return 'mdi:lan-pending' + icon = 'mdi:lan-pending' + + return icon @property def device_info(self): diff --git a/custom_components/mikrotik_router/mikrotikapi.py b/custom_components/mikrotik_router/mikrotikapi.py index cb07d5a..f4049bb 100644 --- a/custom_components/mikrotik_router/mikrotikapi.py +++ b/custom_components/mikrotik_router/mikrotikapi.py @@ -56,11 +56,11 @@ class MikrotikAPI: try: self._connection = librouteros.connect(self._host, self._username, self._password, **kwargs) except ( - librouteros.exceptions.TrapError, - librouteros.exceptions.MultiTrapError, - librouteros.exceptions.ConnectionClosed, - librouteros.exceptions.ProtocolError, - librouteros.exceptions.FatalError + librouteros.exceptions.TrapError, + librouteros.exceptions.MultiTrapError, + librouteros.exceptions.ConnectionClosed, + librouteros.exceptions.ProtocolError, + librouteros.exceptions.FatalError ) as api_error: _LOGGER.error("Mikrotik %s: %s", self._host, api_error) self.error_to_strings("%s" % api_error) @@ -107,10 +107,10 @@ class MikrotikAPI: self._connection = None return None except ( - librouteros.exceptions.TrapError, - librouteros.exceptions.MultiTrapError, - librouteros.exceptions.ProtocolError, - librouteros.exceptions.FatalError + librouteros.exceptions.TrapError, + librouteros.exceptions.MultiTrapError, + librouteros.exceptions.ProtocolError, + librouteros.exceptions.FatalError ) as api_error: _LOGGER.error("Mikrotik %s connection error %s", self._host, api_error) return None