From e906f59f2e89cb5d34bbdfa2ae12a200fb4f93f3 Mon Sep 17 00:00:00 2001 From: Ben Woods Date: Fri, 21 Mar 2025 19:01:30 +0800 Subject: syslog: T7270: fix octed-counted typo in rsyslog.conf --- data/templates/rsyslog/rsyslog.conf.j2 | 2 +- smoketest/scripts/cli/test_system_syslog.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2 index 68e34f3f8..bf1f76ee4 100644 --- a/data/templates/rsyslog/rsyslog.conf.j2 +++ b/data/templates/rsyslog/rsyslog.conf.j2 @@ -105,7 +105,7 @@ if prifilt("{{ tmp | join(',') }}") then { {% if remote_options.format.include_timezone is vyos_defined %} template="SyslogProtocol23Format" {% endif %} - TCP_Framing="{{ 'octed-counted' if remote_options.format.octet_counted is vyos_defined else 'traditional' }}" + TCP_Framing="{{ 'octet-counted' if remote_options.format.octet_counted is vyos_defined else 'traditional' }}" {% if remote_options.source_address is vyos_defined %} Address="{{ remote_options.source_address }}" {% endif %} diff --git a/smoketest/scripts/cli/test_system_syslog.py b/smoketest/scripts/cli/test_system_syslog.py index ba325ced8..e2cf1cab8 100755 --- a/smoketest/scripts/cli/test_system_syslog.py +++ b/smoketest/scripts/cli/test_system_syslog.py @@ -226,7 +226,7 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase): self.assertIn( ' template="SyslogProtocol23Format"', config) if 'octet-counted' in remote_options['format']: - self.assertIn( ' TCP_Framing="octed-counted"', config) + self.assertIn( ' TCP_Framing="octet-counted"', config) else: self.assertIn( ' TCP_Framing="traditional"', config) -- cgit v1.2.3