pavel.muhortov/my_route
1
0
Fork 0
generated from pavel.muhortov/template-python
Code Issues Pull Requests Projects Releases Wiki Activity

added use of entries order

Browse Source
This commit is contained in:
Pavel Muhortov 2023-09-01 20:43:34 +03:00
parent 75b65f85c0
commit f9d50ef65d
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
my_route.conf
View File

@ -77,6 +77,9 @@ dev-wg1 = true
[via-192.168.0.1] [via-192.168.0.1]
# List of CIDR. Only CIDR with the TRUE value will be used. # List of CIDR. Only CIDR with the TRUE value will be used.
# The order of the entries is important:
# - the "add" action applies entries from top to bottom,
# - the "del" action applies entries from bottom to top.
# If different sources contain the same cidr, use the path part to define your preference. # If different sources contain the same cidr, use the path part to define your preference.
ipv4/via-192.168.0.1.cidr = true ipv4/via-192.168.0.1.cidr = true
ipv4/atlassian.cidr = true ipv4/atlassian.cidr = true
@ -87,6 +90,9 @@ ipv4/private.cidr
[dev-wg1] [dev-wg1]
# List of CIDR. Only CIDR with the TRUE value will be used. # List of CIDR. Only CIDR with the TRUE value will be used.
# The order of the entries is important:
# - the "add" action applies entries from top to bottom,
# - the "del" action applies entries from bottom to top.
# If different sources contain the same cidr, use the path part to define your preference. # If different sources contain the same cidr, use the path part to define your preference.
ipv4/dev-wg1.cidr = true ipv4/dev-wg1.cidr = true
ipv4/public.cidr = true ipv4/public.cidr = true

12
my_route.py
View File

@ -300,10 +300,10 @@ class Route(Connect):
apply_counter = 0 apply_counter = 0
gways_counter = 0 gways_counter = 0
files_counter = 0 files_counter = 0
commands_list = []
for gw, cidr_apply in self._gw.items(): for gw, cidr_apply in self._gw.items():
gways_counter += 1 gways_counter += 1
for cidr in cidr_apply: for cidr in cidr_apply:
local_logger = logging.getLogger(cidr)
for cidr_file in cidr_current: for cidr_file in cidr_current:
if cidr in cidr_file: if cidr in cidr_file:
with open(cidr_file, mode='r', encoding='utf-8') as file: with open(cidr_file, mode='r', encoding='utf-8') as file:
@ -317,9 +317,15 @@ class Route(Connect):
pass pass
else: else:
command = ['ip', 'ro', action, route, gw_type, gw_name] command = ['ip', 'ro', action, route, gw_type, gw_name]
local_logger.info(msg=' '.join(command)) commands_list.append({'cidr': cidr, 'command': command})
if action == 'delete':
commands_list = reversed(commands_list)
for command in commands_list:
local_logger = logging.getLogger(command['cidr'])
local_logger.info(msg=' '.join(command['command']))
if not imitate: if not imitate:
if self.__cmd(command=command) == 0: if self.__cmd(command=command['command']) == 0:
apply_counter += 1 apply_counter += 1
local_logger = logging.getLogger(logger_alias) local_logger = logging.getLogger(logger_alias)