aboutsummaryrefslogtreecommitdiffstats
path: root/docs/testing/developer
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2017-08-14 14:27:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-14 14:27:06 +0000
commit2a4d03a1c5634c7d8b54bd9bda6c14b7a683de6e (patch)
tree5588bbaff2b78881d1aafab0ec40502e5c3dedf7 /docs/testing/developer
parent73025baf2e393c61c59957e8714d2ddd54d25e51 (diff)
parent6961a6fa333ca2cff055d7d7a889876263b673f5 (diff)
Merge "tests: L3, L4 and VxLAN tests for OVS & VPP"
Diffstat (limited to 'docs/testing/developer')
-rw-r--r--docs/testing/developer/design/vswitchperf_design.rst12
1 files changed, 7 insertions, 5 deletions
diff --git a/docs/testing/developer/design/vswitchperf_design.rst b/docs/testing/developer/design/vswitchperf_design.rst
index a5a99c8a..8111b513 100644
--- a/docs/testing/developer/design/vswitchperf_design.rst
+++ b/docs/testing/developer/design/vswitchperf_design.rst
@@ -94,11 +94,13 @@ Configuration Procedure and Precedence
--------------------------------------
Configuration files follow a strict naming convention that allows them to be
-processed in a specific order. All the .conf files are named ``NN_name.conf``,
-where NN is a decimal number. The files are processed in order from 00_name.conf
-to 99_name.conf so that if the name setting is given in both a lower and higher
-numbered conf file then the higher numbered file is the effective setting as it
-is processed after the setting in the lower numbered file.
+processed in a specific order. All the .conf files are named ``NNx_name.conf``,
+where ``NN`` is a decimal number and ``x`` is an optional alphabetical suffix.
+The files are processed in order from ``00_name.conf`` to ``99_name.conf``
+(and from ``00a_name`` to ``00z_name``), so that if the name setting is given
+in both a lower and higher numbered conf file then the higher numbered file
+is the effective setting as it is processed after the setting in the lower
+numbered file.
The values in the file specified by ``--conf-file`` takes precedence over all
the other configuration files and does not have to follow the naming