diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2024-02-13 20:20:44 +0000 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-02-13 20:35:57 +0000 |
| commit | c867bc9bbd8acc80eaf68113af1a5ae8553ec9f4 (patch) | |
| tree | 855045cfe6360f6576f90e2edb5012b2b8b3c406 | |
| parent | 74a86612a207bb84412840a2ac4ff24975c1b8e7 (diff) | |
| download | vyos-1x-c867bc9bbd8acc80eaf68113af1a5ae8553ec9f4.tar.gz vyos-1x-c867bc9bbd8acc80eaf68113af1a5ae8553ec9f4.zip | |
T6019: Fix smoketest test_system_conntrack custom timeout
After updateing netfilter in the commit https://github.com/vyos/vyos-build/commit/b31f5fe934bcb37534d49acdb5f7756bf05422e8
The nftables format for conntrack timeouts is different.
Fix this.
(cherry picked from commit 24860e092426bf0bb09c2d164d66330be13bcd77)
| -rwxr-xr-x | smoketest/scripts/cli/test_system_conntrack.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/smoketest/scripts/cli/test_system_conntrack.py b/smoketest/scripts/cli/test_system_conntrack.py index 0dbc97d49..02473da95 100755 --- a/smoketest/scripts/cli/test_system_conntrack.py +++ b/smoketest/scripts/cli/test_system_conntrack.py @@ -320,10 +320,10 @@ class TestSystemConntrack(VyOSUnitTestSHIM.TestCase): nftables_search = [ ['ct timeout ct-timeout-1 {'], ['protocol tcp'], - ['policy = { syn_sent : 77, established : 99, close : 88 }'], + ['policy = { syn_sent : 1m17s, established : 1m39s, close : 1m28s }'], ['ct timeout ct-timeout-2 {'], ['protocol udp'], - ['policy = { unreplied : 55 }'], + ['policy = { unreplied : 55s }'], ['chain VYOS_CT_TIMEOUT {'], ['ip saddr 192.0.2.1', 'ip daddr 192.0.2.2', 'tcp dport 22', 'ct timeout set "ct-timeout-1"'], ['iifname "eth1"', 'meta l4proto udp', 'ip saddr 198.51.100.1', 'ct timeout set "ct-timeout-2"'] @@ -332,7 +332,7 @@ class TestSystemConntrack(VyOSUnitTestSHIM.TestCase): nftables6_search = [ ['ct timeout ct-timeout-1 {'], ['protocol tcp'], - ['policy = { last_ack : 33, time_wait : 22 }'], + ['policy = { last_ack : 33s, time_wait : 22s }'], ['chain VYOS_CT_TIMEOUT {'], ['iifname "eth2"', 'meta l4proto tcp', 'ip6 saddr 2001:db8::1', 'ct timeout set "ct-timeout-1"'] ] |