Report: Hoststack methodology

Change-Id: I105e1d4823df42522bff1af50d1bb173cd84d958
Signed-off-by: Tibor Frank <tifrank@cisco.com>

9 files changed, 34 insertions, 24 deletions

diff --git a/docs/report/dpdk_performance_tests/csit_release_notes.rst b/docs/report/dpdk_performance_tests/csit_release_notes.rst
index 7f190ab201..b6cec015be 100644
--- a/docs/report/dpdk_performance_tests/csit_release_notes.rst
+++ b/docs/report/dpdk_performance_tests/csit_release_notes.rst
@@ -30,7 +30,7 @@ Changes in |csit-release|
 
    - **New Intel Xeon Cascadelake Testbeds**: Added performance tests
      for 2-Node-Cascadelake (2n-clx) testbeds with x710, xxv710 and
-     mcx556a-edat NIC cards.
+     cx556a-edat NIC cards.
 
 ..
     // Alternative Note for 1st Bullet when bad microcode Skx, Clx results are published
diff --git a/docs/report/introduction/methodology.rst b/docs/report/introduction/methodology.rst
index 107a6954c6..61752a4560 100644
--- a/docs/report/introduction/methodology.rst
+++ b/docs/report/introduction/methodology.rst
@@ -13,9 +13,7 @@ Test Methodology
     methodology_data_plane_throughput/index
     methodology_packet_latency
     methodology_multi_core_speedup
-    methodology_http_tcp_with_wrk
-    methodology_tcp_with_iperf3
-    methodology_quic_with_vppecho
+    methodology_hoststack_testing/index
     methodology_reconf
     methodology_vpp_startup_settings
     methodology_kvm_vms_vhost_user
diff --git a/docs/report/introduction/methodology_hoststack_testing/index.rst b/docs/report/introduction/methodology_hoststack_testing/index.rst
new file mode 100644
index 0000000000..e7b5b79610
--- /dev/null
+++ b/docs/report/introduction/methodology_hoststack_testing/index.rst
@@ -0,0 +1,8 @@
+Hoststack Testing
+-----------------
+
+.. toctree::
+
+    methodology_http_tcp_with_wrk
+    methodology_tcp_with_iperf3
+    methodology_quic_with_vppecho
diff --git a/docs/report/introduction/methodology_http_tcp_with_wrk.rst b/docs/report/introduction/methodology_hoststack_testing/methodology_http_tcp_with_wrk.rst
index cd831b4481..f5da5339a0 100644
--- a/docs/report/introduction/methodology_http_tcp_with_wrk.rst
+++ b/docs/report/introduction/methodology_hoststack_testing/methodology_http_tcp_with_wrk.rst
@@ -1,5 +1,5 @@
 HTTP/TCP with WRK
------------------
+^^^^^^^^^^^^^^^^^
 
 `WRK HTTP benchmarking tool <https://github.com/wg/wrk>`_ is used for
 TCP/IP and HTTP tests of VPP Host Stack and built-in static HTTP server.
diff --git a/docs/report/introduction/methodology_quic_with_vppecho.rst b/docs/report/introduction/methodology_hoststack_testing/methodology_quic_with_vppecho.rst
index 5579fb5954..329b9a2964 100644
--- a/docs/report/introduction/methodology_quic_with_vppecho.rst
+++ b/docs/report/introduction/methodology_hoststack_testing/methodology_quic_with_vppecho.rst
@@ -1,5 +1,5 @@
 Hoststack Throughput Testing over QUIC/UDP/IP with vpp_echo
------------------------------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 `vpp_echo performance testing tool <https://wiki.fd.io/view/VPP/HostStack#External_Echo_Server.2FClient_.28vpp_echo.29>`_
 is a bespoke performance test application which utilizes the 'native
@@ -17,9 +17,11 @@ streams per connection.
 
 The test configuration is as follows:
 
-        DUT1               Network                DUT2
-[ vpp_echo-client -> VPP1 ]=======[ VPP2 -> vpp_echo-server]
-                      N-streams/connection
+::
+
+            DUT1               Network                DUT2
+    [ vpp_echo-client -> VPP1 ]=======[ VPP2 -> vpp_echo-server]
+                          N-streams/connection
 
 where,
 
diff --git a/docs/report/introduction/methodology_tcp_with_iperf3.rst b/docs/report/introduction/methodology_hoststack_testing/methodology_tcp_with_iperf3.rst
index 288da004a5..1355a3cb21 100644
--- a/docs/report/introduction/methodology_tcp_with_iperf3.rst
+++ b/docs/report/introduction/methodology_hoststack_testing/methodology_tcp_with_iperf3.rst
@@ -1,5 +1,5 @@
 Hoststack Throughput Testing over TCP/IP with iperf3
-----------------------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 `iperf3 goodput measurement tool <https://github.com/esnet/iperf>`_
 is used for measuring the maximum attainable goodput of the VPP Host
@@ -19,8 +19,10 @@ LD_PRELOAD which inherently has more overhead and other limitations.
 
 The test configuration is as follows:
 
-       DUT1              Network               DUT2
-[ iperf3-client -> VPP1 ]=======[ VPP2 -> iperf3-server]
+::
+
+           DUT1              Network               DUT2
+    [ iperf3-client -> VPP1 ]=======[ VPP2 -> iperf3-server]
 
 where,
 
