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=aa64d1b5bcf35b37762a6849829bd850f8a71651;hp=91ca3bcc078a01c8263ab27627e501eaab1ad67a;hb=94f675829cc82bd511b0b4eabeca5f8f27e2e411;hpb=61ef529d33efd51acd1b1986c325d25a9d7ba705

diff --git a/docs/report/vpp_performance_tests/test_environment.rst b/docs/report/vpp_performance_tests/test_environment.rst
index 91ca3bcc07..aa64d1b5bc 100644
--- a/docs/report/vpp_performance_tests/test_environment.rst
+++ b/docs/report/vpp_performance_tests/test_environment.rst
@@ -1,138 +1,53 @@
-.. include:: test_environment_intro.rst
 
-.. include:: test_environment_sut_conf_1.rst
+.. raw:: latex
 
-.. include:: test_environment_sut_conf_2.rst
+    \clearpage
 
-.. include:: test_environment_sut_conf_3.rst
+.. _vpp_test_environment:
 
+.. include:: ../introduction/test_environment_intro.rst
 
-DUT Configuration - VPP
------------------------
+.. include:: ../introduction/test_environment_sut_calib_hsw.rst
 
-**VPP Version**
+.. include:: ../introduction/test_environment_sut_calib_skx.rst
 
-|vpp-release|
-
-**VPP Compile Parameters**
+..
+    .. include:: ../introduction/test_environment_sut_calib_dnv.rst
 
-`FD.io VPP compile job`_
+.. include:: ../introduction/test_environment_sut_conf_1.rst
 
-**VPP Install Parameters**
+.. include:: ../introduction/test_environment_sut_conf_2.rst
 
-::
+.. include:: ../introduction/test_environment_sut_conf_3.rst
 
-    $ dpkg -i --force-all vpp*
 
-**VPP Startup Configuration**
+DUT Settings - VPP
+------------------
 
-VPP startup configuration changes per test case with different settings for CPU
-cores, rx-queues and no-multi-seg parameter. Startup config is aligned with
-applied test case tag:
+VPP Version
+~~~~~~~~~~~
 
-Tagged by **1T1C**
+|vpp-release|
 
-::
+VPP Compile Parameters
+~~~~~~~~~~~~~~~~~~~~~~
 
-    ip
-    {
-      heap-size 4G
-    }
-    unix
-    {
-      cli-listen localhost:5002
-      log /tmp/vpe.log
-      nodaemon
-    }
-    ip6
-    {
-      heap-size 4G
-      hash-buckets 2000000
-    }
-    heapsize 4G
-    plugins
-    {
-      plugin default
-      {
-        disable
-      }
-      plugin dpdk_plugin.so
-      {
-        enable
-      }
-    }
-    cpu
-    {
-      corelist-workers 2
-      main-core 1
-    }
-    dpdk
-    {
-      dev 0000:0a:00.0
-      dev 0000:0a:00.1
-      no-multi-seg
-      uio-driver uio_pci_generic
-      log-level debug
-      dev default
-      {
-        num-rx-queues 1
-      }
-      socket-mem 1024,1024
-      no-tx-checksum-offload
-    }
+`FD.io VPP compile job`_
 
-Tagged by **2T2C**
+VPP Install Parameters
+~~~~~~~~~~~~~~~~~~~~~~
 
 ::
 
-    ip
-    {
-      heap-size 4G
-    }
-    unix
-    {
-      cli-listen localhost:5002
-      log /tmp/vpe.log
-      nodaemon
-    }
-    ip6
-    {
-      heap-size 4G
-      hash-buckets 2000000
-    }
-    heapsize 4G
-    plugins
-    {
-      plugin default
-      {
-        disable
-      }
-      plugin dpdk_plugin.so
-      {
-        enable
-      }
-    }
-    cpu
-    {
-      corelist-workers 2,3
-      main-core 1
-    }
-    dpdk
-    {
-      dev 0000:0a:00.0
-      dev 0000:0a:00.1
-      no-multi-seg
-      uio-driver uio_pci_generic
-      log-level debug
-      dev default
-      {
-        num-rx-queues 1
-      }
-      socket-mem 1024,1024
-      no-tx-checksum-offload
-    }
+    $ dpkg -i --force-all vpp*
+
+VPP Startup Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Tagged by **4T4C**
+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:
 
 ::
 
@@ -140,9 +55,13 @@ Tagged by **4T4C**
     {
       heap-size 4G
     }
+    statseg
+    {
+      size 4G
+    }
     unix
     {
-      cli-listen localhost:5002
+      cli-listen /run/vpp/cli.sock
       log /tmp/vpe.log
       nodaemon
     }
@@ -165,22 +84,26 @@ Tagged by **4T4C**
     }
     cpu
     {
-      corelist-workers 2,3,4,5
+      corelist-workers $$CORELIST_WORKERS
       main-core 1
     }
     dpdk
     {
-      dev 0000:0a:00.0
-      dev 0000:0a:00.1
-      no-multi-seg
-      uio-driver uio_pci_generic
+      num-mbufs $$NUM-MBUFS
+      uio-driver $$UIO_DRIVER
+      $$NO_MULTI_SEG
       log-level debug
       dev default
       {
-        num-rx-queues 1
+        num-rx-queues $$NUM_RX_QUEUES
       }
       socket-mem 1024,1024
       no-tx-checksum-offload
+      dev $$DEV_1
+      dev $$DEV_2
     }
 
-.. include:: test_environment_tg.rst
+Description of VPP startup settings used in CSIT is provided in
+:ref:`test_methodology`.
+
+.. include:: ../introduction/test_environment_tg.rst