Report: Hoststack methodology

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

6 files changed, 25 insertions, 15 deletions

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.)