T6329: firewall: add a patch for op-mode command <show firewall group>

vyos · May 10, 2024 · 72c95ec · 72c95ec
1 parent 8fa1cb4
commit 72c95ec
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/op_mode/firewall.py b/src/op_mode/firewall.py
@@ -531,9 +531,15 @@ def find_references(group_type, group_name):
                             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})')