summaryrefslogtreecommitdiff
path: root/smoketest
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2025-01-15 20:45:42 +0100
committerChristian Breunig <christian@breunig.cc>2025-02-03 07:16:07 +0100
commitb9c43b19acb6f649bb6f64c75ab63df768e360c9 (patch)
tree05c8b1da45146e3cd39b7058ac0c0be2fccd1c3f /smoketest
parent20ab585a68982c4635c4e5a1ee5bbcc219feaebc (diff)
downloadvyos-1x-b9c43b19acb6f649bb6f64c75ab63df768e360c9.tar.gz
vyos-1x-b9c43b19acb6f649bb6f64c75ab63df768e360c9.zip
syslog: T6989: move up "global marker" one level in CLI
Diffstat (limited to 'smoketest')
-rw-r--r--smoketest/config-tests/basic-vyos1
-rw-r--r--smoketest/configs/basic-vyos3
-rwxr-xr-xsmoketest/scripts/cli/test_system_syslog.py3
3 files changed, 5 insertions, 2 deletions
diff --git a/smoketest/config-tests/basic-vyos b/smoketest/config-tests/basic-vyos
index eaa61c56d..94a4d139e 100644
--- a/smoketest/config-tests/basic-vyos
+++ b/smoketest/config-tests/basic-vyos
@@ -95,6 +95,7 @@ set system syslog console facility mail level 'info'
set system syslog global facility all level 'info'
set system syslog global facility auth level 'info'
set system syslog global facility local7 level 'debug'
+set system syslog marker interval '1000'
set system syslog preserve-fqdn
set system syslog remote syslog.vyos.net facility auth level 'warning'
set system syslog remote syslog.vyos.net facility local7 level 'notice'
diff --git a/smoketest/configs/basic-vyos b/smoketest/configs/basic-vyos
index 242f3d1de..527e620da 100644
--- a/smoketest/configs/basic-vyos
+++ b/smoketest/configs/basic-vyos
@@ -236,6 +236,9 @@ system {
facility security {
level info
}
+ marker {
+ interval 1000
+ }
preserve-fqdn
}
host syslog.vyos.net {
diff --git a/smoketest/scripts/cli/test_system_syslog.py b/smoketest/scripts/cli/test_system_syslog.py
index b1aaa53a5..1233bf12b 100755
--- a/smoketest/scripts/cli/test_system_syslog.py
+++ b/smoketest/scripts/cli/test_system_syslog.py
@@ -75,8 +75,7 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase):
def test_global(self):
hostname = 'vyos123'
domain_name = 'example.local'
- default_marker_interval = default_value(base_path + ['global',
- 'marker', 'interval'])
+ default_marker_interval = default_value(base_path + ['marker', 'interval'])
facility = {
'auth': {'level': 'info'},