dns-single-request: split into dns v1 and v2 test

Update dns-single-request to v2 format, rename old test to
dns-single-request-v1.

diff --git a/tests/dns-single-request-v1/README.md b/tests/dns-single-request-v1/README.md
new file mode 100644 (file)
index 0000000..29dacb2
--- /dev/null
+++ b/tests/dns-single-request-v1/README.md
@@ -0,0 +1 @@
+Check a simple DNS request and response.

diff --git a/tests/dns-single-request/check.sh b/tests/dns-single-request-v1/check.sh
similarity index 100%
rename from tests/dns-single-request/check.sh
rename to tests/dns-single-request-v1/check.sh

diff --git a/tests/dns-single-request-v1/input.pcap b/tests/dns-single-request-v1/input.pcap
new file mode 100644 (file)
index 0000000..87682e7
Binary files /dev/null and b/tests/dns-single-request-v1/input.pcap differ

diff --git a/tests/dns-single-request-v1/suricata.yaml b/tests/dns-single-request-v1/suricata.yaml
new file mode 100644 (file)
index 0000000..5f7eded
--- /dev/null
+++ b/tests/dns-single-request-v1/suricata.yaml
@@ -0,0 +1,10 @@
+%YAML 1.1
+---
+
+outputs:
+  - eve-log:
+      enabled: yes
+      filename: eve.json
+      types:
+        - dns:
+            version: 1

diff --git a/tests/dns-single-request-v1/test.yaml b/tests/dns-single-request-v1/test.yaml
new file mode 100644 (file)
index 0000000..9ee272d
--- /dev/null
+++ b/tests/dns-single-request-v1/test.yaml
@@ -0,0 +1,4 @@
+requires:
+  features:
+    - HAVE_LIBJANSSON
+  lt-version: 7

diff --git a/tests/dns-single-request/suricata.yaml b/tests/dns-single-request/suricata.yaml
index 5f7eded22dbe6f08572e51f398c349ce1949c786..bf949095f0e45a5834c5e1a5805e1be565718918 100644 (file)
--- a/tests/dns-single-request/suricata.yaml
+++ b/tests/dns-single-request/suricata.yaml
@@ -7,4 +7,3 @@ outputs:
       filename: eve.json
       types:
         - dns:
-            version: 1

diff --git a/tests/dns-single-request/test.yaml b/tests/dns-single-request/test.yaml
index 56ea9b0d57173b93569d9c72c9b1372ce9234d13..6e799f63b16f31bcf0e514746798e5a065846810 100644 (file)
--- a/tests/dns-single-request/test.yaml
+++ b/tests/dns-single-request/test.yaml
@@ -1,3 +1,13 @@
 requires:
   features:
     - HAVE_LIBJANSSON
+
+checks:
+  - filter:
+      count: 1
+      match:
+        dns.type: query
+  - filter:
+      count: 1
+      match:
+        dns.type: answer