summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoromnom62 <75066712+omnom62@users.noreply.github.com>2026-08-28 05:54:17 +1000
committerGitHub <noreply@github.com>2026-08-28 05:54:17 +1000
commit5b372ab6d0e7594fc7fd0f9566bf443d38442a7e (patch)
tree45b798ec312666c6f593708b2c77c6197b0b2500
parentb7aa62d1422495334b1014c44e1a902fd865bf17 (diff)
parent657aabbfd2ea43a441447093ef9880716775ed16 (diff)
downloadrest.vyos-T8989_vyos_cast.tar.gz
rest.vyos-T8989_vyos_cast.zip
Merge branch 'main' into T8989_vyos_castT8989_vyos_cast
-rw-r--r--changelogs/fragments/t8989_vyos_logging_global_sit_fix.yml3
-rw-r--r--tests/integration/targets/vyos_logging_global/tests/httpapi/rtt.yaml9
2 files changed, 9 insertions, 3 deletions
diff --git a/changelogs/fragments/t8989_vyos_logging_global_sit_fix.yml b/changelogs/fragments/t8989_vyos_logging_global_sit_fix.yml
new file mode 100644
index 0000000..8766ef9
--- /dev/null
+++ b/changelogs/fragments/t8989_vyos_logging_global_sit_fix.yml
@@ -0,0 +1,3 @@
+---
+minor_changes:
+ - vyos_logging_global - Fix RTT integration test.
diff --git a/tests/integration/targets/vyos_logging_global/tests/httpapi/rtt.yaml b/tests/integration/targets/vyos_logging_global/tests/httpapi/rtt.yaml
index 8bea580..79eda11 100644
--- a/tests/integration/targets/vyos_logging_global/tests/httpapi/rtt.yaml
+++ b/tests/integration/targets/vyos_logging_global/tests/httpapi/rtt.yaml
@@ -27,7 +27,9 @@
assert:
that:
- gathered.gathered.console is defined
- - gathered.gathered.global is defined
+ - (gathered.gathered.console.facilities | selectattr('facility', 'eq', 'local7') | map(attribute='severity') | first) == 'err'
+ - gathered.gathered.global_params is defined
+ - (gathered.gathered.global_params.facilities | selectattr('facility', 'eq', 'cron') | map(attribute='severity') | first) == 'debug'
- name: RTT - Modify configuration
vyos.rest.vyos_logging_global:
@@ -51,8 +53,9 @@
assert:
that:
- gathered2.gathered.console is defined
- - gathered2.gathered.global is defined
- - gathered2.gathered.global.facilities.cron == "info"
+ - (gathered2.gathered.console.facilities | selectattr('facility', 'eq', 'local7') | map(attribute='severity') | first) == 'warning'
+ - gathered2.gathered.global_params is defined
+ - (gathered2.gathered.global_params.facilities | selectattr('facility', 'eq', 'cron') | map(attribute='severity') | first) == 'info'
always:
- include_tasks: _remove_config.yaml