From 2c40174b63084efbc197f12a158b40bcbddfe5aa Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Mon, 29 Oct 2018 11:45:51 +0300 Subject: [PATCH] Fix updating user with gateway --- nas_app/nas_managers/mod_mikrotik.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nas_app/nas_managers/mod_mikrotik.py b/nas_app/nas_managers/mod_mikrotik.py index bf31429..b761863 100644 --- a/nas_app/nas_managers/mod_mikrotik.py +++ b/nas_app/nas_managers/mod_mikrotik.py @@ -415,8 +415,14 @@ class MikrotikTransmitter(core.BaseTransmitter, ApiRos, self.remove_ip(ip_id) def update_user(self, queue: i_structs.SubnetQueue, *args): - self.update_queue(queue) - self.update_ip(queue.network) + if queue.is_access: + self.update_queue(queue) + self.update_ip(queue.network) + else: + self.remove_queue(queue) + res_ips = self.find_ip(queue.network, LIST_USERS_ALLOWED) + if res_ips: + self.remove_ip(res_ips.get('=.id')) def ping(self, host, count=10) -> Optional[Tuple[int, int]]: r = self._exec_cmd((