From 012594e0bb3408feafff205dfc7c44ab1aeb46fb Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Wed, 26 Mar 2025 15:27:17 -0600 Subject: [PATCH] tests: put dnp3 tests into a dnp3 sub-directory --- tests/{ => dnp3}/dnp3-del-measure/README.md | 0 tests/{ => dnp3}/dnp3-del-measure/input.pcap | Bin tests/{ => dnp3}/dnp3-del-measure/suricata.yaml | 0 tests/{ => dnp3}/dnp3-del-measure/test.yaml | 0 tests/{ => dnp3}/dnp3-dnp3_data-alert/README.md | 0 tests/{ => dnp3}/dnp3-dnp3_data-alert/suricata.yaml | 2 +- tests/{ => dnp3}/dnp3-dnp3_data-alert/test.rules | 0 tests/{ => dnp3}/dnp3-dnp3_data-alert/test.yaml | 0 tests/{ => dnp3}/dnp3-dnp3_func-alert/README.md | 0 tests/{ => dnp3}/dnp3-dnp3_func-alert/suricata.yaml | 2 +- tests/{ => dnp3}/dnp3-dnp3_func-alert/test.rules | 0 tests/{ => dnp3}/dnp3-dnp3_func-alert/test.yaml | 0 tests/{ => dnp3}/dnp3-dnp3_obj-alert/README.md | 0 tests/{ => dnp3}/dnp3-dnp3_obj-alert/suricata.yaml | 0 tests/{ => dnp3}/dnp3-dnp3_obj-alert/test.rules | 0 tests/{ => dnp3}/dnp3-dnp3_obj-alert/test.yaml | 0 tests/{ => dnp3}/dnp3-en-spon/README.md | 0 tests/{ => dnp3}/dnp3-en-spon/input.pcap | Bin tests/{ => dnp3}/dnp3-en-spon/suricata.yaml | 0 tests/{ => dnp3}/dnp3-en-spon/test.yaml | 0 tests/{ => dnp3}/dnp3-eve/input.pcap | Bin tests/{ => dnp3}/dnp3-eve/suricata.yaml | 0 tests/{ => dnp3}/dnp3-eve/test.yaml | 0 tests/{ => dnp3}/dnp3-file-del/README.md | 0 tests/{ => dnp3}/dnp3-file-del/input.pcap | Bin tests/{ => dnp3}/dnp3-file-del/suricata.yaml | 0 tests/{ => dnp3}/dnp3-file-del/test.yaml | 0 tests/{ => dnp3}/dnp3-file-read/README.md | 0 tests/{ => dnp3}/dnp3-file-read/input.pcap | Bin tests/{ => dnp3}/dnp3-file-read/suricata.yaml | 0 tests/{ => dnp3}/dnp3-file-read/test.yaml | 0 tests/{ => dnp3}/dnp3-file-write/README.md | 0 tests/{ => dnp3}/dnp3-file-write/input.pcap | Bin tests/{ => dnp3}/dnp3-file-write/suricata.yaml | 0 tests/{ => dnp3}/dnp3-file-write/test.yaml | 0 tests/{ => dnp3}/dnp3-select-operate/README.md | 0 tests/{ => dnp3}/dnp3-select-operate/input.pcap | Bin tests/{ => dnp3}/dnp3-select-operate/suricata.yaml | 0 tests/{ => dnp3}/dnp3-select-operate/test.yaml | 0 tests/{ => dnp3}/dnp3-toclient-start/README.md | 0 .../dnp3-toclient-start/dnp3_toclient_start.pcap | Bin tests/{ => dnp3}/dnp3-toclient-start/test.yaml | 0 tests/{ => dnp3}/dnp3-write/README.md | 0 tests/{ => dnp3}/dnp3-write/input.pcap | Bin tests/{ => dnp3}/dnp3-write/suricata.yaml | 0 tests/{ => dnp3}/dnp3-write/test.yaml | 0 46 files changed, 2 insertions(+), 2 deletions(-) rename tests/{ => dnp3}/dnp3-del-measure/README.md (100%) rename tests/{ => dnp3}/dnp3-del-measure/input.pcap (100%) rename tests/{ => dnp3}/dnp3-del-measure/suricata.yaml (100%) rename tests/{ => dnp3}/dnp3-del-measure/test.yaml (100%) rename tests/{ => dnp3}/dnp3-dnp3_data-alert/README.md (100%) rename tests/{ => dnp3}/dnp3-dnp3_data-alert/suricata.yaml (87%) rename tests/{ => dnp3}/dnp3-dnp3_data-alert/test.rules (100%) rename tests/{ => dnp3}/dnp3-dnp3_data-alert/test.yaml (100%) rename tests/{ => dnp3}/dnp3-dnp3_func-alert/README.md (100%) rename tests/{ => dnp3}/dnp3-dnp3_func-alert/suricata.yaml (87%) rename tests/{ => dnp3}/dnp3-dnp3_func-alert/test.rules (100%) rename tests/{ => dnp3}/dnp3-dnp3_func-alert/test.yaml (100%) rename tests/{ => dnp3}/dnp3-dnp3_obj-alert/README.md (100%) rename tests/{ => dnp3}/dnp3-dnp3_obj-alert/suricata.yaml (100%) rename tests/{ => dnp3}/dnp3-dnp3_obj-alert/test.rules (100%) rename tests/{ => dnp3}/dnp3-dnp3_obj-alert/test.yaml (100%) rename tests/{ => dnp3}/dnp3-en-spon/README.md (100%) rename tests/{ => dnp3}/dnp3-en-spon/input.pcap (100%) rename tests/{ => dnp3}/dnp3-en-spon/suricata.yaml (100%) rename tests/{ => dnp3}/dnp3-en-spon/test.yaml (100%) rename tests/{ => dnp3}/dnp3-eve/input.pcap (100%) rename tests/{ => dnp3}/dnp3-eve/suricata.yaml (100%) rename tests/{ => dnp3}/dnp3-eve/test.yaml (100%) rename tests/{ => dnp3}/dnp3-file-del/README.md (100%) rename tests/{ => dnp3}/dnp3-file-del/input.pcap (100%) rename tests/{ => dnp3}/dnp3-file-del/suricata.yaml (100%) rename tests/{ => dnp3}/dnp3-file-del/test.yaml (100%) rename tests/{ => dnp3}/dnp3-file-read/README.md (100%) rename tests/{ => dnp3}/dnp3-file-read/input.pcap (100%) rename tests/{ => dnp3}/dnp3-file-read/suricata.yaml (100%) rename tests/{ => dnp3}/dnp3-file-read/test.yaml (100%) rename tests/{ => dnp3}/dnp3-file-write/README.md (100%) rename tests/{ => dnp3}/dnp3-file-write/input.pcap (100%) rename tests/{ => dnp3}/dnp3-file-write/suricata.yaml (100%) rename tests/{ => dnp3}/dnp3-file-write/test.yaml (100%) rename tests/{ => dnp3}/dnp3-select-operate/README.md (100%) rename tests/{ => dnp3}/dnp3-select-operate/input.pcap (100%) rename tests/{ => dnp3}/dnp3-select-operate/suricata.yaml (100%) rename tests/{ => dnp3}/dnp3-select-operate/test.yaml (100%) rename tests/{ => dnp3}/dnp3-toclient-start/README.md (100%) rename tests/{ => dnp3}/dnp3-toclient-start/dnp3_toclient_start.pcap (100%) rename tests/{ => dnp3}/dnp3-toclient-start/test.yaml (100%) rename tests/{ => dnp3}/dnp3-write/README.md (100%) rename tests/{ => dnp3}/dnp3-write/input.pcap (100%) rename tests/{ => dnp3}/dnp3-write/suricata.yaml (100%) rename tests/{ => dnp3}/dnp3-write/test.yaml (100%) diff --git a/tests/dnp3-del-measure/README.md b/tests/dnp3/dnp3-del-measure/README.md similarity index 100% rename from tests/dnp3-del-measure/README.md rename to tests/dnp3/dnp3-del-measure/README.md diff --git a/tests/dnp3-del-measure/input.pcap b/tests/dnp3/dnp3-del-measure/input.pcap similarity index 100% rename from tests/dnp3-del-measure/input.pcap rename to tests/dnp3/dnp3-del-measure/input.pcap diff --git a/tests/dnp3-del-measure/suricata.yaml b/tests/dnp3/dnp3-del-measure/suricata.yaml similarity index 100% rename from tests/dnp3-del-measure/suricata.yaml rename to tests/dnp3/dnp3-del-measure/suricata.yaml diff --git a/tests/dnp3-del-measure/test.yaml b/tests/dnp3/dnp3-del-measure/test.yaml similarity index 100% rename from tests/dnp3-del-measure/test.yaml rename to tests/dnp3/dnp3-del-measure/test.yaml diff --git a/tests/dnp3-dnp3_data-alert/README.md b/tests/dnp3/dnp3-dnp3_data-alert/README.md similarity index 100% rename from tests/dnp3-dnp3_data-alert/README.md rename to tests/dnp3/dnp3-dnp3_data-alert/README.md diff --git a/tests/dnp3-dnp3_data-alert/suricata.yaml b/tests/dnp3/dnp3-dnp3_data-alert/suricata.yaml similarity index 87% rename from tests/dnp3-dnp3_data-alert/suricata.yaml rename to tests/dnp3/dnp3-dnp3_data-alert/suricata.yaml index d416631d6..9ef953ccb 100644 --- a/tests/dnp3-dnp3_data-alert/suricata.yaml +++ b/tests/dnp3/dnp3-dnp3_data-alert/suricata.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- -include: ../../etc/suricata-3.1.2.yaml +include: ../../../etc/suricata-3.1.2.yaml outputs: - eve-log: diff --git a/tests/dnp3-dnp3_data-alert/test.rules b/tests/dnp3/dnp3-dnp3_data-alert/test.rules similarity index 100% rename from tests/dnp3-dnp3_data-alert/test.rules rename to tests/dnp3/dnp3-dnp3_data-alert/test.rules diff --git a/tests/dnp3-dnp3_data-alert/test.yaml b/tests/dnp3/dnp3-dnp3_data-alert/test.yaml similarity index 100% rename from tests/dnp3-dnp3_data-alert/test.yaml rename to tests/dnp3/dnp3-dnp3_data-alert/test.yaml diff --git a/tests/dnp3-dnp3_func-alert/README.md b/tests/dnp3/dnp3-dnp3_func-alert/README.md similarity index 100% rename from tests/dnp3-dnp3_func-alert/README.md rename to tests/dnp3/dnp3-dnp3_func-alert/README.md diff --git a/tests/dnp3-dnp3_func-alert/suricata.yaml b/tests/dnp3/dnp3-dnp3_func-alert/suricata.yaml similarity index 87% rename from tests/dnp3-dnp3_func-alert/suricata.yaml rename to tests/dnp3/dnp3-dnp3_func-alert/suricata.yaml index d416631d6..9ef953ccb 100644 --- a/tests/dnp3-dnp3_func-alert/suricata.yaml +++ b/tests/dnp3/dnp3-dnp3_func-alert/suricata.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- -include: ../../etc/suricata-3.1.2.yaml +include: ../../../etc/suricata-3.1.2.yaml outputs: - eve-log: diff --git a/tests/dnp3-dnp3_func-alert/test.rules b/tests/dnp3/dnp3-dnp3_func-alert/test.rules similarity index 100% rename from tests/dnp3-dnp3_func-alert/test.rules rename to tests/dnp3/dnp3-dnp3_func-alert/test.rules diff --git a/tests/dnp3-dnp3_func-alert/test.yaml b/tests/dnp3/dnp3-dnp3_func-alert/test.yaml similarity index 100% rename from tests/dnp3-dnp3_func-alert/test.yaml rename to tests/dnp3/dnp3-dnp3_func-alert/test.yaml diff --git a/tests/dnp3-dnp3_obj-alert/README.md b/tests/dnp3/dnp3-dnp3_obj-alert/README.md similarity index 100% rename from tests/dnp3-dnp3_obj-alert/README.md rename to tests/dnp3/dnp3-dnp3_obj-alert/README.md diff --git a/tests/dnp3-dnp3_obj-alert/suricata.yaml b/tests/dnp3/dnp3-dnp3_obj-alert/suricata.yaml similarity index 100% rename from tests/dnp3-dnp3_obj-alert/suricata.yaml rename to tests/dnp3/dnp3-dnp3_obj-alert/suricata.yaml diff --git a/tests/dnp3-dnp3_obj-alert/test.rules b/tests/dnp3/dnp3-dnp3_obj-alert/test.rules similarity index 100% rename from tests/dnp3-dnp3_obj-alert/test.rules rename to tests/dnp3/dnp3-dnp3_obj-alert/test.rules diff --git a/tests/dnp3-dnp3_obj-alert/test.yaml b/tests/dnp3/dnp3-dnp3_obj-alert/test.yaml similarity index 100% rename from tests/dnp3-dnp3_obj-alert/test.yaml rename to tests/dnp3/dnp3-dnp3_obj-alert/test.yaml diff --git a/tests/dnp3-en-spon/README.md b/tests/dnp3/dnp3-en-spon/README.md similarity index 100% rename from tests/dnp3-en-spon/README.md rename to tests/dnp3/dnp3-en-spon/README.md diff --git a/tests/dnp3-en-spon/input.pcap b/tests/dnp3/dnp3-en-spon/input.pcap similarity index 100% rename from tests/dnp3-en-spon/input.pcap rename to tests/dnp3/dnp3-en-spon/input.pcap diff --git a/tests/dnp3-en-spon/suricata.yaml b/tests/dnp3/dnp3-en-spon/suricata.yaml similarity index 100% rename from tests/dnp3-en-spon/suricata.yaml rename to tests/dnp3/dnp3-en-spon/suricata.yaml diff --git a/tests/dnp3-en-spon/test.yaml b/tests/dnp3/dnp3-en-spon/test.yaml similarity index 100% rename from tests/dnp3-en-spon/test.yaml rename to tests/dnp3/dnp3-en-spon/test.yaml diff --git a/tests/dnp3-eve/input.pcap b/tests/dnp3/dnp3-eve/input.pcap similarity index 100% rename from tests/dnp3-eve/input.pcap rename to tests/dnp3/dnp3-eve/input.pcap diff --git a/tests/dnp3-eve/suricata.yaml b/tests/dnp3/dnp3-eve/suricata.yaml similarity index 100% rename from tests/dnp3-eve/suricata.yaml rename to tests/dnp3/dnp3-eve/suricata.yaml diff --git a/tests/dnp3-eve/test.yaml b/tests/dnp3/dnp3-eve/test.yaml similarity index 100% rename from tests/dnp3-eve/test.yaml rename to tests/dnp3/dnp3-eve/test.yaml diff --git a/tests/dnp3-file-del/README.md b/tests/dnp3/dnp3-file-del/README.md similarity index 100% rename from tests/dnp3-file-del/README.md rename to tests/dnp3/dnp3-file-del/README.md diff --git a/tests/dnp3-file-del/input.pcap b/tests/dnp3/dnp3-file-del/input.pcap similarity index 100% rename from tests/dnp3-file-del/input.pcap rename to tests/dnp3/dnp3-file-del/input.pcap diff --git a/tests/dnp3-file-del/suricata.yaml b/tests/dnp3/dnp3-file-del/suricata.yaml similarity index 100% rename from tests/dnp3-file-del/suricata.yaml rename to tests/dnp3/dnp3-file-del/suricata.yaml diff --git a/tests/dnp3-file-del/test.yaml b/tests/dnp3/dnp3-file-del/test.yaml similarity index 100% rename from tests/dnp3-file-del/test.yaml rename to tests/dnp3/dnp3-file-del/test.yaml diff --git a/tests/dnp3-file-read/README.md b/tests/dnp3/dnp3-file-read/README.md similarity index 100% rename from tests/dnp3-file-read/README.md rename to tests/dnp3/dnp3-file-read/README.md diff --git a/tests/dnp3-file-read/input.pcap b/tests/dnp3/dnp3-file-read/input.pcap similarity index 100% rename from tests/dnp3-file-read/input.pcap rename to tests/dnp3/dnp3-file-read/input.pcap diff --git a/tests/dnp3-file-read/suricata.yaml b/tests/dnp3/dnp3-file-read/suricata.yaml similarity index 100% rename from tests/dnp3-file-read/suricata.yaml rename to tests/dnp3/dnp3-file-read/suricata.yaml diff --git a/tests/dnp3-file-read/test.yaml b/tests/dnp3/dnp3-file-read/test.yaml similarity index 100% rename from tests/dnp3-file-read/test.yaml rename to tests/dnp3/dnp3-file-read/test.yaml diff --git a/tests/dnp3-file-write/README.md b/tests/dnp3/dnp3-file-write/README.md similarity index 100% rename from tests/dnp3-file-write/README.md rename to tests/dnp3/dnp3-file-write/README.md diff --git a/tests/dnp3-file-write/input.pcap b/tests/dnp3/dnp3-file-write/input.pcap similarity index 100% rename from tests/dnp3-file-write/input.pcap rename to tests/dnp3/dnp3-file-write/input.pcap diff --git a/tests/dnp3-file-write/suricata.yaml b/tests/dnp3/dnp3-file-write/suricata.yaml similarity index 100% rename from tests/dnp3-file-write/suricata.yaml rename to tests/dnp3/dnp3-file-write/suricata.yaml diff --git a/tests/dnp3-file-write/test.yaml b/tests/dnp3/dnp3-file-write/test.yaml similarity index 100% rename from tests/dnp3-file-write/test.yaml rename to tests/dnp3/dnp3-file-write/test.yaml diff --git a/tests/dnp3-select-operate/README.md b/tests/dnp3/dnp3-select-operate/README.md similarity index 100% rename from tests/dnp3-select-operate/README.md rename to tests/dnp3/dnp3-select-operate/README.md diff --git a/tests/dnp3-select-operate/input.pcap b/tests/dnp3/dnp3-select-operate/input.pcap similarity index 100% rename from tests/dnp3-select-operate/input.pcap rename to tests/dnp3/dnp3-select-operate/input.pcap diff --git a/tests/dnp3-select-operate/suricata.yaml b/tests/dnp3/dnp3-select-operate/suricata.yaml similarity index 100% rename from tests/dnp3-select-operate/suricata.yaml rename to tests/dnp3/dnp3-select-operate/suricata.yaml diff --git a/tests/dnp3-select-operate/test.yaml b/tests/dnp3/dnp3-select-operate/test.yaml similarity index 100% rename from tests/dnp3-select-operate/test.yaml rename to tests/dnp3/dnp3-select-operate/test.yaml diff --git a/tests/dnp3-toclient-start/README.md b/tests/dnp3/dnp3-toclient-start/README.md similarity index 100% rename from tests/dnp3-toclient-start/README.md rename to tests/dnp3/dnp3-toclient-start/README.md diff --git a/tests/dnp3-toclient-start/dnp3_toclient_start.pcap b/tests/dnp3/dnp3-toclient-start/dnp3_toclient_start.pcap similarity index 100% rename from tests/dnp3-toclient-start/dnp3_toclient_start.pcap rename to tests/dnp3/dnp3-toclient-start/dnp3_toclient_start.pcap diff --git a/tests/dnp3-toclient-start/test.yaml b/tests/dnp3/dnp3-toclient-start/test.yaml similarity index 100% rename from tests/dnp3-toclient-start/test.yaml rename to tests/dnp3/dnp3-toclient-start/test.yaml diff --git a/tests/dnp3-write/README.md b/tests/dnp3/dnp3-write/README.md similarity index 100% rename from tests/dnp3-write/README.md rename to tests/dnp3/dnp3-write/README.md diff --git a/tests/dnp3-write/input.pcap b/tests/dnp3/dnp3-write/input.pcap similarity index 100% rename from tests/dnp3-write/input.pcap rename to tests/dnp3/dnp3-write/input.pcap diff --git a/tests/dnp3-write/suricata.yaml b/tests/dnp3/dnp3-write/suricata.yaml similarity index 100% rename from tests/dnp3-write/suricata.yaml rename to tests/dnp3/dnp3-write/suricata.yaml diff --git a/tests/dnp3-write/test.yaml b/tests/dnp3/dnp3-write/test.yaml similarity index 100% rename from tests/dnp3-write/test.yaml rename to tests/dnp3/dnp3-write/test.yaml -- 2.47.2