diff --git a/docs/report/introduction/physical_testbeds.rst b/docs/report/introduction/physical_testbeds.rst
index 159728d8ee..24061f9737 100644
--- a/docs/report/introduction/physical_testbeds.rst
+++ b/docs/report/introduction/physical_testbeds.rst
@@ -71,7 +71,7 @@ SUT servers are populated with the following NIC models:
 
 #. NIC-1: x710-DA4 4p10GE Intel.
 #. NIC-2: xxv710-DA2 2p25GE Intel.
-#. NIC-3: mcx556a-edat ConnectX5 2p100GE Mellanox. (Only testbed t27, t28)
+#. NIC-3: cx556a-edat ConnectX5 2p100GE Mellanox. (Only testbed t27, t28)
 #. NIC-4: empty, future expansion.
 #. NIC-5: empty, future expansion.
 #. NIC-6: empty, future expansion.
@@ -81,7 +81,7 @@ NIC models:
 
 #. NIC-1: x710-DA4 4p10GE Intel.
 #. NIC-2: xxv710-DA2 2p25GE Intel.
-#. NIC-3: mcx556a-edat ConnectX5 2p100GE Mellanox. (Only testbed t27, t28)
+#. NIC-3: cx556a-edat ConnectX5 2p100GE Mellanox. (Only testbed t27, t28)
 #. NIC-4: empty, future expansion.
 #. NIC-5: empty, future expansion.
 #. NIC-6: x710-DA4 4p10GE Intel. (For self-tests.)
@@ -118,7 +118,7 @@ SUT servers are populated with the following NIC models:
 
 #. NIC-1: x710-DA4 4p10GE Intel.
 #. NIC-2: xxv710-DA2 2p25GE Intel.
-#. NIC-3: mcx556a-edat ConnectX5 2p100GE Mellanox. (Not used yet.)
+#. NIC-3: cx556a-edat ConnectX5 2p100GE Mellanox. (Not used yet.)
 #. NIC-4: empty, future expansion.
 #. NIC-5: empty, future expansion.
 #. NIC-6: empty, future expansion.
@@ -128,7 +128,7 @@ NIC models:
 
 #. NIC-1: x710-DA4 4p10GE Intel.
 #. NIC-2: xxv710-DA2 2p25GE Intel.
-#. NIC-3: mcx556a-edat ConnectX5 2p100GE Mellanox. (Not used yet.)
+#. NIC-3: cx556a-edat ConnectX5 2p100GE Mellanox. (Not used yet.)
 #. NIC-4: empty, future expansion.
 #. NIC-5: empty, future expansion.
 #. NIC-6: x710-DA4 4p10GE Intel. (For self-tests.)
diff --git a/docs/report/vpp_performance_tests/csit_release_notes.rst b/docs/report/vpp_performance_tests/csit_release_notes.rst
index e01868075d..8da1f29608 100644
--- a/docs/report/vpp_performance_tests/csit_release_notes.rst
+++ b/docs/report/vpp_performance_tests/csit_release_notes.rst
@@ -37,7 +37,7 @@ Changes in |csit-release|
      generator. HDRH latency data presented in latency packet
      percentile graphs and in detailed results tables.
 
-   - **Mellanox MCX556A-EDAT tests**: Added tests with Mellanox
+   - **Mellanox CX556A-EDAT tests**: Added tests with Mellanox
      ConnectX5-2p100GE NICs in 2n-clx testbeds using VPP native rdma
      driver.
 
@@ -78,7 +78,7 @@ Changes in |csit-release|
 
    - **New Intel Xeon Cascadelake Testbeds**: Added performance tests
      for 2-Node-Cascadelake (2n-clx) testbeds with x710, xxv710 and
-     mcx556a-edat NIC cards.
+     cx556a-edat NIC cards.
 
 #. PRESENTATION AND ANALYTICS LAYER
 
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index db1fc5a092..e4a7a0a180 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -368,12 +368,12 @@ class ExecutionChecker(ResultVisitor):
 
         groups = re.search(self.REGEX_MRR_MSG_INFO, msg)
         if not groups or groups.lastindex != 1:
-            return msg
+            return u"Test Failed."
 
         try:
             data = groups.group(1).split(u", ")
         except (AttributeError, IndexError, ValueError, KeyError):
-            return msg
+            return u"Test Failed."
 
         out_str = u"["
         try:
@@ -381,7 +381,7 @@ class ExecutionChecker(ResultVisitor):
                 out_str += f"{(float(item) / 1e6):.2f}, "
             return out_str[:-2] + u"]"
         except (AttributeError, IndexError, ValueError, KeyError):
-            return msg
+            return u"Test Failed."
 
     def _get_data_from_perf_test_msg(self, msg):
         """Get info from message of NDRPDR performance tests.
@@ -394,7 +394,7 @@ class ExecutionChecker(ResultVisitor):
 
         groups = re.search(self.REGEX_PERF_MSG_INFO, msg)
         if not groups or groups.lastindex != 10:
-            return msg
+            return u"Test Failed."
 
         try:
             data = {
@@ -410,7 +410,7 @@ class ExecutionChecker(ResultVisitor):
                 u"pdr_lat_10_2": groups.group(10),
             }
         except (AttributeError, IndexError, ValueError, KeyError):
-            return msg
+            return u"Test Failed."
 
         def _process_lat(in_str_1, in_str_2):
             """Extract min, avg, max values from latency string.
@@ -485,7 +485,7 @@ class ExecutionChecker(ResultVisitor):
             return out_msg
 
         except (AttributeError, IndexError, ValueError, KeyError):
-            return msg
+            return u"Test Failed."
 
     def _get_testbed(self, msg):
         """Called when extraction of testbed IP is required.