diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-01-15 20:38:43 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-02-03 07:16:07 +0100 |
| commit | 20ab585a68982c4635c4e5a1ee5bbcc219feaebc (patch) | |
| tree | 362ae42924447bbd6f3f73493be21fea60be8bb3 /smoketest | |
| parent | 04d296a3446fa8488add17ce1ec7931d43c4a4d0 (diff) | |
| download | vyos-1x-20ab585a68982c4635c4e5a1ee5bbcc219feaebc.tar.gz vyos-1x-20ab585a68982c4635c4e5a1ee5bbcc219feaebc.zip | |
syslog: T6989: move up "global preserve-fqdn" one level in CLI
Move "global preserve-fqdn" one CLI level up, as it relates to all logging
targets (console, global and remote).
Diffstat (limited to 'smoketest')
| -rw-r--r-- | smoketest/config-tests/basic-vyos | 2 | ||||
| -rw-r--r-- | smoketest/config-tests/bgp-big-as-cloud | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_system_syslog.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/smoketest/config-tests/basic-vyos b/smoketest/config-tests/basic-vyos index b6bb6ac67..eaa61c56d 100644 --- a/smoketest/config-tests/basic-vyos +++ b/smoketest/config-tests/basic-vyos @@ -95,7 +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 global preserve-fqdn +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' set system syslog remote syslog.vyos.net format octet-counted diff --git a/smoketest/config-tests/bgp-big-as-cloud b/smoketest/config-tests/bgp-big-as-cloud index d6c17b3d2..ff7549957 100644 --- a/smoketest/config-tests/bgp-big-as-cloud +++ b/smoketest/config-tests/bgp-big-as-cloud @@ -848,5 +848,5 @@ set system sflow interface 'eth0.4088' set system sflow interface 'eth0.4089' set system sflow server 1.2.3.4 port '1234' set system syslog global facility all level 'all' -set system syslog global preserve-fqdn +set system syslog preserve-fqdn set system time-zone 'Europe/Zurich' diff --git a/smoketest/scripts/cli/test_system_syslog.py b/smoketest/scripts/cli/test_system_syslog.py index de2e9b260..b1aaa53a5 100755 --- a/smoketest/scripts/cli/test_system_syslog.py +++ b/smoketest/scripts/cli/test_system_syslog.py @@ -86,7 +86,7 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase): self.cli_set(['system', 'host-name', hostname]) self.cli_set(['system', 'domain-name', domain_name]) - self.cli_set(base_path + ['global', 'preserve-fqdn']) + self.cli_set(base_path + ['preserve-fqdn']) for tmp, tmp_options in facility.items(): level = tmp_options['level'] |