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=dec8780904b4fa92137a08114a14abab80707fd1;hp=6dd6ca35d833e55cfbe0f99c2d8a63272a28d67b;hb=bf0fa247e2e95c14bc76dae43a0df26be410d931;hpb=3bb7803c9e74d4ceeac77480c11e01d5d8d7d589

diff --git a/docs/report/vpp_performance_tests/test_environment.rst b/docs/report/vpp_performance_tests/test_environment.rst
index 6dd6ca35d8..dec8780904 100644
--- a/docs/report/vpp_performance_tests/test_environment.rst
+++ b/docs/report/vpp_performance_tests/test_environment.rst
@@ -3,22 +3,14 @@
 
     \clearpage
 
-.. include:: ../introduction/test_environment_intro.rst
-
-.. include:: ../introduction/test_environment_sut_calib_hsw.rst
+.. _vpp_test_environment:
 
-.. include:: ../introduction/test_environment_sut_calib_skx.rst
-
-.. include:: ../introduction/test_environment_sut_meltspec_hsw.rst
+.. include:: ../introduction/test_environment_intro.rst
 
-.. include:: ../introduction/test_environment_sut_meltspec_skx.rst
+.. include:: ../introduction/test_environment_changes_vpp.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
 ------------------
@@ -38,15 +30,15 @@ VPP Install Parameters
 
 ::
 
-    $ dpkg -i --force-all vpp*
+    $ dpkg -i --force-all *vpp*
 
 VPP Startup Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 VPP startup configuration vary per test case, with different settings
-for `$$CORELIST_WORKERS`, `$$NUM_RX_QUEUES`, `$$UIO_DRIVER`, `$$NUM-
-MBUFS` and `$$NO_MULTI_SEG` parameter. Default template is provided
-below:
+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:
 
 ::
 
@@ -57,12 +49,17 @@ below:
     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
     {
@@ -76,7 +73,7 @@ below:
       {
         disable
       }
-      plugin dpdk_plugin.so
+      plugin <$$test_requirement>_plugin.so
       {
         enable
       }
@@ -86,9 +83,14 @@ below:
       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
@@ -96,13 +98,30 @@ below:
       {
         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:`performance_test_methodology`.
+:ref:`test_methodology`.
 
 .. include:: ../introduction/test_environment_tg.rst
+
+.. include:: ../introduction/test_environment_pre_test_server_calib.rst
+
+.. include:: ../introduction/test_environment_sut_calib_icx.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_alt.rst
+
+.. include:: ../introduction/test_environment_sut_calib_tsh.rst
+
+.. include:: ../introduction/test_environment_sut_calib_tx2.rst