From: Nicholas Pratte <npra...@iol.unh.edu>
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>
Signed-off-by: Patrick Robb <pr...@iol.unh.edu>
Reviewed-by: Dean Marx <dm...@iol.unh.edu>
---
dts/{ => configurations}/nodes.example.yaml | 0
dts/{ => configurations}/test_run.example.yaml | 13 +++++++------
dts/{ => configurations}/tests_config.example.yaml | 0
dts/framework/settings.py | 6 ++++--
4 files changed, 11 insertions(+), 8 deletions(-)
rename dts/{ => configurations}/nodes.example.yaml (100%)
rename dts/{ => configurations}/test_run.example.yaml (80%)
rename dts/{ => configurations}/tests_config.example.yaml (100%)
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 80%
rename from dts/test_run.example.yaml
rename to dts/configurations/test_run.example.yaml
index 1bc436eed1..e9baf10035 100644
--- a/dts/test_run.example.yaml
+++ b/dts/configurations/test_run.example.yaml
@@ -1,8 +1,3 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2022-2023 The DPDK contributors
-# Copyright 2023 Arm Limited
-
-# Define the test run environment
dpdk:
lcores: "" # use all available logical cores (Skips first core)
memory_channels: 4 # tells DPDK to use 4 memory channels
@@ -23,8 +18,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: "/opt/trex_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: true # 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/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.49.0
