FIX: CSIT rls1707 Report - Update III

Change-Id: Ic857e004136b2d936c2a8affb779ada238eb007c
Signed-off-by: Peter Mikus <pmikus@cisco.com>

3 files changed, 17 insertions, 59 deletions

diff --git a/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst
index 140b51964c..c1fc3f1bbc 100644
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst
@@ -36,4 +36,4 @@ and their indices.
 .. toctree::
 
     l2
-    ipv4
+    ip4
diff --git a/docs/report/dpdk_performance_tests/packet_throughput_graphs/ipv4.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/ip4.rst
index 108944537b..7a0bc04328 100644
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/ipv4.rst
+++ b/docs/report/dpdk_performance_tests/packet_throughput_graphs/ip4.rst
@@ -23,12 +23,8 @@ Looping.*
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
-.. code-block:: bash
-
-    $ $CSIT/tests/dpdk/perf
-    $ grep -E "64B-1t1c-ethip4-ip4base-l3fwd-ndrdisc" *
-
-    10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot:| tc01-64B-1t1c-ethip4-ip4base-l3fwd-ndrdisc
+.. program-output:: cd ../../ && set -x && cd tests/dpdk/perf && grep -P '64B-1t1c-ethip4-ip4base-l3fwd-ndrdisc' *
+   :shell:
 
 Testpmd NDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below.
@@ -43,12 +39,8 @@ Looping.*
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
-.. code-block:: bash
-
-    $ $CSIT/tests/dpdk/perf
-    $ grep -E "64B-2t2c-ethip4-ip4base-l3fwd-ndrdisc" *
-
-    10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot:| tc07-64B-2t2c-ethip4-ip4base-l3fwd-ndrdisc
+.. program-output:: cd ../../ && set -x && cd tests/dpdk/perf && grep -P '64B-2t2c-ethip4-ip4base-l3fwd-ndrdisc' *
+   :shell:
 
 PDR Throughput
 ~~~~~~~~~~~~~~
@@ -66,12 +58,8 @@ Looping.*
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
-.. code-block:: bash
-
-    $ $CSIT/tests/dpdk/perf
-    $ grep -E "64B-1t1c-ethip4-ip4base-l3fwd-pdrdisc" *
-
-    10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot:| tc02-64B-1t1c-ethip4-ip4base-l3fwd-pdrdisc
+.. program-output:: cd ../../ && set -x && cd tests/dpdk/perf && grep -P '64B-1t1c-ethip4-ip4base-l3fwd-pdrdisc' *
+   :shell:
 
 L3FWD PDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below. PDR measured for 0.5% packet loss ratio.
@@ -86,10 +74,5 @@ Looping.*
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
-.. code-block:: bash
-
-    $ $CSIT/tests/dpdk/perf
-    $ grep -E "64B-2t2c-ethip4-ip4base-l3fwd-pdrdisc" *
-
-    10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot:| tc08-64B-2t2c-ethip4-ip4base-l3fwd-pdrdisc
-
+.. program-output:: cd ../../ && set -x && cd tests/dpdk/perf && grep -P '64B-2t2c-ethip4-ip4base-l3fwd-pdrdisc' *
+   :shell:
diff --git a/docs/report/dpdk_performance_tests/packet_throughput_graphs/l2.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/l2.rst
index 9a2dc8ad85..eb3be14af1 100644
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/dpdk_performance_tests/packet_throughput_graphs/l2.rst
@@ -23,14 +23,8 @@ Looping.*
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
-.. code-block:: bash
-
-    $ $CSIT/tests/dpdk/perf
-    $ grep -E "64B-1t1c-eth-l2xcbase-testpmd-ndrdisc" *
-
-    10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrdisc
-    10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrdisc
-    40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrdisc
+.. program-output:: cd ../../ && set -x && cd tests/dpdk/perf && grep -P '64B-1t1c-eth-l2xcbase-testpmd-ndrdisc' *
+   :shell:
 
 Testpmd NDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below.
@@ -45,14 +39,8 @@ Looping.*
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
-.. code-block:: bash
-
-    $ $CSIT/tests/dpdk/perf
-    $ grep -E "64B-2t2c-eth-l2xcbase-testpmd-ndrdisc" *
-
-    10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc07-64B-2t2c-eth-l2xcbase-testpmd-ndrdisc
-    10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc07-64B-2t2c-eth-l2xcbase-testpmd-ndrdisc
-    40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc07-64B-2t2c-eth-l2xcbase-testpmd-ndrdisc
+.. program-output:: cd ../../ && set -x && cd tests/dpdk/perf && grep -P '64B-2t2c-eth-l2xcbase-testpmd-ndrdisc' *
+   :shell:
 
 PDR Throughput
 ~~~~~~~~~~~~~~
@@ -70,14 +58,8 @@ Looping.*
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
-.. code-block:: bash
-
-    $ $CSIT/tests/dpdk/perf
-    $ grep -E "64B-1t1c-eth-l2xcbase-testpmd-pdrdisc" *
-
-    10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc02-64B-1t1c-eth-l2xcbase-testpmd-pdrdisc
-    10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc02-64B-1t1c-eth-l2xcbase-testpmd-pdrdisc
-    40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc02-64B-1t1c-eth-l2xcbase-testpmd-pdrdisc
+.. program-output:: cd ../../ && set -x && cd tests/dpdk/perf && grep -P '64B-1t1c-eth-l2xcbase-testpmd-pdrdisc' *
+   :shell:
 
 Testpmd PDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below. PDR measured for 0.5% packet loss ratio.
@@ -92,12 +74,5 @@ Looping.*
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
-.. code-block:: bash
-
-    $ $CSIT/tests/dpdk/perf
-    $ grep -E "64B-2t2c-eth-l2xcbase-testpmd-pdrdisc" *
-
-        10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc08-64B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-        10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc08-64B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-        40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot:| tc08-64B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-
+.. program-output:: cd ../../ && set -x && cd tests/dpdk/perf && grep -P '64B-2t2c-eth-l2xcbase-testpmd-pdrdisc' *
+   :shell: