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=466b30d17e131624362514f4dba0e91eecee2d90;hp=91ca3bcc078a01c8263ab27627e501eaab1ad67a;hb=ee1321d27bc39baab5bc2615834fd7392b79a160;hpb=ce1088d88744f2c040801c9852565d522b3feb68

diff --git a/docs/report/vpp_performance_tests/test_environment.rst b/docs/report/vpp_performance_tests/test_environment.rst
index 91ca3bcc07..466b30d17e 100644
--- a/docs/report/vpp_performance_tests/test_environment.rst
+++ b/docs/report/vpp_performance_tests/test_environment.rst
@@ -1,10 +1,10 @@
-.. include:: test_environment_intro.rst
+.. include:: ../introduction/test_environment_intro.rst
 
-.. include:: test_environment_sut_conf_1.rst
+.. include:: ../introduction/test_environment_sut_conf_1.rst
 
-.. include:: test_environment_sut_conf_2.rst
+.. include:: ../introduction/test_environment_sut_conf_2.rst
 
-.. include:: test_environment_sut_conf_3.rst
+.. include:: ../introduction/test_environment_sut_conf_3.rst
 
 
 DUT Configuration - VPP
@@ -26,11 +26,9 @@ DUT Configuration - VPP
 
 **VPP Startup Configuration**
 
-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:
-
-Tagged by **1T1C**
+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:
 
 ::
 
@@ -38,111 +36,13 @@ Tagged by **1T1C**
     {
       heap-size 4G
     }
-    unix
-    {
-      cli-listen localhost:5002
-      log /tmp/vpe.log
-      nodaemon
-    }
-    ip6
-    {
-      heap-size 4G
-      hash-buckets 2000000
-    }
-    heapsize 4G
-    plugins
+    statseg
     {
-      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
-    }
-
-Tagged by **2T2C**
-
-::
-
-    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
-    }
-
-Tagged by **4T4C**
-
-::
-
-    ip
-    {
-      heap-size 4G
+      size 4G
     }
     unix
     {
-      cli-listen localhost:5002
+      cli-listen /run/vpp/cli.sock
       log /tmp/vpe.log
       nodaemon
     }
@@ -165,22 +65,23 @@ 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
+.. include:: ../introduction/test_environment_tg.rst