summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2024-03-19 08:52:36 +0000
committerViacheslav Hletenko <v.gletenko@vyos.io>2024-03-19 08:52:36 +0000
commita75be3b6814dd39711c157c29405ee6bd83993f5 (patch)
treee421f19863cdb196b77bf26c85cb580dce639e8c /src
parent4912dfbfa5ef52eb8a6c7d54bb23e0092dffb4f2 (diff)
downloadvyos-1x-a75be3b6814dd39711c157c29405ee6bd83993f5.tar.gz
vyos-1x-a75be3b6814dd39711c157c29405ee6bd83993f5.zip
T6138: Fix op-mode show conntrack table with flowtable offloads
The op-mode command `show conntrack table ipv4` fails if gets a conntrack entrie with `flowtable` offload. Those entries do not have key `timeout` ``` File "/usr/libexec/vyos/op_mode/conntrack.py", line 115, in get_formatted_output timeout = meta['timeout'] ~~~~^^^^^^^^^^^ ``` Use the timeout `n/a` for those offload conntrack entries
Diffstat (limited to 'src')
-rwxr-xr-xsrc/op_mode/conntrack.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/op_mode/conntrack.py b/src/op_mode/conntrack.py
index cf8adf795..6ea213bec 100755
--- a/src/op_mode/conntrack.py
+++ b/src/op_mode/conntrack.py
@@ -112,7 +112,8 @@ def get_formatted_output(dict_data):
proto = meta['layer4']['protoname']
if direction == 'independent':
conn_id = meta['id']
- timeout = meta['timeout']
+ # T6138 flowtable offload conntrack entries without 'timeout'
+ timeout = meta.get('timeout', 'n/a')
orig_src = f'{orig_src}:{orig_sport}' if orig_sport else orig_src
orig_dst = f'{orig_dst}:{orig_dport}' if orig_dport else orig_dst
reply_src = f'{reply_src}:{reply_sport}' if reply_sport else reply_src