From 85f19deb34884337af343fc39b1ce484c9ba1ddb Mon Sep 17 00:00:00 2001 From: Nicolas Fort Date: Wed, 14 Aug 2024 12:12:56 +0000 Subject: T6646: conntrack: in ignore rules, if protocols=all, do not append it to the rule (cherry picked from commit 2d953bedd0e416ead924f77ec612c997f950535a) --- python/vyos/template.py | 3 ++- smoketest/scripts/cli/test_system_conntrack.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 python/vyos/template.py diff --git a/python/vyos/template.py b/python/vyos/template.py old mode 100644 new mode 100755 index a4fff649c..2a99eef9d --- a/python/vyos/template.py +++ b/python/vyos/template.py @@ -692,7 +692,8 @@ def conntrack_rule(rule_conf, rule_id, action, ipv6=False): else: for protocol, protocol_config in rule_conf['protocol'].items(): proto = protocol - output.append(f'meta l4proto {proto}') + if proto != 'all': + output.append(f'meta l4proto {proto}') tcp_flags = dict_search_args(rule_conf, 'tcp', 'flags') if tcp_flags and action != 'timeout': diff --git a/smoketest/scripts/cli/test_system_conntrack.py b/smoketest/scripts/cli/test_system_conntrack.py index 7870561e7..1902c32f2 100755 --- a/smoketest/scripts/cli/test_system_conntrack.py +++ b/smoketest/scripts/cli/test_system_conntrack.py @@ -254,6 +254,7 @@ class TestSystemConntrack(VyOSUnitTestSHIM.TestCase): self.cli_set(base_path + ['ignore', 'ipv4', 'rule', '2', 'source', 'address', '192.0.2.1']) self.cli_set(base_path + ['ignore', 'ipv4', 'rule', '2', 'destination', 'group', 'address-group', address_group]) + self.cli_set(base_path + ['ignore', 'ipv4', 'rule', '2', 'protocol', 'all']) self.cli_set(base_path + ['ignore', 'ipv6', 'rule', '11', 'source', 'address', 'fe80::1']) self.cli_set(base_path + ['ignore', 'ipv6', 'rule', '11', 'destination', 'address', 'fe80::2']) -- cgit v1.2.3