X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=docs%2Freport%2Fvpp_performance_tests%2Ftest_environment.rst;h=64863e3d7b6c54627ad7eba0d76fd61b736cb822;hp=11308e8706ffc497eb8bba574f6e7d407e0652c3;hb=72f18772740b0dde1ed6e44d740f8456ce0546e9;hpb=2fc7ba3b3b5dad5a211310d529c5a375dea8b946

diff --git a/docs/report/vpp_performance_tests/test_environment.rst b/docs/report/vpp_performance_tests/test_environment.rst
index 11308e8706..64863e3d7b 100644
--- a/docs/report/vpp_performance_tests/test_environment.rst
+++ b/docs/report/vpp_performance_tests/test_environment.rst
@@ -3,37 +3,40 @@
 
     \clearpage
 
+.. _vpp_test_environment:
+
 .. include:: ../introduction/test_environment_intro.rst
 
 .. include:: ../introduction/test_environment_sut_conf_1.rst
 
-.. include:: ../introduction/test_environment_sut_conf_2.rst
-
-.. include:: ../introduction/test_environment_sut_conf_3.rst
 
+DUT Settings - VPP
+------------------
 
-DUT Configuration - VPP
------------------------
-
-**VPP Version**
+VPP Version
+~~~~~~~~~~~
 
 |vpp-release|
 
-**VPP Compile Parameters**
+VPP Compile Parameters
+~~~~~~~~~~~~~~~~~~~~~~
 
 `FD.io VPP compile job`_
 
-**VPP Install Parameters**
+VPP Install Parameters
+~~~~~~~~~~~~~~~~~~~~~~
 
 ::
 
-    $ dpkg -i --force-all vpp*
+    $ dpkg -i --force-all *vpp*
 
-**VPP Startup Configuration**
+VPP Startup Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
-VPP startup configuration changes per test case with different settings for
-`$$CORELIST_WORKERS`, `$$NUM_RX_QUEUES`, `$$UIO_DRIVER`, `$$NUM-MBUFS` and
-`$$NO_MULTI_SEG` parameter. Default template:
+VPP startup configuration vary per test case, with different settings
+for `$$CORELIST_WORKERS`, `$$NUM_RX_QUEUES`, `$$UIO_DRIVER`, and
+`$$NO_MULTI_SEG` parameter. List of plugins to enable is driven by test
+requirements. Default template is provided below:
 
 ::
 
@@ -44,12 +47,17 @@ VPP startup configuration changes per test case with different settings for
     statseg
     {
       size 4G
+      per-node-counters on
     }
     unix
     {
       cli-listen /run/vpp/cli.sock
       log /tmp/vpe.log
       nodaemon
+      full-coredump
+    }
+    socksvr {
+      socket-name /run/vpp/api.sock
     }
     ip6
     {
@@ -63,7 +71,7 @@ VPP startup configuration changes per test case with different settings for
       {
         disable
       }
-      plugin dpdk_plugin.so
+      plugin <$$test_requirement>_plugin.so
       {
         enable
       }
@@ -73,9 +81,14 @@ VPP startup configuration changes per test case with different settings for
       corelist-workers $$CORELIST_WORKERS
       main-core 1
     }
+    buffers
+    {
+      buffers-per-numa 215040
+    }
+
+    # Below: in case of dpdk based drivers (vfio-pci) only
     dpdk
     {
-      num-mbufs $$NUM-MBUFS
       uio-driver $$UIO_DRIVER
       $$NO_MULTI_SEG
       log-level debug
@@ -83,10 +96,26 @@ VPP startup configuration changes per test case with different settings for
       {
         num-rx-queues $$NUM_RX_QUEUES
       }
-      socket-mem 1024,1024
       no-tx-checksum-offload
       dev $$DEV_1
       dev $$DEV_2
     }
 
+Description of VPP startup settings used in CSIT is provided in
+:ref:`test_methodology`.
+
 .. include:: ../introduction/test_environment_tg.rst
+
+.. include:: ../introduction/test_environment_pre_test_server_calib.rst
+
+.. include:: ../introduction/test_environment_sut_calib_skx.rst
+
+.. include:: ../introduction/test_environment_sut_calib_clx.rst
+
+.. include:: ../introduction/test_environment_sut_calib_hsw.rst
+
+.. include:: ../introduction/test_environment_sut_calib_dnv.rst
+
+.. include:: ../introduction/test_environment_sut_calib_tsh.rst
+
+.. include:: ../introduction/test_environment_sut_calib_tx2.rst