Rework test run configuration file for TGs to support both application
directory location and any necessary configuration files; an example
TREX configuration file is provided. Configuration files have been moved
to a configurations directory, requiring a slight modification to the
settings module.
Bugzilla ID: 1697
Signed-off-by: Nicholas Pratte <npra...@iol.unh.edu>
---
dts/{ => configurations}/nodes.example.yaml | 0
dts/{ => configurations}/test_run.example.yaml | 8 +++++++-
.../tests_config.example.yaml | 0
dts/configurations/trex_configs/intel_40g.yaml | 18 ++++++++++++++++++
dts/framework/settings.py | 6 ++++--
5 files changed, 29 insertions(+), 3 deletions(-)
rename dts/{ => configurations}/nodes.example.yaml (100%)
rename dts/{ => configurations}/test_run.example.yaml (82%)
rename dts/{ => configurations}/tests_config.example.yaml (100%)
create mode 100644 dts/configurations/trex_configs/intel_40g.yaml
diff --git a/dts/nodes.example.yaml b/dts/configurations/nodes.example.yaml
similarity index 100%
rename from dts/nodes.example.yaml
rename to dts/configurations/nodes.example.yaml
diff --git a/dts/test_run.example.yaml
b/dts/configurations/test_run.example.yaml
similarity index 82%
rename from dts/test_run.example.yaml
rename to dts/configurations/test_run.example.yaml
index 330a31bb18..fdfff4a879 100644
--- a/dts/test_run.example.yaml
+++ b/dts/configurations/test_run.example.yaml
@@ -23,8 +23,14 @@ dpdk:
# in a subdirectory of DPDK tree root directory. Otherwise, will be using
the `build_options`
# to build the DPDK from source. Either `precompiled_build_dir` or
`build_options` can be
# defined, but not both.
-traffic_generator:
+func_traffic_generator:
type: SCAPY
+ remote_path: "" # The remote path of the traffic generator application.
(Leave blank for SCAPY)
+ config: "" # Additional configuration files. (Leave blank if not required)
+perf_traffic_generator:
+ type: TREX
+ remote_path: "/opt/trex/v3.03" # The remote path of the traffic generator
application. (Leave blank for SCAPY)
+ config: "trex_config.yaml" # Additional configuration files. (Leave blank if
not required)
perf: false # disable performance testing
func: true # enable functional testing
skip_smoke_tests: false # optional
diff --git a/dts/tests_config.example.yaml
b/dts/configurations/tests_config.example.yaml
similarity index 100%
rename from dts/tests_config.example.yaml
rename to dts/configurations/tests_config.example.yaml
diff --git a/dts/configurations/trex_configs/intel_40g.yaml
b/dts/configurations/trex_configs/intel_40g.yaml
new file mode 100644
index 0000000000..dae003795b
--- /dev/null
+++ b/dts/configurations/trex_configs/intel_40g.yaml
@@ -0,0 +1,18 @@
+### Config file generated by dpdk_setup_ports.py ###
+
+- version: 2
+ interfaces: ['11:00.0', '11:00.1']
+ port_bandwidth_gb: 40
+ port_info:
+ - dest_mac: 3c:fd:fe:d5:e5:f9 # MAC OF LOOPBACK TO IT'S DUAL INTERFACE
+ src_mac: 3c:fd:fe:d5:e5:f8
+ - dest_mac: 3c:fd:fe:d5:e5:f8 # MAC OF LOOPBACK TO IT'S DUAL INTERFACE
+ src_mac: 3c:fd:fe:d5:e5:f9
+
+ platform:
+ master_thread_id: 0
+ latency_thread_id: 7
+ dual_if:
+ - socket: 0
+ threads: [1,2,3,4,5,6]
+
diff --git a/dts/framework/settings.py b/dts/framework/settings.py
index 3f21615223..ccf4df25b0 100644
--- a/dts/framework/settings.py
+++ b/dts/framework/settings.py
@@ -130,9 +130,11 @@ class Settings:
"""
#:
- test_run_config_path: Path =
Path(__file__).parent.parent.joinpath("test_run.yaml")
+ test_run_config_path: Path = Path(__file__).parent.parent.joinpath(
+ "configurations/test_run.yaml"
+ )
#:
- nodes_config_path: Path =
Path(__file__).parent.parent.joinpath("nodes.yaml")
+ nodes_config_path: Path =
Path(__file__).parent.parent.joinpath("configurations/nodes.yaml")
#:
tests_config_path: Path | None = None
#:
--
2.47.1
