From d1d0150b6a40252700181530ca87c5699a4bd0b4 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Thu, 20 Jan 2022 00:27:53 +0100
Subject: firewall: T2199: Add log prefix to match legacy perl behaviour

Example syslog: [FWNAME-default-D] ...

* Also clean-up firewall default-action
---
 python/vyos/firewall.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'python/vyos/firewall.py')

diff --git a/python/vyos/firewall.py b/python/vyos/firewall.py
index 2ab78ff18..808e90e38 100644
--- a/python/vyos/firewall.py
+++ b/python/vyos/firewall.py
@@ -121,7 +121,8 @@ def parse_rule(rule_conf, fw_name, rule_id, ip_name):
                     output.append(f'{proto} {prefix}port $P_{group_name}')
 
     if 'log' in rule_conf and rule_conf['log'] == 'enable':
-        output.append('log')
+        action = rule_conf['action'] if 'action' in rule_conf else 'accept'
+        output.append(f'log prefix "[{fw_name[:19]}-{rule_id}-{action[:1].upper()}] "')
 
     if 'hop_limit' in rule_conf:
         operators = {'eq': '==', 'gt': '>', 'lt': '<'}
-- 
cgit v1.2.3