X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=docs%2Freport%2Fdpdk_performance_tests%2Ftest_environment.rst;fp=docs%2Freport%2Fdpdk_performance_tests%2Ftest_environment.rst;h=7de29ee33218bea50e787ef26b6683b5213bb9e2;hp=204792015feeb56732c93d492835c049f9c5c208;hb=ee1321d27bc39baab5bc2615834fd7392b79a160;hpb=ce1088d88744f2c040801c9852565d522b3feb68

diff --git a/docs/report/dpdk_performance_tests/test_environment.rst b/docs/report/dpdk_performance_tests/test_environment.rst
index 204792015f..7de29ee332 100644
--- a/docs/report/dpdk_performance_tests/test_environment.rst
+++ b/docs/report/dpdk_performance_tests/test_environment.rst
@@ -1,8 +1,8 @@
-.. include:: ../vpp_performance_tests/test_environment_intro.rst
+.. include:: ../introduction/test_environment_intro.rst
 
-.. include:: ../vpp_performance_tests/test_environment_sut_conf_1.rst
+.. include:: ../introduction/test_environment_sut_conf_1.rst
 
-.. include:: ../vpp_performance_tests/test_environment_sut_conf_3.rst
+.. include:: ../introduction/test_environment_sut_conf_3.rst
 
 
 DUT Configuration - DPDK
@@ -20,49 +20,23 @@ DUT Configuration - DPDK
 
 **Testpmd Startup Configuration**
 
-Testpmd startup configuration changes per test case with different settings for CPU
-cores, rx-queues. Startup config is aligned with applied test case tag:
-
-Tagged by **1T1C**
-
-.. code-block:: bash
-
-    testpmd -c 0x3 -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=1 --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=1 --txq=1 --burst=64 --rxd=1024 --txd=1024 --disable-link-check --auto-start
-
-Tagged by **2T2C**
-
-.. code-block:: bash
-
-    testpmd -c 0x403 -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=2 --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=1 --txq=1 --burst=64 --rxd=1024 --txd=1024 --disable-link-check --auto-start
-
-Tagged by **4T4C**
+Testpmd startup configuration changes per test case with different settings for
+`$$CORES`, `$$RXQ` and max-pkt-len parameter if test is sending jumbo frames.
+Startup command template:
 
 .. code-block:: bash
 
-    testpmd -c 0xc07 -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=4 --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=2 --txq=2 --burst=64 --rxd=1024 --txd=1024 --disable-link-check --auto-start
+    testpmd -c $$CORE_MASK -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=$$CORES --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=$$RXQ --txq=$$TXQ --burst=64 --rxd=1024 --txd=1024 --disable-link-check --auto-start
 
 **L3FWD Startup Configuration**
 
-L3FWD startup configuration changes per test case with different settings for CPU
-cores, rx-queues. Startup config is aligned with applied test case tag:
-
-Tagged by **1T1C**
-
-.. code-block:: bash
-
-    l3fwd -l 1 -n 4 -- -P -L -p 0x3 --config='${port_config}' --enable-jumbo --max-pkt-len=9000 --eth-dest=0,${adj_mac0} --eth-dest=1,${adj_mac1} --parse-ptype
-
-Tagged by **2T2C**
-
-.. code-block:: bash
-
-    l3fwd -l 1,2 -n 4 -- -P -L -p 0x3 --config='${port_config}' --enable-jumbo --max-pkt-len=9000 --eth-dest=0,${adj_mac0} --eth-dest=1,${adj_mac1} --parse-ptype
-
-Tagged by **4T4C**
+L3FWD startup configuration changes per test case with different settings for
+`$$CORES` and enable-jumbo parameter if test is sending jumbo frames.
+Startup command template:
 
 .. code-block:: bash
 
-    l3fwd -l 1,2,3,4 -n 4 -- -P -L -p 0x3 --config='${port_config}' --enable-jumbo --max-pkt-len=9000 --eth-dest=0,${adj_mac0} --eth-dest=1,${adj_mac1} --parse-ptype
+    l3fwd -l $$CORE_LIST -n 4 -- -P -L -p 0x3 --config='${port_config}' --enable-jumbo --max-pkt-len=9000 --eth-dest=0,${adj_mac0} --eth-dest=1,${adj_mac1} --parse-ptype
 
 
-.. include:: ../vpp_performance_tests/test_environment_tg.rst
+.. include:: ../introduction/test_environment_tg.rst