mirror.MikroTik/tomaae.homeassistant-mikrotik_router
1
0
Fork 0
mirror of https://github.com/tomaae/homeassistant-mikrotik_router.git synced 2025-07-14 19:34:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

crosscheck NAT .id in case of mikrotik reboot

Browse source
This commit is contained in:
tomaae 2019-12-07 21:18:27 +01:00
parent ce98668f1e
commit 8f8817a1f7
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
custom_components/mikrotik_router/device_tracker.py
View file

@ -34,6 +34,10 @@ DEVICE_ATTRIBUTES = [
"default-name", "default-name",
] ]
# ---------------------------
# format_attribute
# ---------------------------
def format_attribute(attr): def format_attribute(attr):
res = attr.replace("-", " ") res = attr.replace("-", " ")
res = res.capitalize() res = res.capitalize()

3
custom_components/mikrotik_router/mikrotik_controller.py
View file

@ -347,7 +347,8 @@ class MikrotikControllerData():
if uid not in self.data['nat']: if uid not in self.data['nat']:
self.data['nat'][uid] = {} self.data['nat'][uid] = {}
self.data['nat'][uid]['name'] = entry['protocol'] + ':' + str(entry['dst-port']) self.data['nat'][uid]['name'] = "{}:{}".format(entry['protocol'], entry['dst-port'])
self.data['nat'][uid]['.id'] = from_entry(entry, '.id')
self.data['nat'][uid]['protocol'] = from_entry(entry, 'protocol') self.data['nat'][uid]['protocol'] = from_entry(entry, 'protocol')
self.data['nat'][uid]['dst-port'] = from_entry(entry, 'dst-port') self.data['nat'][uid]['dst-port'] = from_entry(entry, 'dst-port')
self.data['nat'][uid]['in-interface'] = from_entry(entry, 'in-interface', 'any') self.data['nat'][uid]['in-interface'] = from_entry(entry, 'in-interface', 'any')

16
custom_components/mikrotik_router/switch.py
View file

@ -55,6 +55,10 @@ DEVICE_ATTRIBUTES_SCRIPT = [
"run-count", "run-count",
] ]
# ---------------------------
# format_attribute
# ---------------------------
def format_attribute(attr): def format_attribute(attr):
res = attr.replace("-", " ") res = attr.replace("-", " ")
res = res.capitalize() res = res.capitalize()
@ -306,7 +310,11 @@ class MikrotikControllerNATSwitch(MikrotikControllerSwitch):
"""Turn on the switch.""" """Turn on the switch."""
path = '/ip/firewall/nat' path = '/ip/firewall/nat'
param = '.id' param = '.id'
value = self._uid value = None
for uid in self._ctrl.data['nat']:
if self._ctrl.data['nat'][uid]['name'] == "{}:{}".format(self._data['protocol'], self._data['dst-port']):
value = self._ctrl.data['nat'][uid]['.id']
mod_param = 'disabled' mod_param = 'disabled'
mod_value = False mod_value = False
self._ctrl.set_value(path, param, value, mod_param, mod_value) self._ctrl.set_value(path, param, value, mod_param, mod_value)
@ -317,7 +325,11 @@ class MikrotikControllerNATSwitch(MikrotikControllerSwitch):
"""Turn on the switch.""" """Turn on the switch."""
path = '/ip/firewall/nat' path = '/ip/firewall/nat'
param = '.id' param = '.id'
value = self._uid value = None
for uid in self._ctrl.data['nat']:
if self._ctrl.data['nat'][uid]['name'] == "{}:{}".format(self._data['protocol'], self._data['dst-port']):
value = self._ctrl.data['nat'][uid]['.id']
mod_param = 'disabled' mod_param = 'disabled'
mod_value = True mod_value = True
self._ctrl.set_value(path, param, value, mod_param, mod_value) self._ctrl.set_value(path, param, value, mod_param, mod_value)