summaryrefslogtreecommitdiff
path: root/python/vyos
diff options
context:
space:
mode:
authorsarthurdev <965089+sarthurdev@users.noreply.github.com>2022-09-20 17:16:43 +0200
committersarthurdev <965089+sarthurdev@users.noreply.github.com>2022-09-21 20:53:49 +0200
commite6ba98a85ca72abc7e7e2001d208bcd1806c2c13 (patch)
treedc36b04502efdab35b3ab9612e36c4fc008068f4 /python/vyos
parent448d4f6db9cf6dfceffccf988301e5f4d04c9afa (diff)
downloadvyos-1x-e6ba98a85ca72abc7e7e2001d208bcd1806c2c13.tar.gz
vyos-1x-e6ba98a85ca72abc7e7e2001d208bcd1806c2c13.zip
nat66: T4605: Refactor NAT66 to use python module for parsing rules
* Rename table to vyos_nat * Refactor tests to use `verify_nftables` format
Diffstat (limited to 'python/vyos')
-rw-r--r--python/vyos/nat.py27
1 files changed, 21 insertions, 6 deletions
diff --git a/python/vyos/nat.py b/python/vyos/nat.py
index 654afa424..44dd65372 100644
--- a/python/vyos/nat.py
+++ b/python/vyos/nat.py
@@ -17,11 +17,15 @@
from vyos.template import is_ip_network
from vyos.util import dict_search_args
-def parse_nat_rule(rule_conf, rule_id, nat_type):
+def parse_nat_rule(rule_conf, rule_id, nat_type, ipv6=False):
output = []
+ ip_prefix = 'ip6' if ipv6 else 'ip'
log_prefix = ('DST' if nat_type == 'destination' else 'SRC') + f'-NAT-{rule_id}'
log_suffix = ''
+ if ipv6:
+ log_prefix = log_prefix.replace("NAT-", "NAT66-")
+
ignore_type_addr = False
translation_str = ''
@@ -39,7 +43,7 @@ def parse_nat_rule(rule_conf, rule_id, nat_type):
protocol = rule_conf['protocol']
if protocol == 'tcp_udp':
protocol = '{ tcp, udp }'
- output.append(f'ip protocol {protocol}')
+ output.append(f'meta l4proto {protocol}')
if 'exclude' in rule_conf:
translation_str = 'return'
@@ -51,9 +55,12 @@ def parse_nat_rule(rule_conf, rule_id, nat_type):
port = dict_search_args(rule_conf, 'translation', 'port')
if addr and is_ip_network(addr):
- map_addr = dict_search_args(rule_conf, nat_type, 'address')
- translation_output.append(f'ip prefix to ip {translation_prefix}addr map {{ {map_addr} : {addr} }}')
- ignore_type_addr = True
+ if not ipv6:
+ map_addr = dict_search_args(rule_conf, nat_type, 'address')
+ translation_output.append(f'{ip_prefix} prefix to {ip_prefix} {translation_prefix}addr map {{ {map_addr} : {addr} }}')
+ ignore_type_addr = True
+ else:
+ translation_output.append(f'prefix to {addr}')
elif addr == 'masquerade':
if port:
addr = f'{addr} to '
@@ -85,7 +92,15 @@ def parse_nat_rule(rule_conf, rule_id, nat_type):
if addr[:1] == '!':
operator = '!='
addr = addr[1:]
- output.append(f'ip {prefix}addr {operator} {addr}')
+ output.append(f'{ip_prefix} {prefix}addr {operator} {addr}')
+
+ addr_prefix = dict_search_args(rule_conf, target, 'prefix')
+ if addr_prefix and ipv6:
+ operator = ''
+ if addr_prefix[:1] == '!':
+ operator = '!='
+ addr_prefix = addr[1:]
+ output.append(f'ip6 {prefix}addr {operator} {addr_prefix}')
port = dict_search_args(rule_conf, target, 'port')
if port: