X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=docs%2Freport%2Fvpp_functional_tests%2Foverview.rst;h=fda35072ef517ba08975791d3bdcb6ab24c2c7e2;hp=e85bb92f7be122a685ac53fd914a1fe4dce513ef;hb=bbcaa22c4425c32c3e3d2bcde434cdefc6b9a992;hpb=da2aa127ee071e37bc4d6060dd39476179e65365

diff --git a/docs/report/vpp_functional_tests/overview.rst b/docs/report/vpp_functional_tests/overview.rst
index e85bb92f7b..fda35072ef 100644
--- a/docs/report/vpp_functional_tests/overview.rst
+++ b/docs/report/vpp_functional_tests/overview.rst
@@ -5,14 +5,12 @@ Tested Virtual Topologies
 -------------------------
 
 CSIT VPP functional tests are executed on virtualized topologies created using
-Virtual Internet Routing Lab (VIRL) simulation platform contributed by Cisco.
-VIRL runs on physical baremetal servers hosted by LF FD.io project.  Majority
-of the tests are executed in the three node logical test topology - Traffic
-Generator (TG) node and two Systems Under Test (SUT) nodes connected in a
-loop. Some tests use two node logical test topology - TG node and SUT1 node.
-Both logical test topologies are shown in the figures below.
-
-::
+:abbr:`VIRL (Virtual Internet Routing Lab)` simulation platform contributed by
+Cisco. VIRL runs on physical baremetal servers hosted by LF FD.io project.
+Majority of the tests are executed in the three node logical test topology -
+Traffic Generator (TG) node and two Systems Under Test (SUT) nodes connected in
+a loop. Some tests use two node logical test topology - TG node and SUT1 node.
+Both logical test topologies are shown in the figures below.::
 
     +------------------------+           +------------------------+
     |                        |           |                        |
@@ -38,7 +36,7 @@ Both logical test topologies are shown in the figures below.
           +--------------->                  <--------------+
           |            |  |                  |  |           |
           |  |------------>       DUT1       <-----------+  |
-          |  |         |  +--^--^------------+  |        |  |
+          |  |         |  +------------------+  |        |  |
           |  |         |                        |        |  |
           |  |         |                  SUT1  |        |  |
           |  |         +------------------------+        |  |
@@ -68,9 +66,7 @@ For the test cases that require DUT (VPP) to communicate with VM over the
 vhost-user interfaces, a nested VM is created on SUT1 and/or SUT2 for the
 duration of these particular test cases only. DUT (VPP) test topology with VM
 is shown in the figure below including the applicable packet flow thru the VM
-(marked in the figure with ``***``).
-
-::
+(marked in the figure with ``***``).::
 
     +------------------------+           +------------------------+
     |      +----------+      |           |      +----------+      |
@@ -131,31 +127,24 @@ results listed in this report:
 Functional Tests Naming
 -----------------------
 
-CSIT |release| introduced a common structured naming convention for all
-performance and functional tests. This change was driven by substantially
-growing number and type of CSIT test cases. Firstly, the original practice did
-not always follow any strict naming convention. Secondly test names did not
-always clearly capture tested packet encapsulations, and the actual type or
-content of the tests. Thirdly HW configurations in terms of NICs, ports and
-their locality were not captured either. These were but few reasons that drove
-the decision to change and define a new more complete and stricter test naming
-convention, and to apply this to all existing and new test cases.
+CSIT |release| follows a common structured naming convention for all
+performance and system functional tests, introduced in CSIT |release-1|.
 
-The new naming should be intuitive for majority of the tests. The complete
-description of CSIT test naming convention is provided on `CSIT test naming
-page <https://wiki.fd.io/view/CSIT/csit-test-naming>`_.
+The naming should be intuitive for majority of the tests. Complete
+description of CSIT test naming convention is provided on
+`CSIT test naming wiki page <https://wiki.fd.io/view/CSIT/csit-test-naming>`_.
 
 Here few illustrative examples of the new naming usage for functional test
 suites:
 
 #. **Physical port to physical port - a.k.a. NIC-to-NIC, Phy-to-Phy, P2P**
 
-    - *eth2p-ethip4-ip4base-func.robot* => 2 ports of Ethernet, IPv4 baseline
-      routed forwarding, functional tests.
+   - *eth2p-ethip4-ip4base-func.robot* => 2 ports of Ethernet, IPv4 baseline
+     routed forwarding, functional tests.
 
 #. **Physical port to VM (or VM chain) to physical port - a.k.a. NIC2VM2NIC,
    P2V2P, NIC2VMchain2NIC, P2V2V2P**
 
-    - *eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot* => 2 ports of
-      Ethernet, IPv4 VXLAN Ethernet, L2 bridge-domain switching to/from two vhost
-      interfaces and one VM, functional tests.
+   - *eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot* => 2 ports of
+     Ethernet, IPv4 VXLAN Ethernet, L2 bridge-domain switching to/from two vhost
+     interfaces and one VM, functional tests.