test_spec: Fix WIDE Fig and Note need for full-mesh ports in RFC2889 tests

The RFC 2889 tests require Full Mesh on multiple ports.
Modify the bunny-ears fig to show this (and address -99 in the process)

JIRA: VSPERF-99
JIRA: VSPERF-101

Change-Id: Id67cb5ef6748c83858a90033534f960874614c06
Signed-off-by: Al Morton <acmorton@att.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>

diff --git a/docs/to-be-reorganized/vswitchperf_ltd.rst b/docs/to-be-reorganized/vswitchperf_ltd.rst
index 9277535..519d540 100644 (file)
--- a/docs/to-be-reorganized/vswitchperf_ltd.rst
+++ b/docs/to-be-reorganized/vswitchperf_ltd.rst
@@ -272,9 +272,9 @@ Physical port → vSwitch → VNF → vSwitch → VNF → vSwitch → physical p
     |   +--------------+          +--------------+   |  |
     |   |   phy ports  | vSwitch  |   phy ports  |   |  |
     +---+--------------+----------+--------------+---+ _|
-            ^       :                 ^       :
+            ^       ^                 :       :
             |       |                 |       |
-            :       v                 :       v
+            :       :                 v       v
     +--------------------------------------------------+
     |                                                  |
     |                traffic generator                 |
@@ -397,42 +397,52 @@ virtual switch → Physical port)
 
   .. code-block:: console
 
+                                                       _
+    +----------------------+  +----------------------+  |
+    |   Guest 1            |  |   Guest 2            |  |
+    |   +---------------+  |  |   +---------------+  |  |
+    |   |  Application  |  |  |   |  Application  |  |  |
+    |   +---------------+  |  |   +---------------+  |  |
+    |       ^       |      |  |       ^       |      |  |
+    |       |       v      |  |       |       v      |  |  Guests
+    |   +---------------+  |  |   +---------------+  |  |
+    |   | logical ports |  |  |   | logical ports |  |  |
+    |   |   0       1   |  |  |   |   0       1   |  |  |
+    +---+---------------+--+  +---+---------------+--+ _|
+            ^       :                 ^       :
+            |       |                 |       |
+            :       v                 :       v        _
+    +---+---------------+--+  +---+---------------+--+  |
+    |   |   0       1   |  |  |   |   3       4   |  |  |
+    |   | logical ports |  |  |   | logical ports |  |  |
+    |   +---------------+  |  |   +---------------+  |  |
+    |       ^       |      |  |       ^       |      |  |  Hosts
+    |       |       v      |  |       |       v      |  |
+    |   +--------------+   |  |   +--------------+   |  |
+    |   |   phy ports  |   |  |   |   phy ports  |   |  |
+    +---+--------------+---+  +---+--------------+---+ _|
+            ^       :                 :       :
+            |       +-----------------+       |
+            :                                 v
+    +--------------------------------------------------+
+    |                                                  |
+    |                traffic generator                 |
+    |                                                  |
+    +--------------------------------------------------+
+
 
-    +--------------------------------------------+   +------------------------------------------+
-    |   +---------------------------------+      |   |    +--------------------------------+    |
-    |   |          Application            |      |   |    |         Application            |    |
-    |   +----------------------------+----+      |   |    +-------------------------+------+    |
-    |         ^                      |           |   |           ^                  |           |
-    |         |                      v           |   |           |                  v           |
-    | +------------------+  +------------------+ |   | +------------------+  +----------------+ |
-    | | Logical port 0   |  | Logical port 1   | |   | | Logical port 0   |  | Logical port 1 | |
-    +-+------------------+--+------------------+-+   +-+------------------+--+----------------+-+
-              ^                      |                          ^                  |
-              |                      |                          |                  |
-              |                      v                          |                  v
-    +-+------------------+--+------------------+-+   +-+------------------+--+----------------+-+
-    | | Logical port 0   |  |  Logical port 1  | |   | | Logical port 0   |  | Logical port 1 | |
-    | +------------------+  +------------------+ |   | +------------------+  +----------------+ |
-    |          ^                       |         |   |          ^                  |            |
-    |          |                       |         |   |          |                  |            |
-    |          |       vswitch         v         |   |          |     vswitch      v            |
-    | +--------+---------+  +------------------+ |   | +------------------+  +----------------+ |
-    | |    phy port      |  |    phy port      | |   | |  phy port        |  |  phy port      | |
-    +-+------------------+--+------------------+-+   +-+------------------+--+----------------+-+
-               ^                       |                        ^                  |
-               |                       |                        |                  |
-               |                        ------------------------                   v
-    +-------------------------------------------------------------------------------------------+
-    |                                                                                           |
-    |                                    traffic generator                                      |
-    |                                                                                           |
-    +-------------------------------------------------------------------------------------------+
 
 **Note:** For tests where the traffic generator and/or measurement
 receiver are implemented on VM and connected to the virtual switch
 through vNIC, the issues of shared resources and interactions between
 the measurement devices and the device under test must be considered.
 
+**Note:** Some RFC 2889 tests require a full-mesh sending and receiving
+pattern involving more than two ports. This possibility is illustrated in the
+Physical port → vSwitch → VNF → vSwitch → VNF → vSwitch → physical port
+diagram above (with 2 sending and 2 receiving ports, though all ports
+could be used bi-directionally).
+
 2.2.3 General Methodology:
 --------------------------
 To establish the baseline performance of the virtual switch, tests would