From 4feeb7afe15182788c99392b2b401a6867eada88 Mon Sep 17 00:00:00 2001
From: omnom62 <75066712+omnom62@users.noreply.github.com>
Date: Thu, 27 Aug 2026 22:51:05 +1000
Subject: T8989: vyos_banner SIT fix (#27)

* T8989: vyos_banner SIT fix

* T8989: vyos_banner SIT fix
---
 changelogs/fragments/t8989_banner_sit_fix.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelogs/fragments/t8989_banner_sit_fix.yml

(limited to 'changelogs')

diff --git a/changelogs/fragments/t8989_banner_sit_fix.yml b/changelogs/fragments/t8989_banner_sit_fix.yml
new file mode 100644
index 0000000..74ac4a8
--- /dev/null
+++ b/changelogs/fragments/t8989_banner_sit_fix.yml
@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - vyos_banner - Fix SIT overridden, merged and rtt.
-- 
cgit v1.2.3


From 657aabbfd2ea43a441447093ef9880716775ed16 Mon Sep 17 00:00:00 2001
From: omnom62 <75066712+omnom62@users.noreply.github.com>
Date: Thu, 27 Aug 2026 23:00:19 +1000
Subject: T8989: vyos logging global sit fix (#26)

* T8989: vyos_logging_global SIT fix
---
 changelogs/fragments/t8989_vyos_logging_global_sit_fix.yml       | 3 +++
 .../targets/vyos_logging_global/tests/httpapi/rtt.yaml           | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/fragments/t8989_vyos_logging_global_sit_fix.yml

(limited to 'changelogs')

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
-- 
cgit v1.2.3