output: rename reject-target to reject_target

Ticket: 6502

Split the checks for version 9 and before

diff --git a/tests/bug-5464-verdict-01/test.yaml b/tests/bug-5464-verdict-01/test.yaml
index b6d8ce6d106bb65ad001d08ef1579b49dfcb2516..1625f6e7847317b6927a7ce9c2ecf1d3ecd1375b 100644 (file)
--- a/tests/bug-5464-verdict-01/test.yaml
+++ b/tests/bug-5464-verdict-01/test.yaml
@@ -9,6 +9,8 @@ pcap:  ../flowbit-oring/input.pcap
 
 checks:
   - filter:
+      requires:
+        lt-version: 9
       count: 1
       match:
         event_type: alert
@@ -18,6 +20,19 @@ checks:
         verdict.reject-target: to_server
         verdict.reject: ["tcp-reset"]
   - filter:
+      requires:
+        min-version: 9
+      count: 1
+      match:
+        event_type: alert
+        alert.signature_id: 1
+        pcap_cnt: 1
+        verdict.action: drop
+        verdict.reject_target: to_server
+        verdict.reject: ["tcp-reset"]
+  - filter:
+      requires:
+        lt-version: 9
       count: 1
       match:
         event_type: alert
@@ -27,6 +42,19 @@ checks:
         verdict.reject-target: to_server
         verdict.reject: ["tcp-reset"]
   - filter:
+      requires:
+        min-version: 9
+      count: 1
+      match:
+        event_type: alert
+        alert.signature_id: 2
+        pcap_cnt: 1
+        verdict.action: drop
+        verdict.reject_target: to_server
+        verdict.reject: ["tcp-reset"]
+  - filter:
+      requires:
+        lt-version: 9
       count: 1
       match:
         event_type: drop
@@ -34,6 +62,16 @@ checks:
         verdict.action: drop
         verdict.reject-target: to_server
         verdict.reject: ["tcp-reset"]
+  - filter:
+      requires:
+        min-version: 9
+      count: 1
+      match:
+        event_type: drop
+        pcap_cnt: 1
+        verdict.action: drop
+        verdict.reject_target: to_server
+        verdict.reject: ["tcp-reset"]
   - filter:
       count: 0
       match:

diff --git a/tests/bug-5464-verdict-03/test.yaml b/tests/bug-5464-verdict-03/test.yaml
index f8bc2256becbf0d23512900da234b36d95cf7a0f..16f4bf3601eb6ac0116b72efe702a4059c105540 100644 (file)
--- a/tests/bug-5464-verdict-03/test.yaml
+++ b/tests/bug-5464-verdict-03/test.yaml
@@ -32,6 +32,8 @@ checks:
         drop.reason: rules
         verdict.action: drop
   - filter:
+      requires:
+        lt-version: 9
       count: 1
       match:
         event_type: alert
@@ -39,6 +41,17 @@ checks:
         verdict.reject-target: to_client
         verdict.reject: [icmp-prohib]
   - filter:
+      requires:
+        min-version: 9
+      count: 1
+      match:
+        event_type: alert
+        verdict.action: drop
+        verdict.reject_target: to_client
+        verdict.reject: [icmp-prohib]
+  - filter:
+      requires:
+        lt-version: 9
       count: 1
       match:
         event_type: drop
@@ -46,3 +59,13 @@ checks:
         verdict.action: drop
         verdict.reject-target: to_client
         verdict.reject: [icmp-prohib]
+  - filter:
+      requires:
+        min-version: 9
+      count: 1
+      match:
+        event_type: drop
+        drop.reason: rules
+        verdict.action: drop
+        verdict.reject_target: to_client
+        verdict.reject: [icmp-prohib]

diff --git a/tests/bug-5464-verdict-06/test.yaml b/tests/bug-5464-verdict-06/test.yaml
index c70ad7b23b0f3d11f6f841c4fee0543ee067d921..877ea6e2936e01319019cd7e483ec084364e089d 100644 (file)
--- a/tests/bug-5464-verdict-06/test.yaml
+++ b/tests/bug-5464-verdict-06/test.yaml
@@ -15,6 +15,8 @@ checks:
         alert.signature_id: 1
         verdict.action: alert
   - filter:
+      requires:
+        lt-version: 9
       count: 1
       match:
         event_type: alert
@@ -22,6 +24,16 @@ checks:
         verdict.action: alert
         verdict.reject-target: both
         verdict.reject: [icmp-prohib]
+  - filter:
+      requires:
+        min-version: 9
+      count: 1
+      match:
+        event_type: alert
+        alert.signature_id: 2
+        verdict.action: alert
+        verdict.reject_target: both
+        verdict.reject: [icmp-prohib]
   # match on rule `pass` for hostname www.wireshark.org
   - filter:
       count: 1

diff --git a/tests/bug-5464-verdict-07/test.yaml b/tests/bug-5464-verdict-07/test.yaml
index 997843685fe2047f640413ec00c54ae2babee2da..3c44c3ddf98c60476020bf5bd0e48e9b2c46d9d8 100644 (file)
--- a/tests/bug-5464-verdict-07/test.yaml
+++ b/tests/bug-5464-verdict-07/test.yaml
@@ -9,9 +9,20 @@ args:
 
 checks:
   - filter:
+      requires:
+        lt-version: 9
       count: 2
       match:
         event_type: alert
         verdict.action: alert
         verdict.reject-target: to_client
         verdict.reject: [icmp-prohib]
+  - filter:
+      requires:
+        min-version: 9
+      count: 2
+      match:
+        event_type: alert
+        verdict.action: alert
+        verdict.reject_target: to_client
+        verdict.reject: [icmp-prohib]

diff --git a/tests/firewall/ruletype-firewall-49-reject-app/test.yaml b/tests/firewall/ruletype-firewall-49-reject-app/test.yaml
index 9d97e3b5ed83253cef4ee758f32a3df569830ebc..acf32e6b2b67256ce33c45d96d057a0a0b3abf2f 100644 (file)
--- a/tests/firewall/ruletype-firewall-49-reject-app/test.yaml
+++ b/tests/firewall/ruletype-firewall-49-reject-app/test.yaml
@@ -65,6 +65,16 @@ checks:
     match:
       verdict.action: drop
 - filter:
+    requires:
+      min-version: 9
+    count: 4
+    match:
+      verdict.action: drop
+      verdict.reject_target: to_client
+      verdict.reject[0]: tcp-reset
+- filter:
+    requires:
+      lt-version: 9
     count: 4
     match:
       verdict.action: drop