From 72c95ec1df8ad7be8a715b3338001349684cafa9 Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Fri, 10 May 2024 13:28:03 +0000
Subject: T6329: firewall: add a patch for op-mode command <show firewall
group>
---
src/op_mode/firewall.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'src/op_mode')
diff --git a/src/op_mode/firewall.py b/src/op_mode/firewall.py
index 442c186cc..3f8ba6fa1 100755
--- a/src/op_mode/firewall.py
+++ b/src/op_mode/firewall.py
@@ -531,9 +531,15 @@ def show_firewall_group(name=None):
continue
for idx, member in enumerate(members):
- val = member.get('val', 'N/D')
- timeout = str(member.get('timeout', 'N/D'))
- expires = str(member.get('expires', 'N/D'))
+ if type(member) == str:
+ # Only member, and no timeout:
+ val = member
+ timeout = "N/D"
+ expires = "N/D"
+ else:
+ val = member.get('val', 'N/D')
+ timeout = str(member.get('timeout', 'N/D'))
+ expires = str(member.get('expires', 'N/D'))
if args.detail:
row.append(f'{val} (timeout: {timeout}, expires: {expires})')
--
cgit v1.2.3